aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-12-16 15:10:19 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-12-16 15:10:19 +0100
commit7907a2bec9c2d69e901dcc662c9e048ff0248b7d (patch)
tree9cf83c4816edb2a05a2ee8c937d47fb78b992543 /lib
parent558b5f68a6da9d03cfd6466bf44af2dc9010098b (diff)
CURLOPT_SOCKS_PROXYTYPE: removed
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/url.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/url.c b/lib/url.c
index 45262d897..f975b0d69 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -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