nagachika	2018-08-18 14:20:55 +0900 (Sat, 18 Aug 2018)

  New Revision: 64439

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64439

  Log:
    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]

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/process.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/process.c
===================================================================
--- ruby_2_5/process.c	(revision 64438)
+++ ruby_2_5/process.c	(revision 64439)
@@ -3651,8 +3651,8 @@ rb_fork_ruby(int *status) https://github.com/ruby/ruby/blob/trunk/ruby_2_5/process.c#L3651
 
     while (1) {
 	prefork();
-	before_fork_ruby();
 	disable_child_handler_before_fork(&old);
+	before_fork_ruby();
 	pid = fork();
 	err = errno;
 	after_fork_ruby();
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 64438)
+++ ruby_2_5/version.h	(revision 64439)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #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
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 64438)
+++ ruby_2_5	(revision 64439)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r63741

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