From 9ab19d792e8fa412900ad671256ba5ee49730f21 Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 16 Jan 2019 12:04:57 +0000 Subject: merge revision(s) 64476: [Backport #15084] thread_sync.c (rb_mutex_sleep): disable interrupt checking in ensure This is needed to reliably fix ConditionVariable#wait on Thread#kill [Bug #14999] because there is still a chance an interrupt could fire and prevent lock acquisition after an ensure statement. Arguably, rb_mutex_lock itself should be uninterruptible, but that already prevents bootstraptest/test_thread.rb from completing and probably breaks existing use cases. For reference, POSIX expressly forbids EINTR from pthread_mutex_lock. [ruby-core:88556] [Bug #14999] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'version.h') diff --git a/version.h b/version.h index b6b67e1432..99742eddca 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.5.4" -#define RUBY_RELEASE_DATE "2019-01-14" -#define RUBY_PATCHLEVEL 129 +#define RUBY_RELEASE_DATE "2019-01-16" +#define RUBY_PATCHLEVEL 130 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 16 #include "ruby/version.h" -- cgit v1.2.3