summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-06 17:56:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-06 17:56:17 (GMT)
commit86079872238041fa0e2aa6b8a94f7881f88e4316 (patch)
treecdd1a7dea602dd407f1dd8f9cfc848471dc701d4 /http-push.c
parent99ddd24ad7753458043016bf1b7d88915aaeb396 (diff)
parent16493eb0d0da26f80286b39c7b6900e261744afa (diff)
downloadgit-86079872238041fa0e2aa6b8a94f7881f88e4316.zip
git-86079872238041fa0e2aa6b8a94f7881f88e4316.tar.gz
git-86079872238041fa0e2aa6b8a94f7881f88e4316.tar.bz2
Merge branch 'rc/maint-http-local-slot-fix' into rc/http-push
* rc/maint-http-local-slot-fix: http*: cleanup slot->local after fclose
Diffstat (limited to 'http-push.c')
-rw-r--r--http-push.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/http-push.c b/http-push.c
index 29e8ebf..a4ff7be 100644
--- a/http-push.c
+++ b/http-push.c
@@ -724,9 +724,11 @@ static void finish_request(struct transfer_request *request)
struct stat st;
struct packed_git *target;
struct packed_git **lst;
+ struct active_request_slot *slot;
request->curl_result = request->slot->curl_result;
request->http_code = request->slot->http_code;
+ slot = request->slot;
request->slot = NULL;
/* Keep locks active */
@@ -823,6 +825,7 @@ static void finish_request(struct transfer_request *request)
fclose(request->local_stream);
request->local_stream = NULL;
+ slot->local = NULL;
if (!move_temp_to_file(request->tmpfile,
request->filename)) {
target = (struct packed_git *)request->userData;
@@ -1024,17 +1027,20 @@ static int fetch_index(unsigned char *sha1)
if (results.curl_result != CURLE_OK) {
free(url);
fclose(indexfile);
+ slot->local = NULL;
return error("Unable to get pack index %s\n%s", url,
curl_errorstr);
}
} else {
free(url);
fclose(indexfile);
+ slot->local = NULL;
return error("Unable to start request");
}
free(url);
fclose(indexfile);
+ slot->local = NULL;
return move_temp_to_file(tmpfile, filename);
}