Skip to content

Commit

Permalink
Merge branch 'tc/missing-http-proxyauth'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Feb 25, 2015
2 parents e2a318f + 1c2dbf2 commit 90eea88
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions http.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 90eea88

Please sign in to comment.