]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
curl: skip CURLOPT_PROXY_CAPATH for disabled-proxy builds
authorKoen Dergent <koen.dergent@technicolor.com>
Mon, 24 Jun 2019 10:45:01 +0000 (12:45 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Mon, 24 Jun 2019 10:45:01 +0000 (12:45 +0200)
Closes #4061

src/tool_operate.c

index b5f87cea4d28f4ae23c2268db446e09f484f34a3..bf9a9b8d825ddfa620153cc13d57cd45b03dcc47 100644 (file)
@@ -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 :