summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Tom G. Christensen <tgc@statsbiblioteket.dk>2015-02-03 18:30:08 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-03 13:53:17 -0800
commit1c2dbf2095beb5227d963a1541e356bd2e834dff (patch)
tree008f72412c1ed7d42eccf9994b352946aa825e0f
parenthttp: support proxies that require authentication (diff)
downloadtgif-1c2dbf2095beb5227d963a1541e356bd2e834dff.tar.xz
http: support curl < 7.10.7
Commit dd61399 introduced support for http proxies that require authentication but it relies on the CURL_PROXYAUTH option which was added in curl 7.10.7. This makes sure proxy authentication is only enabled if libcurl can support it. Signed-off-by: Tom G. Christensen <tgc@statsbiblioteket.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--http.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/http.c b/http.c
index 8ac8eb6c38..93768874b3 100644
--- a/http.c
+++ b/http.c
@@ -297,7 +297,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
}
return result;