[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 66/205: proxy: skip SSL initialization for closed c
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 66/205: proxy: skip SSL initialization for closed connections |
Date: |
Thu, 20 Apr 2017 16:20:06 +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 e84a863dc37f81bca066838a76e1b461c3cabeaf
Author: Michael Kaufmann <address@hidden>
AuthorDate: Fri Mar 10 23:57:09 2017 +0100
proxy: skip SSL initialization for closed connections
This prevents a "Descriptor is not a socket" error for WinSSL.
Reported-by: address@hidden
Reviewed-by: Jay Satiro
Fixes https://github.com/curl/curl/issues/1239
---
lib/http.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/http.c b/lib/http.c
index ebc005060..3f3553abb 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1359,6 +1359,10 @@ CURLcode Curl_http_connect(struct connectdata *conn,
bool *done)
if(result)
return result;
+ if(conn->bits.proxy_connect_closed)
+ /* this is not an error, just part of the connection negotiation */
+ return CURLE_OK;
+
if(CONNECT_FIRSTSOCKET_PROXY_SSL())
return CURLE_OK; /* wait for HTTPS proxy SSL initialization to complete */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 79/205: build: removed redundant DEPENDENCIES from makefiles, (continued)
- [GNUnet-SVN] [gnurl] 79/205: build: removed redundant DEPENDENCIES from makefiles, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 82/205: SSLCERTS.md: mention HTTPS proxies and their separate options, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 53/205: bump: next release will be known as 7.54.0, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 71/205: tool_writeout: fixed a buffer read overrun on --write-out, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 87/205: tests: strip more options from non-HTTP --libcurl tests, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 84/205: CURLINFO_LOCAL_PORT.3: fix typo, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 39/205: ares: better error return on timeouts, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 109/205: openssl: fix comparison between signed and unsigned integer expressions, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 80/205: KNOWN_BUGS: remove libidn related issue, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 92/205: multi: fix streamclose() crash in debug mode, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 66/205: proxy: skip SSL initialization for closed connections,
gnunet <=
- [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