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 <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Mark Wooding
2006-02-07 10:07:39 +00:00
committed by Junio C Hamano
parent 66f04f38f4
commit 53f313897e
3 changed files with 33 additions and 2 deletions

18
http.c
View File

@ -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 */