merges r21097 from trunk into ruby_1_9_1.

* process.c (after_exec): needs to reset before restart timer
  thread.

* thread.c (thread_start_func_2): stops timer thread if forked in
  the new thread.   [ruby-core:19385]

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

1 files changed, 3 insertions, 0 deletions

diff --git a/thread.c b/thread.c
index 9e0cebfae..2fcac4995 100644
--- a/thread.c
+++ b/thread.c
@@ -462,6 +462,9 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
 	}
     }
     thread_cleanup_func(th);
+    if (th->vm->main_thread == th) {
+	rb_thread_stop_timer_thread();
+    }
     native_mutex_unlock(&th->vm->global_vm_lock);
 
     return 0;