nagachika	2013-10-10 00:54:45 +0900 (Thu, 10 Oct 2013)

  New Revision: 43227

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

  Log:
    merge revision(s) 43008: [Backport #8769]
    
    * process.c (rb_fork_internal): remove cloexec setting on pipes
      created by rb_cloexec_pipe.  patch by normalperson (Eric Wong) at
      [ruby-core:56523].  [Bug #8769]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/process.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 43226)
+++ ruby_2_0_0/ChangeLog	(revision 43227)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Oct 10 00:44:28 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* process.c (rb_fork_internal): remove cloexec setting on pipes
+	  created by rb_cloexec_pipe.  patch by normalperson (Eric Wong) at
+	  [ruby-core:56523].  [Bug #8769]
+
 Thu Oct 10 00:24:01 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* cont.c: disable FIBER_USE_NATIVE on GNU/Hurd because it doesn't
Index: ruby_2_0_0/process.c
===================================================================
--- ruby_2_0_0/process.c	(revision 43226)
+++ ruby_2_0_0/process.c	(revision 43227)
@@ -3328,10 +3328,6 @@ rb_fork_internal(int *status, int (*chfu https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/process.c#L3328
     }
     else {
 	if (pipe_nocrash(ep, fds)) return -1;
-	if (fcntl(ep[1], F_SETFD, FD_CLOEXEC)) {
-	    preserving_errno((close(ep[0]), close(ep[1])));
-	    return -1;
-	}
         pid = retry_fork(status, ep, chfunc_is_async_signal_safe);
         if (pid < 0)
             return pid;
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43226)
+++ ruby_2_0_0/version.h	(revision 43227)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-10-10"
-#define RUBY_PATCHLEVEL 330
+#define RUBY_PATCHLEVEL 331
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 10

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r43008


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