diff options
| author |  Jeff King <peff@peff.net> | 2015-12-01 17:19:12 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-12-01 17:19:12 -0500 |
| commit | 92b9bf4a15346b8dae14772e07905ebb6ad29a47 (patch) | |
| tree | 419bc1570474741102b5a9096ee36dd5666d1d15 | |
| parent | Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maint (diff) | |
| parent | remote-http(s): support SOCKS proxies (diff) | |
| download | tgif-92b9bf4a15346b8dae14772e07905ebb6ad29a47.tar.xz | |
Merge branch 'pt/http-socks-proxy' into maint
Add support for talking http/https over socks proxy.
* pt/http-socks-proxy:
remote-http(s): support SOCKS proxies
| -rw-r--r-- | http.c | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -465,6 +465,17 @@ 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")) + curl_easy_setopt(result, + CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5); + else if (starts_with(curl_http_proxy, "socks4a")) + curl_easy_setopt(result, + CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4A); + else if (starts_with(curl_http_proxy, "socks")) + curl_easy_setopt(result, + CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4); +#endif } #if LIBCURL_VERSION_NUM >= 0x070a07 curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY); |