From 98afec033e425b56cce00b9ef5b44828df0276f0 Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Thu, 16 Mar 2017 18:23:31 -0400 Subject: tool_operate: Fix showing HTTPS-Proxy options on CURLE_SSL_CACERT - 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 --- src/tool_operate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/tool_operate.c b/src/tool_operate.c index 8f767152a..572c8d0cc 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1697,9 +1697,8 @@ static CURLcode operate_do(struct GlobalConfig *global, if(result == CURLE_SSL_CACERT) fprintf(global->errors, "%s%s%s", CURL_CA_CERT_ERRORMSG1, CURL_CA_CERT_ERRORMSG2, - ((config->proxy && - curl_strnequal(config->proxy, "https://", 8)) ? - "HTTPS proxy has similar options --proxy-cacert " + ((curlinfo->features & CURL_VERSION_HTTPS_PROXY) ? + "HTTPS-proxy has similar options --proxy-cacert " "and --proxy-insecure.\n" : "")); } -- cgit v1.2.3