summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-25 23:40:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-02-25 23:40:12 (GMT)
commit90eea883fd86a272a32c7d5f363445776e0680e2 (patch)
tree6f49dd368bde8cdbf8c7356201f8d8e1fae990f6 /http.c
parente2a318f796fa22f71051f48b712da3884cbc9374 (diff)
parent1c2dbf2095beb5227d963a1541e356bd2e834dff (diff)
downloadgit-90eea883fd86a272a32c7d5f363445776e0680e2.zip
git-90eea883fd86a272a32c7d5f363445776e0680e2.tar.gz
git-90eea883fd86a272a32c7d5f363445776e0680e2.tar.bz2
Merge branch 'tc/missing-http-proxyauth'
We did not check the curl library version before using CURLOPT_PROXYAUTH feature that may not exist. * tc/missing-http-proxyauth: http: support curl < 7.10.7
Diffstat (limited to 'http.c')
-rw-r--r--http.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/http.c b/http.c
index efdab09..0153fb0 100644
--- a/http.c
+++ b/http.c
@@ -405,7 +405,9 @@ static CURL *get_curl_handle(void)
if (curl_http_proxy) {
curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
+#if LIBCURL_VERSION_NUM >= 0x070a07
curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+#endif
}
set_curl_keepalive(result);