global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-23 00:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nl/http-proxy-auth' into next

Browse Source 
* nl/http-proxy-auth:
  http: support proxies that require authentication
This commit is contained in:
Junio C Hamano
2012-03-04 23:39:15 -08:00
parent 5a6cd589a7 dd6139971a
commit f368669c77
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
http.c
View File

@@ -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;
}