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

3 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ca818e10fc..c0dc004d6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* test/objspace/test_objspace.rb: added test for objspace.
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
diff --git a/version.h b/version.h
index 3597dd99cc..17834f5a38 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 24
+#define RUBY_PATCHLEVEL 25
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1