Merge branch 'nl/http-proxy-auth'

By Nelson Benitez Leon * nl/http-proxy-auth: http: support proxies that require authentication
git-mirror · Mar 6, 2012 · dce89cb · dce89cb
2 parents 4ebed61 + dd61399
commit dce89cb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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;
 }