From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 May 2016 21:24:10 +0000 (-0700)
Subject: Merge branch 'jc/http-socks5h' into maint
X-Git-Tag: v2.8.3~36
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6b9eee2bb2934d94a5bbcbcdd28b851d71ffc5ae?hp=e18ace0951febce5a5fa9eeecfec4e523b1d6146

Merge branch 'jc/http-socks5h' into maint

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://
---

diff --git a/http.c b/http.c
index 69da4454d8..4304b80ad3 100644
--- a/http.c
+++ b/http.c
@@ -605,7 +605,10 @@ static CURL *get_curl_handle(void)
 	if (curl_http_proxy) {
 		curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
 #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,
 				CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
 		else if (starts_with(curl_http_proxy, "socks4a"))