summaryrefslogtreecommitdiff
path: root/http-walker.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-walker.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-walker.c')
-rw-r--r--http-walker.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/http-walker.c b/http-walker.c
index 7321ccc9..9377851 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -418,15 +418,18 @@ static int fetch_index(struct walker *walker, struct alt_base *repo, unsigned ch
run_active_slot(slot);
if (results.curl_result != CURLE_OK) {
fclose(indexfile);
+ slot->local = NULL;
return error("Unable to get pack index %s\n%s", url,
curl_errorstr);
}
} else {
fclose(indexfile);
+ slot->local = NULL;
return error("Unable to start request");
}
fclose(indexfile);
+ slot->local = NULL;
return move_temp_to_file(tmpfile, filename);
}
@@ -776,16 +779,19 @@ static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned cha
run_active_slot(slot);
if (results.curl_result != CURLE_OK) {
fclose(packfile);
+ slot->local = NULL;
return error("Unable to get pack file %s\n%s", url,
curl_errorstr);
}
} else {
fclose(packfile);
+ slot->local = NULL;
return error("Unable to start request");
}
target->pack_size = ftell(packfile);
fclose(packfile);
+ slot->local = NULL;
ret = move_temp_to_file(tmpfile, filename);
if (ret)