diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-12-16 16:02:08 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-12-16 16:04:23 +0100 |
| commit | 845522cadb6ac9d357d68bb022a148a8c3be2e6a (patch) | |
| tree | 8e49eea5efe813a1d985c8a700025755226a14a3 /src/tool_getparam.c | |
| parent | 642398c6517bac82d80089ecba9c2057a0752d74 (diff) | |
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_getparam.c')
| -rw-r--r-- | src/tool_getparam.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c index f94a2b629..16d58489f 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -290,6 +290,7 @@ static const struct LongShort aliases[]= { {"V", "version", FALSE}, {"w", "write-out", TRUE}, {"x", "proxy", TRUE}, + {"xa", "preproxy", TRUE}, {"X", "request", TRUE}, {"Y", "speed-limit", TRUE}, {"y", "speed-time", TRUE}, @@ -1920,9 +1921,16 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ GetStr(&config->writeout, nextarg); break; case 'x': - /* proxy */ - GetStr(&config->proxy, nextarg); - config->proxyver = CURLPROXY_HTTP; + switch(subletter) { + case 'a': /* --preproxy */ + GetStr(&config->preproxy, nextarg); + break; + default: + /* --proxy */ + GetStr(&config->proxy, nextarg); + config->proxyver = CURLPROXY_HTTP; + break; + } break; case 'X': /* set custom request */ |