From 1cdb944024d0a30bc3730186448ab5bb5862b8e4 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 23 Oct 2010 12:53:37 +0000 Subject: merges r28944 from trunk into ruby_1_9_2. fixes #3932 -- * lib/un.rb (httpd): SIGQUIT and SIGHUP are not guaranteed to exist. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/un.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/un.rb b/lib/un.rb index 1c52c2f469..3c1f3eca86 100644 --- a/lib/un.rb +++ b/lib/un.rb @@ -317,9 +317,9 @@ def httpd s = WEBrick::HTTPServer.new(options) shut = proc {s.shutdown} Signal.trap("TERM", shut) - Signal.trap("QUIT", shut) + Signal.trap("QUIT", shut) if Signal.list.has_key?("QUIT") if STDIN.tty? - Signal.trap("HUP", shut) + Signal.trap("HUP", shut) if Signal.list.has_key?("HUP") Signal.trap("INT", shut) end s.start -- cgit v1.2.3