kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r28944 from trunk into ruby_1_9_2. fixes #3932

Browse source 
--
* 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
This commit is contained in:
yugui 2010-10-23 12:53:37 +00:00
parent 1e90b4a852
commit 1cdb944024
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Aug 10 11:26:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/un.rb (httpd): SIGQUIT and SIGHUP are not guaranteed to exist.
Sat Aug 14 17:48:41 2010 Narihiro Nakamura <authorNari@gmail.com> Sat Aug 14 17:48:41 2010 Narihiro Nakamura <authorNari@gmail.com>
* test/objspace/test_objspace.rb: added test for objspace. * test/objspace/test_objspace.rb: added test for objspace.

4
lib/un.rb
View file

@ -317,9 +317,9 @@ def httpd
s = WEBrick::HTTPServer.new(options) s = WEBrick::HTTPServer.new(options)
shut = proc {s.shutdown} shut = proc {s.shutdown}
Signal.trap("TERM", shut) Signal.trap("TERM", shut)
Signal.trap("QUIT", shut) Signal.trap("QUIT", shut) if Signal.list.has_key?("QUIT")
if STDIN.tty? if STDIN.tty?
Signal.trap("HUP", shut) Signal.trap("HUP", shut) if Signal.list.has_key?("HUP")
Signal.trap("INT", shut) Signal.trap("INT", shut)
end end
s.start s.start

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 24 #define RUBY_PATCHLEVEL 25
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1