diff --git a/thread_pthread.c b/thread_pthread.c index 97879f559a..134d1875cb 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1759,6 +1759,7 @@ ubf_timer_disarm(void) #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 237cc5824e..ce64675c70 100644 --- a/version.h +++ b/version.h @@ -12,11 +12,11 @@ # 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"