diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 02:16:20 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 02:16:20 +0000 |
commit | 63e21a7195ee434acd5de4d48556dbf20eba312b (patch) | |
tree | ad3eb4fe5b60e4ead93ce6cd5a3115689ed7a1e6 | |
parent | 6a1c295da6347c5574b9a825567d20459dffe512 (diff) |
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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | process.c | 2 |
2 files changed, 7 insertions, 2 deletions
@@ -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 @@ -262,7 +267,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> @@ -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" |