diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-05-22 23:25:43 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-05-23 23:31:43 +0200 |
| commit | 4e86f2fc4e6c504c39baf5763f34225c41c1605b (patch) | |
| tree | 88d23ab90f3df8dd3aff196ed65b48b69bb66e8a /src/tool_setopt.c | |
| parent | 2a32f5f4579a42a7ebdf571772bc4517fa19fab3 (diff) | |
tool_setopt: for builds with disabled-proxy, skip all proxy setopts()
Reported-by: Marcel Raad
Fixes #3926
Closes #3929
Diffstat (limited to 'src/tool_setopt.c')
| -rw-r--r-- | src/tool_setopt.c | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/src/tool_setopt.c b/src/tool_setopt.c index 745b4546e..ff67c22e7 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -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; +} + |