2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 934c587f12..6c5053eabc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 21 20:11:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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]
+
 Sat Sep 21 01:04:25 2013  Zachary Scott  <e@zzak.io>
 
 	* lib/benchmark.rb: [DOC] grammar of Benchmark#bm [Bug #8888]
diff --git a/process.c b/process.c
index af1f253713..f251505951 100644
--- a/process.c
+++ b/process.c
@@ -3389,10 +3389,6 @@ rb_fork_internal(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
     }
     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;