summaryrefslogtreecommitdiff
path: root/process.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-31 12:58:39 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-31 12:58:39 +0000
commitc04e6e6e61a4e9c52647c2afee24da28174d5e8c (patch)
treec19382e082bab5a95f4e8ff547897a6b043ab9c7 /process.c
parent75c84da28c5e9169a4d48efd1a542d8278b1d436 (diff)
fixed merge mistake at r44766.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r--process.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/process.c b/process.c
index e3bee49ae7..0c19d58122 100644
--- a/process.c
+++ b/process.c
@@ -4915,13 +4915,14 @@ rb_daemon(int nochdir, int noclose)
before_fork();
err = daemon(nochdir, noclose);
after_fork();
+ rb_thread_atfork();
#else
int n;
#define fork_daemon() \
switch (rb_fork(0, 0, 0, Qnil)) { \
case -1: return -1; \
- case 0: break; \
+ case 0: rb_thread_atfork(); break; \
default: _exit(EXIT_SUCCESS); \
}