yugui	2008-12-27 11:16:20 +0900 (Sat, 27 Dec 2008)

  New Revision: 21082

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

  Log:
    merges r21076 from trunk into ruby_1_9_1.
    * process.c (after_fork): ignores a termination request in the
      parent process.  [ruby-dev:37447]

  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 21081)
+++ ruby_1_9_1/ChangeLog	(revision 21082)
@@ -1,3 +1,8 @@
+Sat Dec 27 05:38:59 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* process.c (after_fork): ignores a termination request in the
+	  parent process.  [ruby-dev:37447]
+
 Sat Dec 27 01:52:39 2008  James Edward Gray II  <jeg2@r...>
 
 	* lib/csv.rb:  Using a more robust transcoding scheme to produce
@@ -262,7 +267,7 @@
 	* configure.in (OBJDUMP, OBJCOPY): autoconf list is not comma
 	  separated.
 
-	* configure.in (AC_HEADER_STDC, AC_CHECK_HEADERS AC_CHECK_FUNCS):
+	* configure.in (AC_HEADER_STDC, AC_CHECK_HEADERS, AC_CHECK_FUNCS):
 	  removed duplicated checks.
 
 Wed Dec 24 03:21:21 2008  Yukihiro Matsumoto  <matz@r...>
Index: ruby_1_9_1/process.c
===================================================================
--- ruby_1_9_1/process.c	(revision 21081)
+++ ruby_1_9_1/process.c	(revision 21082)
@@ -978,7 +978,7 @@
 #define after_exec() \
   (rb_thread_start_timer_thread(), forked_child = 0, rb_disable_interrupt())
 #define before_fork() before_exec()
-#define after_fork() after_exec()
+#define after_fork() (GET_THREAD()->thrown_errinfo = 0, after_exec())
 
 #include "dln.h"
 

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