diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-23 12:53:37 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-23 12:53:37 +0000 |
commit | 1cdb944024d0a30bc3730186448ab5bb5862b8e4 (patch) | |
tree | ffd127be557f70280bb1c5aae7ccf06feaf7d2f1 /lib | |
parent | 1e90b4a852bc8c3211ca673cf7230ce824460062 (diff) |
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
Diffstat (limited to 'lib')
-rw-r--r-- | lib/un.rb | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |