HTTP cleanup

Fix broken build when USE_CURL_MULTI is not defined, as noted by Becky Bruce.

During cleanup, free header slist that was created during init, as noted
by Junio.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/http-push.c b/http-push.c
index b1c018a08993dfd7278f3db35b9a140ab0e166d6..40524a8593a96e83fa4e32c429034490112d1033 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -788,6 +788,7 @@ static void finish_request(struct transfer_request *request)
        }
 }
 
        }
 }
 

+#ifdef USE_CURL_MULTI

 void fill_active_slots(void)
 {
        struct transfer_request *request = request_queue_head;
 void fill_active_slots(void)
 {
        struct transfer_request *request = request_queue_head;


@@ -821,6 +822,7 @@ void fill_active_slots(void)
                slot = slot->next;
        }
 }
                slot = slot->next;
        }
 }

+#endif

 
 static void get_remote_object_list(unsigned char parent);
 
 
 static void get_remote_object_list(unsigned char parent);
 


@@ -851,8 +853,10 @@ static void add_fetch_request(struct object *obj)
        request->next = request_queue_head;
        request_queue_head = request;
 
        request->next = request_queue_head;
        request_queue_head = request;
 

+#ifdef USE_CURL_MULTI

        fill_active_slots();
        step_active_slots();
        fill_active_slots();
        step_active_slots();

+#endif

 }
 
 static int add_send_request(struct object *obj, struct remote_lock *lock)
 }
 
 static int add_send_request(struct object *obj, struct remote_lock *lock)


@@ -889,8 +893,10 @@ static int add_send_request(struct object *obj, struct remote_lock *lock)
        request->next = request_queue_head;
        request_queue_head = request;
 
        request->next = request_queue_head;
        request_queue_head = request;
 

+#ifdef USE_CURL_MULTI

        fill_active_slots();
        step_active_slots();
        fill_active_slots();
        step_active_slots();

+#endif

 
        return 1;
 }
 
        return 1;
 }


@@ -2523,7 +2529,9 @@ int main(int argc, char **argv)
                if (objects_to_send)
                        fprintf(stderr, "    sending %d objects\n",
                                objects_to_send);
                if (objects_to_send)
                        fprintf(stderr, "    sending %d objects\n",
                                objects_to_send);

+#ifdef USE_CURL_MULTI

                fill_active_slots();
                fill_active_slots();

+#endif

                finish_all_active_slots();
 
                /* Update the remote branch if all went well */
                finish_all_active_slots();
 
                /* Update the remote branch if all went well */

diff --git a/http.c b/http.c
index 146cf7bf36d715ea410c0646d83c47148d426444..08769cc7cd4282a485fb9cd22c4ecfa97096a419 100644 (file)
--- a/http.c
+++ b/http.c
@@ -286,7 +286,8 @@ void http_cleanup(void)
        curl_multi_cleanup(curlm);
 #endif
        curl_global_cleanup();
        curl_multi_cleanup(curlm);
 #endif
        curl_global_cleanup();

-       
+
+       curl_slist_free_all(pragma_header);

 }
 
 struct active_request_slot *get_active_slot(void)
 }
 
 struct active_request_slot *get_active_slot(void)


@@ -438,11 +439,15 @@ void release_active_slot(struct active_request_slot *slot)
 {
        closedown_active_slot(slot);
        if (slot->curl) {
 {
        closedown_active_slot(slot);
        if (slot->curl) {

+#ifdef USE_CURL_MULTI

                curl_multi_remove_handle(curlm, slot->curl);
                curl_multi_remove_handle(curlm, slot->curl);

+#endif

                curl_easy_cleanup(slot->curl);
                slot->curl = NULL;
        }
                curl_easy_cleanup(slot->curl);
                slot->curl = NULL;
        }

+#ifdef USE_CURL_MULTI

        fill_active_slots();
        fill_active_slots();

+#endif

 }
 
 static void finish_active_slot(struct active_request_slot *slot)
 }
 
 static void finish_active_slot(struct active_request_slot *slot)