summaryrefslogtreecommitdiff
path: root/src/tool_getparam.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2016-04-09 20:47:05 +0100
committerSteve Holme <steve_holme@hotmail.com>2016-04-09 20:47:05 +0100
commitccf7a826050fe33aace329b86d77895bdb7dd4c3 (patch)
treef5376feddba49724c6903c30e136b8639e983801 /src/tool_getparam.c
parent830a4e55a278cfd003906140a52a9680be87d3f7 (diff)
downloadcurl-ccf7a826050fe33aace329b86d77895bdb7dd4c3.tar.gz
CURLOPT_SOCKS5_GSSAPI_SERVICE: Merged with CURLOPT_PROXY_SERVICE_NAME
As these two options provide identical functionality, the former for SOCK5 proxies and the latter for HTTP proxies, merged the two options together. As such CURLOPT_SOCKS5_GSSAPI_SERVICE is marked as deprecated as of 7.49.0.
Diffstat (limited to 'src/tool_getparam.c')
-rw-r--r--src/tool_getparam.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index cf848c6d7..70290d19e 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -158,7 +158,6 @@ static const struct LongShort aliases[]= {
{"$3", "keepalive-time", TRUE},
{"$4", "post302", FALSE},
{"$5", "noproxy", TRUE},
- {"$6", "socks5-gssapi-service", TRUE},
{"$7", "socks5-gssapi-nec", FALSE},
{"$8", "proxy1.0", TRUE},
{"$9", "tftp-blksize", TRUE},
@@ -176,6 +175,9 @@ static const struct LongShort aliases[]= {
{"$L", "test-event", FALSE},
{"$M", "unix-socket", TRUE},
{"$N", "path-as-is", FALSE},
+ {"$O", "socks5-gssapi-service", TRUE},
+ /* 'socks5-gssapi-service' merged with'proxy-service-name' and
+ deprecated since 7.49.0 */
{"$O", "proxy-service-name", TRUE},
{"$P", "service-name", TRUE},
{"$Q", "proto-default", TRUE},
@@ -901,10 +903,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
/* This specifies the noproxy list */
GetStr(&config->noproxy, nextarg);
break;
- case '6': /* --socks5-gssapi-service */
- GetStr(&config->socks5_gssapi_service, nextarg);
- break;
- case '7': /* --socks5-gssapi-nec*/
+ case '7': /* --socks5-gssapi-nec*/
config->socks5_gssapi_nec = toggle;
break;
case '8': /* --proxy1.0 */