From: Tom G. Christensen <tgc@statsbiblioteket.dk>
Date: Tue, 3 Feb 2015 17:30:08 +0000 (+0100)
Subject: http: support curl < 7.10.7
X-Git-Tag: v2.4.0-rc0~90^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c2dbf2095beb5227d963a1541e356bd2e834dff;p=git

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>
---

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;