From 92963d612b9c5ef32d63d26c72d6fff64930eba6 Mon Sep 17 00:00:00 2001 From: Koen Dergent Date: Mon, 24 Jun 2019 12:45:01 +0200 Subject: curl: skip CURLOPT_PROXY_CAPATH for disabled-proxy builds Closes #4061 --- src/tool_operate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 : -- cgit v1.2.3