From c66c5f3c6c595254e5eb4c71d98d22453c7fd329 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 18 Aug 2018 05:20:55 +0000
Subject: merge revision(s) 63741: [Backport #14868]

	process.c (ruby_fork_ruby): fix race in signal handling

	We must block signals before stopping timer-thread, otherwise
	signal handing may be delayed until (and if) another signal
	is received after timer-thread is restarted.

	[ruby-core:87622] [Bug #14868] [Bug #13916]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 process.c | 2 +-
 version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/process.c b/process.c
index 79708b4d00..6c7a117c20 100644
--- a/process.c
+++ b/process.c
@@ -3651,8 +3651,8 @@ rb_fork_ruby(int *status)
 
     while (1) {
 	prefork();
-	before_fork_ruby();
 	disable_child_handler_before_fork(&old);
+	before_fork_ruby();
 	pid = fork();
 	err = errno;
 	after_fork_ruby();
diff --git a/version.h b/version.h
index 9363a1a9cb..12161f6ffe 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.5.2"
 #define RUBY_RELEASE_DATE "2018-08-18"
-#define RUBY_PATCHLEVEL 80
+#define RUBY_PATCHLEVEL 81
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 8
-- 
cgit v1.2.3