nobu	2008-07-11 16:46:58 +0900 (Fri, 11 Jul 2008)

  New Revision: 18026

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18026

  Log:
    * merged from trunk r18016:18025.

  Modified files:
    branches/mvm/.merged-trunk-revision
    branches/mvm/ChangeLog
    branches/mvm/win32/win32.c

Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 18025)
+++ mvm/ChangeLog	(revision 18026)
@@ -2,10 +2,20 @@
 
 	* Makefile.in (gvar): make global/static variables list.
 
+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 15:01:12 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* process.c (rb_run_exec_options): default to thread cwd.
 
+Fri Jul 11 14:39:49 2008  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c (CreateChild): the measures for Vista is no longer
+	  unnecessary.
+
 Fri Jul 11 06:45:14 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_core.h (rb_thread_t): per-thread cwd support.  [EXPERIMENTAL]
@@ -63,9 +73,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: mvm/win32/win32.c
===================================================================
--- mvm/win32/win32.c	(revision 18025)
+++ mvm/win32/win32.c	(revision 18026)
@@ -894,7 +894,7 @@
     if (!psa) {
 	sa.nLength              = sizeof (SECURITY_ATTRIBUTES);
 	sa.lpSecurityDescriptor = NULL;
-	sa.bInheritHandle       = IsWinNT() && rb_w32_osver() > 5 ? FALSE : TRUE;
+	sa.bInheritHandle       = TRUE;
 	psa = &sa;
     }
 
@@ -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;
 }
Index: mvm/.merged-trunk-revision
===================================================================
--- mvm/.merged-trunk-revision	(revision 18025)
+++ mvm/.merged-trunk-revision	(revision 18026)
@@ -1 +1 @@
-18016
+18025

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/