global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-11 09:20:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-http-init-not-in-result-handler'

Browse Source 
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
This commit is contained in:
Jeff King
2012-10-29 04:13:09 -04:00
parent d2f4469b13 1960897ebc
commit 58f3f9893d
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
http.c
View File

@@ -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;