From 1c2dbf2095beb5227d963a1541e356bd2e834dff Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Tue, 3 Feb 2015 18:30:08 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- http.c | 2 ++ 1 file changed, 2 insertions(+) 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; -- cgit v1.2.1