diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/xmlrpc/server.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Sun Jun 8 04:54:36 2008 James Edward Gray II <jeg2@ruby-lang.org> + + 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@ruby-lang.org> * parse.y (newline_node): set line from outermost node before removing diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb index 7900a1d920..5166d7619f 100644 --- a/lib/xmlrpc/server.rb +++ b/lib/xmlrpc/server.rb @@ -639,11 +639,11 @@ class Server < WEBrickServlet 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 @@ -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 |