romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 16:23:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

CURLOPT_SOCKS_PROXYTYPE: removed

Browse source 
This was added as part of the SOCKS+HTTPS proxy merge but there's no
need to support this as we prefer to have the protocol specified as a
prefix instead.
This commit is contained in:
Daniel Stenberg 2016-12-16 15:10:19 +01:00
parent 558b5f68a6
commit 7907a2bec9
6 changed files with 13 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/url.c
View file

@ -1490,13 +1490,6 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption option,
data->set.proxytype = (curl_proxytype)va_arg(param, long);
break;
case CURLOPT_SOCKS_PROXYTYPE:
/*
* Set proxy type. SOCKS4/SOCKS4a/SOCKS5/SOCKS5_HOSTNAME
*/
data->set.socks_proxytype = (curl_proxytype)va_arg(param, long);
break;
case CURLOPT_PROXY_TRANSFER_MODE:
/*
* set transfer mode (;type=<a|i>) when doing FTP via an HTTP proxy
@ -4109,7 +4102,7 @@ static struct connectdata *allocate_conn(struct Curl_easy *data)
and the Curl_easy */
conn->http_proxy.proxytype = data->set.proxytype;
conn->socks_proxy.proxytype = data->set.socks_proxytype;
conn->socks_proxy.proxytype = CURLPROXY_SOCKS4;
#ifdef CURL_DISABLE_PROXY