summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Hoersken <info@marc-hoersken.de>2020-07-15 20:53:21 +0200
committerCorinna Vinschen <corinna@vinschen.de>2020-07-16 10:50:51 +0200
commitaa86784937ec7868c358dd90ea5e5324f0be750d (patch)
treed4dbc2768285d0727d5fe0a34c40f35a1d1853b1
parentb1237e64fd03a3b802b9fedde298505e22b3f07f (diff)
downloadcygnal-aa86784937ec7868c358dd90ea5e5324f0be750d.tar.gz
cygnal-aa86784937ec7868c358dd90ea5e5324f0be750d.tar.bz2
cygnal-aa86784937ec7868c358dd90ea5e5324f0be750d.zip
Cygwin: make sure failed sockets always signal writability
Since FD_CONNECT is only given once, we manually need to set FD_WRITE for connection failed sockets to have consistent behaviour in programs calling poll/select multiple times. Example test to non-listening port: curl -v 127.0.0.1:47
-rw-r--r--winsup/cygwin/fhandler_socket_inet.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/winsup/cygwin/fhandler_socket_inet.cc b/winsup/cygwin/fhandler_socket_inet.cc
index 74c415d60..e5b0d2d14 100644
--- a/winsup/cygwin/fhandler_socket_inet.cc
+++ b/winsup/cygwin/fhandler_socket_inet.cc
@@ -376,6 +376,12 @@ fhandler_socket_wsock::evaluate_events (const long event_mask, long &events,
if (erase)
wsock_events->events &= ~(events & ~(FD_WRITE | FD_CLOSE));
}
+ /* Since FD_CONNECT is only given once, we manually need to set
+ FD_WRITE for connection failed sockets to have consistent
+ behaviour in programs calling poll/select multiple times.
+ Example test to non-listening port: curl -v 127.0.0.1:47 */
+ if ((connect_state () == connect_failed) && (event_mask & FD_WRITE))
+ wsock_events->events |= FD_WRITE;
UNLOCK_EVENTS;
return ret;