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]


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

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c70385595..feabab2047 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 30 02:28:13 2016  Eric Wong  <e@80x24.org>
+
+	* 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@ruby-lang.org>
 
 	* localeinit.c (rb_locale_charmap_index): fix prototype.
diff --git a/thread_pthread.c b/thread_pthread.c
index 1acd56c357..a070434afe 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -1423,8 +1423,6 @@ setup_communication_pipe(void)
 	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)
 #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);
diff --git a/version.h b/version.h
index 9084464c6f..b4596b56b6 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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