From 3d78e129b748bf686e606a64c0f44ece110f4c48 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 10 Jun 2002 11:07:44 +0000 Subject: * fhandler.h (fhandler_socket::fixup_after_fork): Revert patch from 2002-06-04. * fhandler_socket.cc (fhandler_socket::fixup_after_fork): Ditto. (fhandler_socket::dup): Ditto. * net.cc (fdsock): Make sockets explicitely noninheritable on NT. --- winsup/cygwin/fhandler_socket.cc | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'winsup/cygwin/fhandler_socket.cc') diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 945088756..3ef35687e 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -183,7 +183,7 @@ fhandler_socket::fixup_before_fork_exec (DWORD win_proc_id) extern "C" void __stdcall load_wsock32 (); void -fhandler_socket::fixup_after_fork (bool dup, HANDLE parent) +fhandler_socket::fixup_after_fork (HANDLE parent) { SOCKET new_sock; @@ -207,10 +207,6 @@ fhandler_socket::fixup_after_fork (bool dup, HANDLE parent) else { debug_printf ("WSASocket went fine new_sock %p, old_sock %p", new_sock, get_io_handle ()); -#if 1 - if (!dup && new_sock != (SOCKET) get_socket ()) - closesocket (get_socket ()); -#endif set_io_handle ((HANDLE) new_sock); } @@ -218,18 +214,12 @@ fhandler_socket::fixup_after_fork (bool dup, HANDLE parent) fork_fixup (parent, secret_event, "secret_event"); } -void -fhandler_socket::fixup_after_fork (HANDLE parent) -{ - fixup_after_fork (false, parent); -} - void fhandler_socket::fixup_after_exec (HANDLE parent) { debug_printf ("here"); if (!get_close_on_exec ()) - fixup_after_fork (false, parent); + fixup_after_fork (parent); #if 0 else if (!winsock2_active) closesocket (get_socket ()); @@ -247,7 +237,7 @@ fhandler_socket::dup (fhandler_base *child) fhs->fixup_before_fork_exec (GetCurrentProcessId ()); if (winsock2_active) { - fhs->fixup_after_fork (true, hMainProc); + fhs->fixup_after_fork (hMainProc); return 0; } return fhandler_base::dup (child); -- cgit v1.2.3