jeg2	2007-12-02 01:01:49 +0900 (Sun, 02 Dec 2007)

  New Revision: 14070

  Modified files:
    trunk/ChangeLog
    trunk/lib/xmlrpc/server.rb

  Log:
    * lib/xmlrpc/server.rb (XMLRPC::Server#server): Improve signal handling so
      pressing control-c in the controlling terminal or sending SIGTERM stops
      the XML-RPC server.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14070&r2=14069
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/xmlrpc/server.rb?r1=14070&r2=14069

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14069)
+++ ChangeLog	(revision 14070)
@@ -1,3 +1,9 @@
+Wed Dec  2 01:00:07 2007  James Edward Gray II  <jeg2@r...>
+
+	* lib/xmlrpc/server.rb (XMLRPC::Server#server): Improve signal handling so
+	  pressing control-c in the controlling terminal or sending SIGTERM stops
+	  the XML-RPC server.
+
 Sat Dec  1 23:04:42 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* encoding.c: rename primary_encoding -> default_external (encoding).
Index: lib/xmlrpc/server.rb
===================================================================
--- lib/xmlrpc/server.rb	(revision 14069)
+++ lib/xmlrpc/server.rb	(revision 14070)
@@ -639,11 +639,11 @@
   
   def serve
     if RUBY_PLATFORM =~ /mingw|mswin32/
-      signal = 1
+      signals = [1]
     else
-      signal = "HUP"
+      signals = %w[INT TERM HUP]
     end
-    trap(signal) { @server.shutdown }
+    signals.each { |signal| trap(signal) { @server.shutdown } }
 
     @server.start
   end

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