diff options
author | Daniel Stenberg <daniel@haxx.se> | 2016-12-16 15:34:14 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2016-12-16 15:34:14 +0100 |
commit | 642398c6517bac82d80089ecba9c2057a0752d74 (patch) | |
tree | ad248ae887f22bc6df8852f9f6fc98e276021a3f /src/tool_getparam.c | |
parent | 7907a2bec9c2d69e901dcc662c9e048ff0248b7d (diff) | |
download | curl-642398c6517bac82d80089ecba9c2057a0752d74.tar.gz |
curl: normal socks proxies still use CURLOPT_PROXY
... the newly introduced CURLOPT_SOCKS_PROXY is special and should be
asked for specially. (Needs new code.)
Unified proxy type to a single variable in the config struct.
Diffstat (limited to 'src/tool_getparam.c')
-rw-r--r-- | src/tool_getparam.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 9b5c9a54c..f94a2b629 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -799,21 +799,21 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ break; case 'c': /* --socks5 specifies a socks5 proxy to use, and resolves the name locally and passes on the resolved address */ - GetStr(&config->socksproxy, nextarg); - config->socksver = CURLPROXY_SOCKS5; + GetStr(&config->proxy, nextarg); + config->proxyver = CURLPROXY_SOCKS5; break; case 't': /* --socks4 specifies a socks4 proxy to use */ - GetStr(&config->socksproxy, nextarg); - config->socksver = CURLPROXY_SOCKS4; + GetStr(&config->proxy, nextarg); + config->proxyver = CURLPROXY_SOCKS4; break; case 'T': /* --socks4a specifies a socks4a proxy to use */ - GetStr(&config->socksproxy, nextarg); - config->socksver = CURLPROXY_SOCKS4A; + GetStr(&config->proxy, nextarg); + config->proxyver = CURLPROXY_SOCKS4A; break; case '2': /* --socks5-hostname specifies a socks5 proxy and enables name resolving with the proxy */ - GetStr(&config->socksproxy, nextarg); - config->socksver = CURLPROXY_SOCKS5_HOSTNAME; + GetStr(&config->proxy, nextarg); + config->proxyver = CURLPROXY_SOCKS5_HOSTNAME; break; case 'd': /* --tcp-nodelay option */ config->tcp_nodelay = toggle; |