From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Jul 2015 21:00:24 +0000 (-0700)
Subject: Merge branch 'et/http-proxyauth'
X-Git-Tag: v2.5.0-rc2~9
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/0e521a41b526f6dbde76030ca7e7c1107115c120?hp=acf718951299fcd6017a096e62e8baf2335ed415

Merge branch 'et/http-proxyauth'

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
---

diff --git a/http.c b/http.c
index f0c5bbc8b5..e9c6fdd835 100644
--- a/http.c
+++ b/http.c
@@ -416,10 +416,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);