Merge branch 'tc/missing-http-proxyauth'

gitster · gitster · commit 90eea883fd86 · 2015-02-25T15:40:12.000-08:00
We did not check the curl library version before using
CURLOPT_PROXYAUTH feature that may not exist.

* tc/missing-http-proxyauth:
  http: support curl &lt; 7.10.7
diff --git a/http.c b/http.c
@@ -405,7 +405,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
 	}
 
 	set_curl_keepalive(result);

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,9 @@ static CURL *get_curl_handle(void)`
`405`	`405`
`406`	`406`	`if (curl_http_proxy) {`
`407`	`407`	`curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);`
	`408`	`+#if LIBCURL_VERSION_NUM >= 0x070a07`
`408`	`409`	`curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);`
	`410`	`+#endif`
`409`	`411`	`}`
`410`	`412`
`411`	`413`	`set_curl_keepalive(result);`