http: support curl < 7.10.7

tgc · gitster · commit 1c2dbf2095be · 2015-02-03T13:53:17.000-08:00
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 &lt;tgc@statsbiblioteket.dk&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,9 @@ static CURL *get_curl_handle(void)`
`297`	`297`
`298`	`298`	`if (curl_http_proxy) {`
`299`	`299`	`curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);`
	`300`	`+#if LIBCURL_VERSION_NUM >= 0x070a07`
`300`	`301`	`curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);`
	`302`	`+#endif`
`301`	`303`	`}`
`302`	`304`
`303`	`305`	`return result;`