summaryrefslogtreecommitdiff
path: root/include/curl/curl.h
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-12-16 15:10:19 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-12-16 15:10:19 +0100
commit7907a2bec9c2d69e901dcc662c9e048ff0248b7d (patch)
tree9cf83c4816edb2a05a2ee8c937d47fb78b992543 /include/curl/curl.h
parent558b5f68a6da9d03cfd6466bf44af2dc9010098b (diff)
downloadgnurl-7907a2bec9c2d69e901dcc662c9e048ff0248b7d.tar.gz
gnurl-7907a2bec9c2d69e901dcc662c9e048ff0248b7d.tar.bz2
gnurl-7907a2bec9c2d69e901dcc662c9e048ff0248b7d.zip
CURLOPT_SOCKS_PROXYTYPE: removed
This was added as part of the SOCKS+HTTPS proxy merge but there's no need to support this as we prefer to have the protocol specified as a prefix instead.
Diffstat (limited to 'include/curl/curl.h')
-rw-r--r--include/curl/curl.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 06bb7cb9b..f5dd65d49 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1766,13 +1766,9 @@ typedef enum {
/* Name of socks proxy to use. */
CINIT(SOCKS_PROXY, STRINGPOINT, 262),
- /* indicates type of proxy. accepted values are CURLPROXY_SOCKS4,
- CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5. */
- CINIT(SOCKS_PROXYTYPE, LONG, 263),
-
/* The public key in DER form used to validate the proxy public key
this option is used only if PROXY_SSL_VERIFYPEER is true */
- CINIT(PROXY_PINNEDPUBLICKEY, STRINGPOINT, 264),
+ CINIT(PROXY_PINNEDPUBLICKEY, STRINGPOINT, 263),
CURLOPT_LASTENTRY /* the last unused */
} CURLoption;