From caa78917b68a9f5cff65b22e0e53ebd53b2dc5c7 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 6 Apr 2021 21:26:33 +0200 Subject: [PATCH] Cygwin: select: don't set ready for exception on socket shutdown So far select wrongly sets the descriptor as ready for exception when a shutdown occurs. This is entirely non-standard. Only set this bit on an out-of-band event. Signed-off-by: Corinna Vinschen --- winsup/cygwin/select.cc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index 6e8586d17..956cd9bc1 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -1920,10 +1920,7 @@ fhandler_socket_wsock::select_write (select_stuff *ss) s->write_ready = saw_shutdown_write () || connect_state () == unconnected; s->write_selected = true; if (connect_state () != unconnected) - { - s->except_ready = saw_shutdown_write () || saw_shutdown_read (); - s->except_on_write = true; - } + s->except_on_write = true; return s; } @@ -1938,8 +1935,6 @@ fhandler_socket_wsock::select_except (select_stuff *ss) s->cleanup = socket_cleanup; } s->peek = peek_socket; - /* FIXME: Is this right? Should these be used as criteria for except? */ - s->except_ready = saw_shutdown_write () || saw_shutdown_read (); s->except_selected = true; return s; } -- 2.43.5