nagachika	2016-03-29 02:21:19 +0900 (Tue, 29 Mar 2016)

  New Revision: 54340

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

  Log:
    merge revision(s) 52668: [Backport #11692]
    
    * signal.c: should also clear ruby_disable_gc.
      [Bug #11692]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/signal.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54339)
+++ ruby_2_2/version.h	(revision 54340)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 282
+#define RUBY_PATCHLEVEL 283
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54339)
+++ ruby_2_2/ChangeLog	(revision 54340)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Mar 29 02:08:40 2016  Koichi Sasada  <ko1@a...>
+
+	* signal.c: should also clear ruby_disable_gc.
+	  [Bug #11692]
+
 Tue Mar 29 02:04:18 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_eval.c (rb_f_catch): [DOC] fix malformed RDoc syntax, "+...+"
Index: ruby_2_2/signal.c
===================================================================
--- ruby_2_2/signal.c	(revision 54339)
+++ ruby_2_2/signal.c	(revision 54340)
@@ -745,7 +745,7 @@ rb_get_next_signal(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/signal.c#L745
 
 #if defined SIGSEGV || defined SIGBUS || defined SIGILL || defined SIGFPE
 static const char *received_signal;
-# define clear_received_signal() (void)(received_signal = 0)
+# define clear_received_signal() (void)(ruby_disable_gc = 0, received_signal = 0)
 #else
 # define clear_received_signal() ((void)0)
 #endif

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r52668


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