* process.c (after_fork): ignores a termination request in the

  parent process.  [ruby-dev:37447]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 62e53b517..16ce2e8ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 27 05:38:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* lib/csv.rb:  Using a more robust transcoding scheme to produce
@@ -197,7 +202,7 @@ Wed Dec 24 06:29:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* 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@ruby-lang.org>
diff --git a/process.c b/process.c
index cfc2e8d5f..1e8546db0 100644
--- a/process.c
+++ b/process.c
@@ -978,7 +978,7 @@ static int forked_child = 0;
 #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"