naruse	2016-03-30 02:32:36 +0900 (Wed, 30 Mar 2016)

  New Revision: 54426

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54426

  Log:
    merge revision(s) 53373: [Backport #11922]
    
    * thread_pthread.c (setup_communication_pipe): delay setting owner
      (rb_thread_create_timer_thread): until thread creation succeeds
      [ruby-core:72590] [Bug #11922]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/thread_pthread.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54425)
+++ ruby_2_3/version.h	(revision 54426)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-03-30"
-#define RUBY_PATCHLEVEL 70
+#define RUBY_PATCHLEVEL 71
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_3/thread_pthread.c
===================================================================
--- ruby_2_3/thread_pthread.c	(revision 54425)
+++ ruby_2_3/thread_pthread.c	(revision 54426)
@@ -1423,8 +1423,6 @@ setup_communication_pipe(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread_pthread.c#L1423
 	return e;
     }
 
-    /* validate pipe on this process */
-    timer_thread_pipe.owner_process = getpid();
     return 0;
 }
 
@@ -1632,6 +1630,9 @@ rb_thread_create_timer_thread(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread_pthread.c#L1630
 #endif
 	    return;
 	}
+
+	/* validate pipe on this process */
+	timer_thread_pipe.owner_process = getpid();
 	timer_thread.created = 1;
 #ifdef HAVE_PTHREAD_ATTR_INIT
 	pthread_attr_destroy(&attr);
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54425)
+++ ruby_2_3/ChangeLog	(revision 54426)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Wed Mar 30 02:28:13 2016  Eric Wong  <e@8...>
+
+	* thread_pthread.c (setup_communication_pipe): delay setting owner
+	  (rb_thread_create_timer_thread): until thread creation succeeds
+	  [ruby-core:72590] [Bug #11922]
+
 Wed Mar 30 02:20:06 2016  NARUSE, Yui  <naruse@r...>
 
 	* localeinit.c (rb_locale_charmap_index): fix prototype.

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53373


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