summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/monitor.rb6
-rw-r--r--version.h4
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/monitor.rb b/lib/monitor.rb
index 999795c3d0..5b6b14e305 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -225,11 +225,13 @@ module MonitorMixin
# +MonitorMixin+.
#
def mon_synchronize
- mon_enter
+ # Prevent interrupt on handling interrupts; for example timeout errors
+ # it may break locking state.
+ Thread.handle_interrupt(Exception => :never){ mon_enter }
begin
yield
ensure
- mon_exit
+ Thread.handle_interrupt(Exception => :never){ mon_exit }
end
end
alias synchronize mon_synchronize
diff --git a/version.h b/version.h
index 7ff4100f7b..cf7115370e 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.6.3"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 92
+#define RUBY_PATCHLEVEL 93
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 18
#include "ruby/version.h"