[GNUnet-SVN] [gnurl] 85/205: tool_operate: Fix showing HTTPS-Proxy options on CURLE_SSL_CACERT

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.

commit 98afec033e425b56cce00b9ef5b44828df0276f0
Author: Jay Satiro <address@hidden>
AuthorDate: Thu Mar 16 18:23:31 2017 -0400

    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(-)

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" :
                      ""));
         }

-- 
To stop receiving notification emails like this one, please contact
address@hidden