summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/fhandler_socket.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 86bdcab61..7ffafce04 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-15 Corinna Vinschen <corinna@vinschen.de>
+
+ * fhandler_socket.cc (fhandler_socket::accept4): Reset async flag
+ on accepted socket.
+
2010-01-15 Pierre A. Humblet <phumblet@phumblet.no-ip.org>
* fhandler_socket.cc (fhandler_socket::accept4): Set nonblocking
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 1526c084e..6f6ab31d2 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -1216,7 +1216,7 @@ fhandler_socket::accept4 (struct sockaddr *peer, int *len, int flags)
fhandler_socket *sock = (fhandler_socket *) res_fd;
sock->set_addr_family (get_addr_family ());
sock->set_socket_type (get_socket_type ());
- sock->async_io (async_io ());
+ sock->async_io (false); /* fdsock switches async mode off. */
if (get_addr_family () == AF_LOCAL)
{
sock->set_sun_path (get_sun_path ());