[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 85/205: tool_operate: Fix showing HTTPS-Proxy optio
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 85/205: tool_operate: Fix showing HTTPS-Proxy options on CURLE_SSL_CACERT |
Date: |
Thu, 20 Apr 2017 16:20:25 +0200 |
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
- [GNUnet-SVN] [gnurl] 75/205: make: regenerate docs/curl.1 by runinng make in docs, (continued)
- [GNUnet-SVN] [gnurl] 75/205: make: regenerate docs/curl.1 by runinng make in docs, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 100/205: test2033: flaky, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 89/205: tests: fixed the documented test server port numbers, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 101/205: make: introduce 'test-nonflaky' target, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 72/205: test1287: added verbose logs keyword, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 76/205: RELEASE-NOTES: synced with c25e0761d0fc49c4, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 52/205: openssl: unbreak the build after 6448f98c1857de, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 91/205: CONTRIBUTE: mention referring to github issues in commit msgs, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 86/205: darwinssl: fix typo in variable name, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 94/205: RELEASE-NOTES: typo, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 85/205: tool_operate: Fix showing HTTPS-Proxy options on CURLE_SSL_CACERT,
gnunet <=
- [GNUnet-SVN] [gnurl] 113/205: .gitattributes: turn off CRLF for *.am, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 120/205: http: do not treat FTPS over CONNECT as HTTPS, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 110/205: tests/README: make "Run" section foolproof, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 98/205: cmake: add support for building HTML and PDF docs, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 95/205: examples: comment typos in http2 examples, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 70/205: url: add option CURLOPT_SUPPRESS_CONNECT_HEADERS, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 22/205: url: split off proxy init and parsing from create_conn, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 122/205: make: use the variable MAKE for recursive calls, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 129/205: cmake: add cmake file in docs/libcurl/opts/ to dist, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 45/205: gitignore: Ignore man page dist files, gnunet, 2017/04/20