summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorNick Hengeveld <nickh@reactrix.com>2006-06-06 09:41:32 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-06 14:18:00 -0700
commitb3ca4e4ebba6915ea534c4b82cfc5d6f10b4c283 (patch)
tree09e986524a45748ea0ef67b7188404d9f8bb11df /http.c
parentefd0201684c6e9bf663811dc849590b8fe27b8b2 (diff)
downloadgit-b3ca4e4ebba6915ea534c4b82cfc5d6f10b4c283.tar.gz
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>
Diffstat (limited to 'http.c')
-rw-r--r--http.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/http.c b/http.c
index 146cf7bf36..08769cc7cd 100644
--- a/http.c
+++ b/http.c
@@ -286,7 +286,8 @@ void http_cleanup(void)
curl_multi_cleanup(curlm);
#endif
curl_global_cleanup();
-
+
+ curl_slist_free_all(pragma_header);
}
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) {
+#ifdef USE_CURL_MULTI
curl_multi_remove_handle(curlm, slot->curl);
+#endif
curl_easy_cleanup(slot->curl);
slot->curl = NULL;
}
+#ifdef USE_CURL_MULTI
fill_active_slots();
+#endif
}
static void finish_active_slot(struct active_request_slot *slot)