From: Jay Satiro <raysatiro@yahoo.com>
Date: Sat, 11 Feb 2017 21:35:47 +0000 (-0500)
Subject: tool_operate: Show HTTPS-Proxy options on CURLE_SSL_CACERT
X-Git-Tag: curl-7_53_0~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1187c42a4b58f16343d2da653be00c36d930e16;p=curl

tool_operate: Show HTTPS-Proxy options on CURLE_SSL_CACERT

When CURLE_SSL_CACERT occurs the tool shows a lengthy error message to
the user explaining possible solutions such as --cacert and --insecure.

This change appends to that message similar options --proxy-cacert and
--proxy-insecure when there's a specified HTTPS proxy.

Closes https://github.com/curl/curl/issues/1258
---

diff --git a/src/tool_operate.c b/src/tool_operate.c
index db53d0d5a..ef4f74a2b 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -1678,8 +1678,13 @@ static CURLcode operate_do(struct GlobalConfig *global,
           fprintf(global->errors, "curl: (%d) %s\n", result, (errorbuffer[0]) ?
                   errorbuffer : curl_easy_strerror(result));
           if(result == CURLE_SSL_CACERT)
-            fprintf(global->errors, "%s%s",
-                    CURL_CA_CERT_ERRORMSG1, CURL_CA_CERT_ERRORMSG2);
+            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 "
+                     "and --proxy-insecure.\n" :
+                     ""));
         }
 
         /* Fall through comment to 'quit_urls' label */