diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2002-08-07 10:08:17 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2002-08-07 10:08:17 +0000 |
| commit | 235d9fdadc51e1c24899e164af75cbec0fea267f (patch) | |
| tree | 278b617c7304e95f97cd51b02ce426d54ecb8efc | |
| parent | 88de60e449ad4ab39eac2c35628cc185abc669a3 (diff) | |
| download | cygnal-235d9fdadc51e1c24899e164af75cbec0fea267f.tar.gz cygnal-235d9fdadc51e1c24899e164af75cbec0fea267f.tar.bz2 cygnal-235d9fdadc51e1c24899e164af75cbec0fea267f.zip | |
Fix by Conrad Scott <conrad.scott@dsl.pipex.com>:
* fhandler_socket.cc (fhandler_socket::accept): Fix FIONBIO call.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1512949c8..2099cc3dd 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2002-08-07 Conrad Scott <conrad.scott@dsl.pipex.com> + + * fhandler_socket.cc (fhandler_socket::accept): Fix FIONBIO call. + 2002-08-06 Christopher Faylor <cgf@redhat.com> * cygheap.cc (_csbrk): Avoid !cygheap considerations. diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 6e76a6523..01a9f738e 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -523,8 +523,9 @@ fhandler_socket::accept (struct sockaddr *peer, int *len) /* Unset events for listening socket and switch back to blocking mode */ - WSAEventSelect (get_socket (), ev[0], 0 ); - ioctlsocket (get_socket (), FIONBIO, 0); + WSAEventSelect (get_socket (), ev[0], 0); + unsigned long nonblocking = 0; + ioctlsocket (get_socket (), FIONBIO, &nonblocking); switch (wait_result) { |