ruby-changes:6508
From: usa <ko1@a...>
Date: Fri, 11 Jul 2008 16:18:50 +0900 (JST)
Subject: [ruby-changes:6508] Ruby:r18024 (trunk): * win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair):
usa 2008-07-11 16:18:29 +0900 (Fri, 11 Jul 2008) New Revision: 18024 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18024 Log: * win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair): prohibit inheritance of sockets, too. [experimental] Modified files: trunk/ChangeLog trunk/win32/win32.c Index: ChangeLog =================================================================== --- ChangeLog (revision 18023) +++ ChangeLog (revision 18024) @@ -1,3 +1,8 @@ +Fri Jul 11 16:16:43 2008 NAKAMURA Usaku <usa@r...> + + * win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair): + prohibit inheritance of sockets, too. [experimental] + Fri Jul 11 14:39:49 2008 NAKAMURA Usaku <usa@r...> * win32/win32.c (CreateChild): the measures for Vista is no longer @@ -36,9 +41,11 @@ * test/win32ole/test_win32ole_method.rb: ditto. Thu Jul 10 19:38:35 2008 wanabe <s.wanabe@g...> + * test/ruby/envutil.rb (assert_normal_exit): r17993 revert. Thu Jul 10 18:29:41 2008 wanabe <s.wanabe@g...> + * test/ruby/envutil.rb (assert_normal_exit): finish writing script before spawn("ruby") to avoid blocking in win32. Index: win32/win32.c =================================================================== --- win32/win32.c (revision 18023) +++ win32/win32.c (revision 18024) @@ -2269,7 +2269,7 @@ s = -1; } else { - s = rb_w32_open_osfhandle(r, O_RDWR|O_BINARY); + s = rb_w32_open_osfhandle(r, O_RDWR|O_BINARY|O_NOINHERIT); } }); return s; @@ -2568,7 +2568,7 @@ fd = -1; } else { - fd = rb_w32_open_osfhandle(s, O_RDWR|O_BINARY); + fd = rb_w32_open_osfhandle(s, O_RDWR|O_BINARY|O_NOINHERIT); } }); return fd; @@ -2788,8 +2788,8 @@ if (socketpair_internal(af, type, protocol, pair) < 0) return -1; - sv[0] = rb_w32_open_osfhandle(pair[0], O_RDWR|O_BINARY); - sv[1] = rb_w32_open_osfhandle(pair[1], O_RDWR|O_BINARY); + sv[0] = rb_w32_open_osfhandle(pair[0], O_RDWR|O_BINARY|O_NOINHERIT); + sv[1] = rb_w32_open_osfhandle(pair[1], O_RDWR|O_BINARY|O_NOINHERIT); return 0; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/