summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-06 22:53:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-06 22:53:06 (GMT)
commitdce89cb6a59361d0c212049ef46f0c795842934c (patch)
tree1f2e036bccd00c8bb01ad21d64bc2617c56d87f9
parent4ebed61ae46194e35cdf353acafec56b38b6b3c2 (diff)
parentdd6139971a18e25a5089c0f96dc80e454683ef0b (diff)
downloadgit-dce89cb6a59361d0c212049ef46f0c795842934c.zip
git-dce89cb6a59361d0c212049ef46f0c795842934c.tar.gz
git-dce89cb6a59361d0c212049ef46f0c795842934c.tar.bz2
Merge branch 'nl/http-proxy-auth'
By Nelson Benitez Leon * nl/http-proxy-auth: http: support proxies that require authentication
-rw-r--r--http.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/http.c b/http.c
index 0ffd79c..8ac8eb6 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;
}