From 53f313897e37f25e1411a6a7cfa328d642847345 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 7 Feb 2006 10:07:39 +0000
Subject: [PATCH] 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>
---
http-fetch.c | 16 +++++++++++++++-
http.c | 18 +++++++++++++++++-
http.h | 1 +
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/http-fetch.c b/http-fetch.c
index bddbd6b100..ce3df5f35c 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -773,6 +773,20 @@ static int fetch_pack(struct alt_base *repo, unsigned char *sha1)
return 0;
}
+static void abort_object_request(struct object_request *obj_req)
+{
+ if (obj_req->local >= 0) {
+ close(obj_req->local);
+ obj_req->local = -1;
+ }
+ unlink(obj_req->tmpfile);
+ if (obj_req->slot) {
+ release_active_slot(obj_req->slot);
+ obj_req->slot = NULL;
+ }
+ release_object_request(obj_req);
+}
+
static int fetch_object(struct alt_base *repo, unsigned char *sha1)
{
char *hex = sha1_to_hex(sha1);
@@ -785,7 +799,7 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1)
return error("Couldn't find request for %s in the queue", hex);
if (has_sha1_file(obj_req->sha1)) {
- release_object_request(obj_req);
+ abort_object_request(obj_req);
return 0;
}
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 */
diff --git a/http.h b/http.h
index d6dc9d89fb..36fa154d2f 100644
--- a/http.h
+++ b/http.h
@@ -61,6 +61,7 @@ extern struct active_request_slot *get_active_slot(void);
extern int start_active_slot(struct active_request_slot *slot);
extern void run_active_slot(struct active_request_slot *slot);
extern void finish_all_active_slots(void);
+extern void release_active_slot(struct active_request_slot *slot);
#ifdef USE_CURL_MULTI
extern void fill_active_slots(void);