https://git.ruby-lang.org/ruby.git/commit/?id=d4f4ae599f

From d4f4ae599f650feb0a9da6fa486ce425dbe8a81a Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Thu, 10 Jun 2021 10:31:27 +0900
Subject: merge revision(s) 73f9831a57e133ab5645221df862a176a42f6685: [Backport
 #17941]

	POSIX timer cannot be shared in forked process [Bug #17941]

	---
	 thread_pthread.c | 1 +
	 1 file changed, 1 insertion(+)
---
 thread_pthread.c | 1 +
 version.h        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/thread_pthread.c b/thread_pthread.c
index 97879f5..134d187 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -1759,6 +1759,7 @@ ubf_timer_disarm(void) https://github.com/ruby/ruby/blob/trunk/thread_pthread.c#L1759
 #if UBF_TIMER == UBF_TIMER_POSIX
     rb_atomic_t prev;
 
+    if (timer_posix.owner && timer_posix.owner != getpid()) return;
     prev = ATOMIC_CAS(timer_posix.state, RTIMER_ARMED, RTIMER_DISARM);
     switch (prev) {
       case RTIMER_DISARM: return; /* likely */
diff --git a/version.h b/version.h
index 237cc58..ce64675 100644
--- a/version.h
+++ b/version.h
@@ -12,11 +12,11 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 2
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 95
+#define RUBY_PATCHLEVEL 96
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"
 
-- 
cgit v1.1


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