diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2001-09-20 15:35:49 +0400 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2001-09-20 15:35:49 +0400 |
commit | a2db3c9288de0329591f7cdd3f87af2c020b4be4 (patch) | |
tree | e574e87d68795b1a025f7e7c10538c46ac0ccf5b /winsup | |
parent | 8e54fb88f368b4f582d2f40b42056d730dd229bc (diff) |
* fhandler_socket.cc (fhandler_socket::fixup_after_exec): Close
socket only when not using Winsock2.
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
-rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 0c09bebeb..ecf7b8af8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 20 13:34:00 2001 Corinna Vinschen <corinna@vinschen.de> + + * fhandler_socket.cc (fhandler_socket::fixup_after_exec): Close + socket only when not using Winsock2. + Thu Sep 20 13:20:00 2001 Corinna Vinschen <corinna@vinschen.de> * fhandler.h (fhandler_socket::fixup_after_exec): Remove inline diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index dc76d0e0b..dbf284ec5 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -214,9 +214,10 @@ fhandler_socket::fixup_after_fork (HANDLE parent) void fhandler_socket::fixup_after_exec (HANDLE parent) { + extern WSADATA wsadata; if (!get_close_on_exec ()) fixup_after_fork (parent); - else + else if (wsadata.wVersion < 512) /* < Winsock 2.0 */ closesocket (get_socket ()); } |