Skip to content

Commit

Permalink
http: support curl < 7.10.7
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tom G. Christensen authored and Junio C Hamano committed Feb 3, 2015
1 parent dd61399 commit 1c2dbf2
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 @@ -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;
Expand Down

0 comments on commit 1c2dbf2

Please sign in to comment.