summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-05 12:58:58 -0800
committerJunio C Hamano <gitster@pobox.com>2013-12-05 12:58:59 -0800
commitc5a77e8f9293674e9a936f01cc1719a316f87d24 (patch)
treea1b207cab78dd0ecf25f7c46fdf8eda6dc7a2eda /http.c
parent07d406b742b577a39d7cbdacd76d0dde021ff788 (diff)
parentc80d96ca0c3cf948c5062bf6591a46c625620b6d (diff)
downloadgit-c5a77e8f9293674e9a936f01cc1719a316f87d24.tar.gz
Merge branch 'bc/http-100-continue'
Issue "100 Continue" responses to help use of GSS-Negotiate authentication scheme over HTTP transport when needed. * bc/http-100-continue: remote-curl: fix large pushes with GSSAPI remote-curl: pass curl slot_results back through run_slot http: return curl's AUTHAVAIL via slot_results
Diffstat (limited to 'http.c')
-rw-r--r--http.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/http.c b/http.c
index bcf54aa35f..ccb813b86f 100644
--- a/http.c
+++ b/http.c
@@ -761,6 +761,12 @@ void finish_active_slot(struct active_request_slot *slot)
if (slot->results != NULL) {
slot->results->curl_result = slot->curl_result;
slot->results->http_code = slot->http_code;
+#if LIBCURL_VERSION_NUM >= 0x070a08
+ curl_easy_getinfo(slot->curl, CURLINFO_HTTPAUTH_AVAIL,
+ &slot->results->auth_avail);
+#else
+ slot->results->auth_avail = 0;
+#endif
}
/* Run callback if appropriate */