yugui	2010-12-25 18:37:26 +0900 (Sat, 25 Dec 2010)

  New Revision: 30362

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

  Log:
    merges r30350 from trunk into ruby_1_9_2.
    --
        * ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
          We must reinitialize GVL when new process creation. Otherwise
          we may meet an insane deadlock. [Bug #4121][ruby-dev:42686]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/pty/pty.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30361)
+++ ruby_1_9_2/ChangeLog	(revision 30362)
@@ -1,3 +1,9 @@
+Sat Dec 25 15:08:08 2010  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
+	  We must reinitialize GVL at new process creation. Otherwise
+	  we may meet an insane deadlock. [Bug#4121][ruby-dev:42686]
+
 Wed Sep  8 22:46:31 2010  NAKAMURA, Hiroshi  <nahi@r...>
 
 	* ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
Index: ruby_1_9_2/ext/pty/pty.c
===================================================================
--- ruby_1_9_2/ext/pty/pty.c	(revision 30361)
+++ ruby_1_9_2/ext/pty/pty.c	(revision 30362)
@@ -166,6 +166,8 @@
     struct exec_info arg;
     int status;
 
+    rb_thread_atfork_before_exec();
+
     /*
      * Set free from process group and controlling terminal
      */
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30361)
+++ ruby_1_9_2/version.h	(revision 30362)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 135
+#define RUBY_PATCHLEVEL 136
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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