diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2017-03-16 18:23:31 -0400 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2017-03-16 18:23:31 -0400 |
| commit | 98afec033e425b56cce00b9ef5b44828df0276f0 (patch) | |
| tree | e1c43e5fad21fcbf5a2b63db712170430c0c0ccb /src/tool_operate.c | |
| parent | f7b3914c558d9d2995208171bea42ca58b73237f (diff) | |
| download | curl-98afec033e425b56cce00b9ef5b44828df0276f0.tar.gz | |
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
Diffstat (limited to 'src/tool_operate.c')
| -rw-r--r-- | src/tool_operate.c | 5 |
1 files changed, 2 insertions, 3 deletions
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" : "")); } |