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

  New Revision: 14071

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/xmlrpc/server.rb

  Log:
    Merged 14070 from trunk.
    
    * 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/branches/ruby_1_8/ChangeLog?r1=14071&r2=14070
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/xmlrpc/server.rb?r1=14071&r2=14070

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 14070)
+++ ruby_1_8/ChangeLog	(revision 14071)
@@ -1,3 +1,11 @@
+Wed Dec  2 01:12:15 2007  James Edward Gray II  <jeg2@r...>
+
+	Merged 14070 from trunk.
+	
+	* 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 15:13:33 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/resolv.rb: documentation update.  backported from 1.9.
Index: ruby_1_8/lib/xmlrpc/server.rb
===================================================================
--- ruby_1_8/lib/xmlrpc/server.rb	(revision 14070)
+++ ruby_1_8/lib/xmlrpc/server.rb	(revision 14071)
@@ -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