Merge branch 'tc/missing-http-proxyauth'

We did not check the curl library version before using
CURLOPT_PROXYAUTH feature that may not exist.

* tc/missing-http-proxyauth:
  http: support curl < 7.10.7
maint
Junio C Hamano 2015-02-25 15:40:12 -08:00
commit 90eea883fd
1 changed files with 2 additions and 0 deletions

2
http.c
View File

@ -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);