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

diff --git a/http.c b/http.c
index efdab0979692153f016bdf1fdb1a2e782738f1bc..0153fb0b626d1fc28eba1bece2406b64fcaa0ecb 100644 (file)
--- 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);