[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 31/163: multi: provide a socket to wait for in Curl
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 31/163: multi: provide a socket to wait for in Curl_protocol_getsock |
Date: |
Sun, 05 Aug 2018 12:35:57 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 3e0dee065f3a286d5ea85e767d2369a4061c8a55
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu May 24 00:21:37 2018 +0200
multi: provide a socket to wait for in Curl_protocol_getsock
... even when there's no protocol specific handler setup.
Bug: https://curl.haxx.se/mail/lib-2018-05/0062.html
Reported-by: Sean Miller
Closes #2600
---
lib/url.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/url.c b/lib/url.c
index 701f83ab3..411a0c814 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1554,7 +1554,11 @@ int Curl_protocol_getsock(struct connectdata *conn,
{
if(conn->handler->proto_getsock)
return conn->handler->proto_getsock(conn, socks, numsocks);
- return GETSOCK_BLANK;
+ /* Backup getsock logic. Since there is a live socket in use, we must wait
+ for it or it will be removed from watching when the multi_socket API is
+ used. */
+ socks[0] = conn->sock[FIRSTSOCKET];
+ return GETSOCK_READSOCK(0) | GETSOCK_WRITESOCK(0);
}
int Curl_doing_getsock(struct connectdata *conn,
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 16/163: configure: compile-time SIZEOF checks, (continued)
- [GNUnet-SVN] [gnurl] 16/163: configure: compile-time SIZEOF checks, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 34/163: winbuild: In MakefileBuild.vc fix typo DISTDIR->DIRDIST, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 18/163: curl: added --styled-output, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 14/163: docs: clarify CURLOPT_HTTPGET somewhat, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 24/163: configure: add missing m4/ax_compile_check_sizeof.m4, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 21/163: RELEASE-NOTES: synced, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 28/163: cmake: set -d postfix for debug builds if not specified using -DCMAKE_DEBUG_POSTFIX explicitly, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 53/163: os400: sync EBCDIC wrappers and ILE/RPG binding with latest options, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 32/163: content_encoding: handle zlib versions too old for Z_BLOCK, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 38/163: mailmap: Max Savenkov, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 31/163: multi: provide a socket to wait for in Curl_protocol_getsock,
gnunet <=
- [GNUnet-SVN] [gnurl] 41/163: cmdline-opts/gen.pl: warn if mutexes: or see-also: list non-existing options, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 44/163: configure: fix ssh2 linking when built with a static mbedtls, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 67/163: curl_addrinfo: use same #ifdef conditions in source as header, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 33/163: winbuild: only delete OUTFILE if it exists, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 36/163: mailmap: a Richard Alcock fixup, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 17/163: curl: show headers in bold, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 19/163: checksrc: make sure sizeof() is used *with* parentheses, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 27/163: configure: add basic test of --with-ssl prefix, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 37/163: Fix the test for fsetxattr and strerror_r tests in CMake to work without compiling, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 50/163: configure: override AR_FLAGS to silence warning, gnunet, 2018/08/05