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
This commit is contained in:
Jay Satiro 2017-02-11 16:35:47 -05:00
parent 8721f3a50e
commit e1187c42a4
1 changed files with 7 additions and 2 deletions

View File

@ -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 */