yugui	2009-03-04 18:19:59 +0900 (Wed, 04 Mar 2009)

  New Revision: 22751

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

  Log:
    merges r22687 from trunk into ruby_1_9_1.
    --
    * process.c (proc_daemon): stops and restarts timer thread because
      daemon(3) implies fork(2).  [ruby-dev:38055]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/process.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22750)
+++ ruby_1_9_1/ChangeLog	(revision 22751)
@@ -1,3 +1,8 @@
+Sun Mar  1 16:01:01 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* process.c (proc_daemon): stops and restarts timer thread because
+	  daemon(3) implies fork(2).  [ruby-dev:38055]
+
 Fri Feb 27 22:02:34 2009  Tanaka Akira  <akr@f...>
 
 	* util.c: fix SEGV by test_time.rb with
Index: ruby_1_9_1/process.c
===================================================================
--- ruby_1_9_1/process.c	(revision 22750)
+++ ruby_1_9_1/process.c	(revision 22751)
@@ -4197,7 +4197,10 @@
     rb_scan_args(argc, argv, "02", &nochdir, &noclose);
 
 #if defined(HAVE_DAEMON)
+    prefork();
+    before_fork();
     n = daemon(RTEST(nochdir), RTEST(noclose));
+    after_fork();
     if (n < 0) rb_sys_fail("daemon");
     return INT2FIX(n);
 #elif defined(HAVE_FORK)

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