From 844de299cd1b8e2231428a8ac8bb8d284f80497f Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 2 Feb 2009 08:07:47 +0000 Subject: merges r21933 from trunk into ruby_1_9_1. win64 support. * lib/xmlrpc/server.rb (Server#serve): gets rid of hardcoded platform names. * lib/resolv.rb (Resolv::Hosts::DefaultFileName), (Resolv::DNS::Config.default_config_hash): tries win32/resolv on mswin64 too. * lib/rubygems/specification.rb (Gem::Specification#ruby_code): aded mswin64. * lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command): spawn is better to start a process in background. * ext/extmk.rb: uses FNM_SYSCASE. * instruby.rb: installs win32.h on mswin64 platform. [ruby-core:21722] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/xmlrpc/server.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lib/xmlrpc/server.rb') diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb index 0ee88c8c8..131173fa7 100644 --- a/lib/xmlrpc/server.rb +++ b/lib/xmlrpc/server.rb @@ -640,11 +640,7 @@ class Server < WEBrickServlet end def serve - if RUBY_PLATFORM =~ /mingw|mswin32/ - signals = [1] - else - signals = %w[INT TERM HUP] - end + signals = %w[INT TERM HUP] & Signal.list.keys signals.each { |signal| trap(signal) { @server.shutdown } } @server.start -- cgit