diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2008-01-02 21:40:11 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2008-01-02 21:40:11 +0000 |
| commit | a46b40b7fdf567250451b984b977f5e03c716d5e (patch) | |
| tree | d5df5ab441077f295ec172ed2e94beed44622927 /src/main.c | |
| parent | 0b9b8acb08aa1a1c1c7668710d01eea8f27039b4 (diff) | |
Richard Atterer brought a patch that added support for SOCKS4a proxies, which
is an inofficial PROXY4 variant that sends the hostname to the proxy instead
of the resolved address (which is already supported by SOCKS5). --socks4a is
the curl command line option for it and CURLOPT_PROXYTYPE can now be set to
CURLPROXY_SOCKS4A as well.
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c index 5d83b6b43..77298913f 100644 --- a/src/main.c +++ b/src/main.c @@ -712,6 +712,7 @@ static void help(void) " -s/--silent Silent mode. Don't output anything", " -S/--show-error Show error. With -s, make curl show errors when they occur", " --socks4 <host[:port]> Use SOCKS4 proxy on given host + port", + " --socks4a <host[:port]> Use SOCKS4a proxy on given host + port", " --socks5 <host[:port]> Use SOCKS5 proxy on given host + port", " --stderr <file> Where to redirect stderr. - means stdout", " -t/--telnet-option <OPT=val> Set telnet option", @@ -1532,6 +1533,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ {"$r", "ftp-method", TRUE}, {"$s", "local-port", TRUE}, {"$t", "socks4", TRUE}, + {"$T", "socks4a", TRUE}, {"$u", "ftp-alternative-to-user", TRUE}, {"$v", "ftp-ssl-reqd", FALSE}, {"$w", "no-sessionid", FALSE}, @@ -1906,6 +1908,10 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ GetStr(&config->socksproxy, nextarg); config->socksver = CURLPROXY_SOCKS4; break; + case 'T': /* --socks4a specifies a socks4a proxy to use */ + GetStr(&config->socksproxy, nextarg); + config->socksver = CURLPROXY_SOCKS4A; + break; case 'd': /* --tcp-nodelay option */ config->tcp_nodelay ^= TRUE; break; |