yugui	2010-10-23 21:53:37 +0900 (Sat, 23 Oct 2010)

  New Revision: 29571

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29571

  Log:
    merges r28944 from trunk into ruby_1_9_2. fixes #3932
    --
    * lib/un.rb (httpd): SIGQUIT and SIGHUP are not guaranteed to exist.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/un.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29570)
+++ ruby_1_9_2/ChangeLog	(revision 29571)
@@ -1,3 +1,7 @@
+Tue Aug 10 11:26:33 2010  NAKAMURA Usaku  <usa@r...>
+
+	* lib/un.rb (httpd): SIGQUIT and SIGHUP are not guaranteed to exist.
+
 Sat Aug 14 17:48:41 2010  Narihiro Nakamura  <authorNari@g...>
 
 	* test/objspace/test_objspace.rb: added test for objspace.
Index: ruby_1_9_2/lib/un.rb
===================================================================
--- ruby_1_9_2/lib/un.rb	(revision 29570)
+++ ruby_1_9_2/lib/un.rb	(revision 29571)
@@ -317,9 +317,9 @@
     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
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29570)
+++ ruby_1_9_2/version.h	(revision 29571)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/