From 53f313897e37f25e1411a6a7cfa328d642847345 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 7 Feb 2006 10:07:39 +0000 Subject: http-fetch: Abort requests for objects which arrived in packs In fetch_object, there's a call to release an object request if the object mysteriously arrived, say in a pack. Unfortunately, the fetch attempt for this object might already be in progress, and we'll leak the descriptor. Instead, try to tidy away the request. Signed-off-by: Mark Wooding Signed-off-by: Junio C Hamano --- http.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'http.c') diff --git a/http.c b/http.c index 632c2c5c2f..14a7669cd4 100644 --- a/http.c +++ b/http.c @@ -420,10 +420,26 @@ void run_active_slot(struct active_request_slot *slot) #endif } -static void finish_active_slot(struct active_request_slot *slot) +static void closedown_active_slot(struct active_request_slot *slot) { active_requests--; slot->in_use = 0; +} + +void release_active_slot(struct active_request_slot *slot) +{ + closedown_active_slot(slot); + if (slot->curl) { + curl_multi_remove_handle(curlm, slot->curl); + curl_easy_cleanup(slot->curl); + slot->curl = NULL; + } + fill_active_slots(); +} + +static void finish_active_slot(struct active_request_slot *slot) +{ + closedown_active_slot(slot); curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE, &slot->http_code); /* Store slot results so they can be read after the slot is reused */ -- cgit 1.2.3-korg