diff options
| author | Koen Dergent <koen.dergent@technicolor.com> | 2019-06-24 12:45:01 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-06-24 12:45:01 +0200 |
| commit | 92963d612b9c5ef32d63d26c72d6fff64930eba6 (patch) | |
| tree | 7225bbccffa89a6cb96d8f7f93b6ae65c5e02900 /src | |
| parent | 1e9769639b57ffd4f587d39efafaae6ff1d75c4a (diff) | |
| download | curl-92963d612b9c5ef32d63d26c72d6fff64930eba6.tar.gz | |
curl: skip CURLOPT_PROXY_CAPATH for disabled-proxy builds
Closes #4061
Diffstat (limited to 'src')
| -rw-r--r-- | src/tool_operate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c index b5f87cea4..bf9a9b8d8 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1066,7 +1066,8 @@ static CURLcode operate_do(struct GlobalConfig *global, } /* For the time being if --proxy-capath is not set then we use the --capath value for it, if any. See #1257 */ - if(config->proxy_capath || config->capath) { + if((config->proxy_capath || config->capath) && + !tool_setopt_skip(CURLOPT_PROXY_CAPATH)) { result = res_setopt_str(curl, CURLOPT_PROXY_CAPATH, (config->proxy_capath ? config->proxy_capath : |