moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00
Code Issues Releases Wiki Activity

curl: skip CURLOPT_PROXY_CAPATH for disabled-proxy builds

Browse Source 
Closes #4061
This commit is contained in:
Koen Dergent 2019-06-24 12:45:01 +02:00 committed by Daniel Stenberg
parent 1e9769639b
commit 92963d612b
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tool_operate.c
View 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 :