merges r21076 from trunk into ruby_1_9_1.

* process.c (after_fork): ignores a termination request in the
  parent process.  [ruby-dev:37447]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/process.c b/process.c
index 8b8ed17d86..6674b070ca 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"