summaryrefslogtreecommitdiff
path: root/remote-curl.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-16 11:44:37 -0700
committerJunio C Hamano <gitster@pobox.com>2012-10-16 11:44:37 -0700
commit053a08f5bba3444d40516baf30a5d61e42e4fb93 (patch)
tree669afbf17fee7188525b8d01f7e339d3f7101904 /remote-curl.c
parent9306b5b9a33185e7867202718162d8a38d5627ab (diff)
parent188923f0d1c8148415b3173986cd1e21871c947e (diff)
downloadgit-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 'remote-curl.c')
-rw-r--r--remote-curl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/remote-curl.c b/remote-curl.c
index 10fa8f1ac5..42716c59cf 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -356,7 +356,7 @@ static int run_slot(struct active_request_slot *slot)
slot->curl_result = curl_easy_perform(slot->curl);
finish_active_slot(slot);
- err = handle_curl_result(slot);
+ err = handle_curl_result(slot, &results);
if (err != HTTP_OK && err != HTTP_REAUTH) {
error("RPC failed; result=%d, HTTP code = %ld",
results.curl_result, results.http_code);