mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-http-half-auth-push' into maint

Browse Source 
* jk/maint-http-half-auth-push:
  http: fix segfault in handle_curl_result
This commit is contained in:
Junio C Hamano
2012-10-17 10:29:24 -07:00
parent 5a77ff74ba 188923f0d1
commit e98fa647aa
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
http.c
View File

@ -745,10 +745,9 @@ 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)
int handle_curl_result(struct active_request_slot *slot,
struct slot_results *results)
{
struct slot_results *results = slot->results;
if (results->curl_result == CURLE_OK) {
credential_approve(&http_auth);
return HTTP_OK;
@ -822,7 +821,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);
ret = handle_curl_result(slot, &results);
} else {
error("Unable to start HTTP request for %s", url);
ret = HTTP_START_FAILED;