@matheusbsbs / matheus-bagliano / commits / 87f8a0b279

http: differentiate socks5:// and socks5h://

Felix Ruess <felix.ruess@gmail.com> noticed that with configuration $ git config --global 'http.proxy=socks5h://127.0.0.1:1080' connections to remote sites time out, waiting for DNS resolution. The logic to detect various flavours of SOCKS proxy and ask the libcurl layer to use appropriate one understands the proxy string that begin with socks5, socks4a, etc., but does not know socks5h, and we end up using CURLPROXY_SOCKS5. The correct one to use is CURLPROXY_SOCKS5_HOSTNAME. https://curl.haxx.se/libcurl/c/CURLOPT_PROXY.html says ..., socks5h:// (the last one to enable socks5 and asking the proxy to do the resolving, also known as CURLPROXY_SOCKS5_HOSTNAME type). which is consistent with the way the breakage was reported. Tested-by: Felix Ruess <felix.ruess@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Apr 8, 2016 at 12:16 UTC 87f8a0b279def4da439b5e0e41f517a05ef110f0

1 file changed +4 -1

http.c

+4 -1

@@ -466,7 +466,10 @@ static CURL *get_curl_handle(void)

466 if (curl_http_proxy) {

467 curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);

468 #if LIBCURL_VERSION_NUM >= 0x071800

469 - if (starts_with(curl_http_proxy, "socks5"))

469 + if (starts_with(curl_http_proxy, "socks5h"))

470 + curl_easy_setopt(result,

471 + CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);

472 + else if (starts_with(curl_http_proxy, "socks5"))

473 curl_easy_setopt(result,

474 CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);

475 else if (starts_with(curl_http_proxy, "socks4a"))