diff options
author | Tom G. Christensen <tgc@statsbiblioteket.dk> | 2015-02-03 18:30:08 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-02-03 13:53:17 -0800 |
commit | 1c2dbf2095beb5227d963a1541e356bd2e834dff (patch) | |
tree | 008f72412c1ed7d42eccf9994b352946aa825e0f /http.c | |
parent | dd6139971a18e25a5089c0f96dc80e454683ef0b (diff) | |
download | git-1c2dbf2095beb5227d963a1541e356bd2e834dff.tar.gz |
http: support curl < 7.10.7tc/missing-http-proxyauth
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>
Diffstat (limited to 'http.c')
-rw-r--r-- | http.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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; |