curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-20 19:12:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

tool_operate: Fix showing HTTPS-Proxy options on CURLE_SSL_CACERT

Browse Source 
- Show the HTTPS-proxy options on CURLE_SSL_CACERT if libcurl was built
  with HTTPS-proxy support.

Prior to this change those options were shown only if an HTTPS-proxy was
specified by --proxy, but that did not take into account environment
variables such as http_proxy, https_proxy, etc. Follow-up to e1187c4.

Bug: https://github.com/curl/curl/issues/1331
Reported-by: Nehal J Wani
This commit is contained in:
Jay Satiro 2017-03-16 18:23:31 -04:00
parent f7b3914c55
commit 98afec033e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tool_operate.c
View File

@ -1697,9 +1697,8 @@ static CURLcode operate_do(struct GlobalConfig *global,
if(result == CURLE_SSL_CACERT) if(result == CURLE_SSL_CACERT)
fprintf(global->errors, "%s%s%s", fprintf(global->errors, "%s%s%s",
CURL_CA_CERT_ERRORMSG1, CURL_CA_CERT_ERRORMSG2, CURL_CA_CERT_ERRORMSG1, CURL_CA_CERT_ERRORMSG2,
((config->proxy && ((curlinfo->features & CURL_VERSION_HTTPS_PROXY) ?
curl_strnequal(config->proxy, "https://", 8)) ? "HTTPS-proxy has similar options --proxy-cacert "
"HTTPS proxy has similar options --proxy-cacert "
"and --proxy-insecure.\n" : "and --proxy-insecure.\n" :
"")); ""));
} }