nagachika	2015-01-22 01:15:13 +0900 (Thu, 22 Jan 2015)

  New Revision: 49370

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

  Log:
    merge revision(s) r48884,r48885: [Backport #10615]
    
    * signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT,
      should be treated before calling signal(3).
      [Bug #10615]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/signal.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49369)
+++ ruby_2_1/ChangeLog	(revision 49370)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Jan 22 01:14:12 2015  NAKAMURA Usaku  <usa@r...>
+
+	* signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT,
+	  should be treated before calling signal(3).
+	  [Bug #10615]
+
 Thu Jan 22 01:02:16 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread.c (exec_recursive): use the same last method name as
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49369)
+++ ruby_2_1/version.h	(revision 49370)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-01-22"
-#define RUBY_PATCHLEVEL 283
+#define RUBY_PATCHLEVEL 284
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_1/signal.c
===================================================================
--- ruby_2_1/signal.c	(revision 49369)
+++ ruby_2_1/signal.c	(revision 49370)
@@ -601,6 +601,17 @@ posix_signal(int signum, sighandler_t ha https://github.com/ruby/ruby/blob/trunk/ruby_2_1/signal.c#L601
     return ruby_signal(signum, handler);
 }
 
+#elif defined _WIN32
+static inline sighandler_t
+ruby_signal(int signum, sighandler_t handler)
+{
+    if (signum == SIGKILL) {
+	errno = EINVAL;
+	return SIG_ERR;
+    }
+    return signal(signum, handler);
+}
+
 #else /* !POSIX_SIGNAL */
 #define ruby_signal(sig,handler) (/* rb_trap_accept_nativethreads[(sig)] = 0,*/ signal((sig),(handler)))
 #if 0 /* def HAVE_NATIVETHREAD */

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48884-48885


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