diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-10-16 11:44:37 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-10-16 11:44:37 -0700 |
commit | 053a08f5bba3444d40516baf30a5d61e42e4fb93 (patch) | |
tree | 669afbf17fee7188525b8d01f7e339d3f7101904 /http.c | |
parent | 9306b5b9a33185e7867202718162d8a38d5627ab (diff) | |
parent | 188923f0d1c8148415b3173986cd1e21871c947e (diff) | |
download | git-053a08f5bba3444d40516baf30a5d61e42e4fb93.tar.gz |
Merge branch 'jk/maint-http-half-auth-push'
Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1)
and master (v1.8.0-rc0).
* jk/maint-http-half-auth-push:
http: fix segfault in handle_curl_result
Diffstat (limited to 'http.c')
-rw-r--r-- | http.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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; |