romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 22:53:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_setopt: for builds with disabled-proxy, skip all proxy setopts()

Browse source 
Reported-by: Marcel Raad
Fixes #3926
Closes #3929
This commit is contained in:
Daniel Stenberg 2019-05-22 23:25:43 +02:00
parent 2a32f5f457
commit 4e86f2fc4e
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 74 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/tool_setopt.c
View file

@ -713,4 +713,56 @@ CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *config,
return ret;
}
#else /* CURL_DISABLE_LIBCURL_OPTION */
#include "tool_cfgable.h"
#include "tool_setopt.h"
#endif /* CURL_DISABLE_LIBCURL_OPTION */
CURLcode tool_real_error(CURLcode result, CURLoption tag)
{
#ifdef CURL_DISABLE_PROXY
switch(tag) {
case CURLOPT_HAPROXYPROTOCOL:
case CURLOPT_HTTPPROXYTUNNEL:
case CURLOPT_NOPROXY:
case CURLOPT_PRE_PROXY:
case CURLOPT_PROXY:
case CURLOPT_PROXYAUTH:
case CURLOPT_PROXY_CAINFO:
case CURLOPT_PROXY_CAPATH:
case CURLOPT_PROXY_CRLFILE:
case CURLOPT_PROXYHEADER:
case CURLOPT_PROXY_KEYPASSWD:
case CURLOPT_PROXYPASSWORD:
case CURLOPT_PROXY_PINNEDPUBLICKEY:
case CURLOPT_PROXYPORT:
case CURLOPT_PROXY_SERVICE_NAME:
case CURLOPT_PROXY_SSLCERT:
case CURLOPT_PROXY_SSLCERTTYPE:
case CURLOPT_PROXY_SSL_CIPHER_LIST:
case CURLOPT_PROXY_SSLKEY:
case CURLOPT_PROXY_SSLKEYTYPE:
case CURLOPT_PROXY_SSL_OPTIONS:
case CURLOPT_PROXY_SSL_VERIFYHOST:
case CURLOPT_PROXY_SSL_VERIFYPEER:
case CURLOPT_PROXY_SSLVERSION:
case CURLOPT_PROXY_TLS13_CIPHERS:
case CURLOPT_PROXY_TLSAUTH_PASSWORD:
case CURLOPT_PROXY_TLSAUTH_TYPE:
case CURLOPT_PROXY_TLSAUTH_USERNAME:
case CURLOPT_PROXY_TRANSFER_MODE:
case CURLOPT_PROXYTYPE:
case CURLOPT_PROXYUSERNAME:
case CURLOPT_PROXYUSERPWD:
return CURLE_OK; /* pretend it worked */
default:
break;
}
#else
(void)tag;
#endif
return result;
}