From: Koen Dergent <koen.dergent@technicolor.com>
Date: Mon, 24 Jun 2019 10:45:01 +0000 (+0200)
Subject: curl: skip CURLOPT_PROXY_CAPATH for disabled-proxy builds
X-Git-Tag: curl-7_65_2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92963d612b9c5ef32d63d26c72d6fff64930eba6;p=thirdparty%2Fcurl.git

curl: skip CURLOPT_PROXY_CAPATH for disabled-proxy builds

Closes #4061
---

diff --git a/src/tool_operate.c b/src/tool_operate.c
index b5f87cea4d..bf9a9b8d82 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 :