summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-10-29 04:13:09 -0400
committerJeff King <peff@peff.net>2012-10-29 04:13:09 -0400
commit58f3f9893dc287bd5b7ec4bbd3fc56b77e126e6c (patch)
tree61abd02b0c8582a9266fd087d5e99aac6bc2b4ab /http.c
parentd2f4469b13dcd5c850058fdee4b039f07bb33142 (diff)
parent1960897ebc5a899a8e4ec3c2afc1d2325574fe41 (diff)
downloadgit-58f3f9893dc287bd5b7ec4bbd3fc56b77e126e6c.tar.gz
Merge branch 'jk/maint-http-init-not-in-result-handler'
Further clean-up to the http codepath that picks up results after cURL library is done with one request slot. * jk/maint-http-init-not-in-result-handler: http: do not set up curl auth after a 401 remote-curl: do not call run_slot repeatedly
Diffstat (limited to 'http.c')
-rw-r--r--http.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/http.c b/http.c
index df9bb71086..98c0b2b362 100644
--- a/http.c
+++ b/http.c
@@ -745,8 +745,7 @@ char *get_remote_object_url(const char *url, const char *hex,
return strbuf_detach(&buf, NULL);
}
-int handle_curl_result(struct active_request_slot *slot,
- struct slot_results *results)
+int handle_curl_result(struct slot_results *results)
{
if (results->curl_result == CURLE_OK) {
credential_approve(&http_auth);
@@ -759,7 +758,6 @@ int handle_curl_result(struct active_request_slot *slot,
return HTTP_NOAUTH;
} else {
credential_fill(&http_auth);
- init_curl_http_auth(slot->curl);
return HTTP_REAUTH;
}
} else {
@@ -821,7 +819,7 @@ static int http_request(const char *url, void *result, int target, int options)
if (start_active_slot(slot)) {
run_active_slot(slot);
- ret = handle_curl_result(slot, &results);
+ ret = handle_curl_result(&results);
} else {
error("Unable to start HTTP request for %s", url);
ret = HTTP_START_FAILED;