diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-25 15:40:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-25 15:40:12 -0800 |
| commit | 90eea883fd86a272a32c7d5f363445776e0680e2 (patch) | |
| tree | 6f49dd368bde8cdbf8c7356201f8d8e1fae990f6 | |
| parent | Merge branch 'jk/strbuf-doc-to-header' (diff) | |
| parent | http: support curl < 7.10.7 (diff) | |
| download | git-90eea883fd86a272a32c7d5f363445776e0680e2.tar.gz git-90eea883fd86a272a32c7d5f363445776e0680e2.zip | |
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
| -rw-r--r-- | http.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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); |
