Merge branch 'nl/http-proxy-auth'

By Nelson Benitez Leon
* nl/http-proxy-auth:
  http: support proxies that require authentication

1 files changed, 3 insertions, 1 deletions

diff --git a/http.c b/http.c
index 0ffd79cd81..8ac8eb6c38 100644
--- a/http.c
+++ b/http.c
@@ -295,8 +295,10 @@ static CURL *get_curl_handle(void)
 	if (curl_ftp_no_epsv)
 		curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
 
-	if (curl_http_proxy)
+	if (curl_http_proxy) {
 		curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
+		curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+	}
 
 	return result;
 }