summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-07-27 12:21:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-27 12:21:44 -0700
commitc18593658e6d8411851972909ffd7f8acd3127c4 (patch)
treedc3e3598d70cb7c7abf7e246f410c1318bc76bf6
parentMerge branch 'jc/unexport-git-pager-in-use-in-pager' into maint (diff)
parenthttp: always use any proxy auth method available (diff)
downloadtgif-c18593658e6d8411851972909ffd7f8acd3127c4.tar.xz
Merge branch 'et/http-proxyauth' into maint
We used to ask libCURL to use the most secure authentication method available when talking to an HTTP proxy only when we were told to talk to one via configuration variables. We now ask libCURL to always use the most secure authentication method, because the user can tell libCURL to use an HTTP proxy via an environment variable without using configuration variables. * et/http-proxyauth: http: always use any proxy auth method available
-rw-r--r--http.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/http.c b/http.c
index 4b179f6fc8..9a7e0892e4 100644
--- a/http.c
+++ b/http.c
@@ -406,10 +406,10 @@ 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);
+ curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
#endif
- }
set_curl_keepalive(result);