From 7907a2bec9c2d69e901dcc662c9e048ff0248b7d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 16 Dec 2016 15:10:19 +0100 Subject: 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. --- include/curl/curl.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include') 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; -- cgit v1.2.3