undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/http-socks5h' into maint

Browse Source 
The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently.

* jc/http-socks5h:
  http: differentiate socks5:// and socks5h://
This commit is contained in:
Junio C Hamano 2016-05-02 14:24:10 -07:00
commit 6b9eee2bb2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
http.c
View File

@ -605,7 +605,10 @@ static CURL *get_curl_handle(void)
if (curl_http_proxy) { if (curl_http_proxy) {
curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy); curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
#if LIBCURL_VERSION_NUM >= 0x071800 #if LIBCURL_VERSION_NUM >= 0x071800
if (starts_with(curl_http_proxy, "socks5")) if (starts_with(curl_http_proxy, "socks5h"))
curl_easy_setopt(result,
CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);
else if (starts_with(curl_http_proxy, "socks5"))
curl_easy_setopt(result, curl_easy_setopt(result,
CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5); CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
else if (starts_with(curl_http_proxy, "socks4a")) else if (starts_with(curl_http_proxy, "socks4a"))