ruby-changes:5464
From: shyouhei <ko1@a...>
Date: Sun, 8 Jun 2008 04:56:22 +0900 (JST)
Subject: [ruby-changes:5464] Ruby:r16966 (ruby_1_8_6): merge revision(s) 14071:
shyouhei 2008-06-08 04:56:11 +0900 (Sun, 08 Jun 2008) New Revision: 16966 Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/lib/xmlrpc/server.rb branches/ruby_1_8_6/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_6/ChangeLog?r1=16966&r2=16965&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16966&r2=16965&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/lib/xmlrpc/server.rb?r1=16966&r2=16965&diff_format=u Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 16965) +++ ruby_1_8_6/ChangeLog (revision 16966) @@ -1,3 +1,11 @@ +Sun Jun 8 04:55:26 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:49:43 2008 Nobuyoshi Nakada <nobu@r...> * parse.y (newline_node): set line from outermost node before removing Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 16965) +++ ruby_1_8_6/version.h (revision 16966) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #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_6/lib/xmlrpc/server.rb =================================================================== --- ruby_1_8_6/lib/xmlrpc/server.rb (revision 16965) +++ ruby_1_8_6/lib/xmlrpc/server.rb (revision 16966) @@ -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/