summaryrefslogtreecommitdiff
path: root/src/tool_operate.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tool_operate.c')
-rw-r--r--src/tool_operate.c3
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 :