shyouhei	2008-06-08 04:55:06 +0900 (Sun, 08 Jun 2008)

  New Revision: 16964

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/xmlrpc/server.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 14071:
    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_5/lib/xmlrpc/server.rb?r1=16964&r2=16963&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16964&r2=16963&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16964&r2=16963&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16963)
+++ ruby_1_8_5/ChangeLog	(revision 16964)
@@ -1,3 +1,11 @@
+Sun Jun  8 04:54:36 2008  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.
+
 Sun Jun  8 04:46:45 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (newline_node): set line from outermost node before removing
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16963)
+++ ruby_1_8_5/version.h	(revision 16964)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 153
+#define RUBY_PATCHLEVEL 154
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/lib/xmlrpc/server.rb
===================================================================
--- ruby_1_8_5/lib/xmlrpc/server.rb	(revision 16963)
+++ ruby_1_8_5/lib/xmlrpc/server.rb	(revision 16964)
@@ -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/