aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-01-06 12:56:19 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-01-06 12:56:19 +0000
commit195e94c0fa5bb9e5f2e6e1bee78e79ce148b98bb (patch)
tree74d8a6a629c0578e2fb69e6726006d91d9b18788 /src
parentcadd08f36a383aa03d9789e709155b5016d41df4 (diff)
Richard Atterer reverted back what I missed in my previous revert ;-)
Diffstat (limited to 'src')
-rw-r--r--src/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 95046bca7..1f978f6d6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1517,7 +1517,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
{"*z", "disable-eprt", FALSE},
{"$a", "ftp-ssl", FALSE},
{"$b", "ftp-pasv", FALSE},
- {"$c", "socks5ip", TRUE},
+ {"$c", "socks5", TRUE},
{"$c", "socks", TRUE}, /* this is how the option once was documented
but we prefer the --socks5 version for
explicit version */
@@ -1547,7 +1547,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
{"$#", "raw", FALSE},
{"$0", "post301", FALSE},
{"$1", "no-keep-alive", FALSE},
- {"$2", "socks5", TRUE},
+ {"$2", "socks5-hostname", TRUE},
{"0", "http1.0", FALSE},
{"1", "tlsv1", FALSE},