summaryrefslogtreecommitdiff
path: root/src/tool_operate.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-12-16 16:02:08 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-12-16 16:04:23 +0100
commit845522cadb6ac9d357d68bb022a148a8c3be2e6a (patch)
tree8e49eea5efe813a1d985c8a700025755226a14a3 /src/tool_operate.c
parent642398c6517bac82d80089ecba9c2057a0752d74 (diff)
downloadcurl-845522cadb6ac9d357d68bb022a148a8c3be2e6a.tar.gz
preproxy: renamed what was added as SOCKS_PROXY
CURLOPT_SOCKS_PROXY -> CURLOPT_PRE_PROXY Added the corresponding --preroxy command line option. Sets a SOCKS proxy to connect to _before_ connecting to a HTTP(S) proxy.
Diffstat (limited to 'src/tool_operate.c')
-rw-r--r--src/tool_operate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 9fc03b43b..54a11f653 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -868,8 +868,8 @@ static CURLcode operate_do(struct GlobalConfig *global,
my_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, config->proxytunnel?1L:0L);
/* new in libcurl 7.52.0 */
- if(config->socksproxy)
- my_setopt_str(curl, CURLOPT_SOCKS_PROXY, config->socksproxy);
+ if(config->preproxy)
+ my_setopt_str(curl, CURLOPT_PRE_PROXY, config->preproxy);
/* new in libcurl 7.10.6 */
if(config->proxyanyauth)