summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-21 11:11:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-21 11:11:10 +0000
commitddef263a89c7c1ac2f0cf5f6edfee58aa93c691f (patch)
tree7584fd745096f4dbd556f7dd028bd4c56263041d
parent42cc596402361eced511abe9d51f78fa54818895 (diff)
process.c: remove cloexec setting
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--process.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 934c587..6c5053e 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 af1f253..f251505 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;