]> granicus.if.org Git - git/commitdiff
http: support curl < 7.10.7
authorTom G. Christensen <tgc@statsbiblioteket.dk>
Tue, 3 Feb 2015 17:30:08 +0000 (18:30 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Feb 2015 21:53:17 +0000 (13:53 -0800)
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>
http.c

diff --git a/http.c b/http.c
index 8ac8eb6c38e21bdb347f59ec41162270ebe82c04..93768874b39246549307098667a449ac31755ea9 100644 (file)
--- 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;