Commit 98afec03 authored by Jay Satiro's avatar Jay Satiro
Browse files

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 e1187c42.

Bug: https://github.com/curl/curl/issues/1331
Reported-by: Nehal J Wani
parent f7b3914c

src/tool_operate.c

+2 −3
Original line number Diff line number Diff line
@@ -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" :

                     ""));

        }