merges r21746 from trunk into ruby_1_9_1.

* signal.c (trap_handler): also accepts symbols.  [ruby-dev:37823]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 495d4ff45..c60d1d3e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 23 13:26:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (trap_handler): also accepts symbols.  [ruby-dev:37823]
+
 Thu Jan 22 18:14:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_makefile): removes installed files under
diff --git a/signal.c b/signal.c
index 8d75c3bc5..317537cae 100644
--- a/signal.c
+++ b/signal.c
@@ -753,6 +753,10 @@ trap_handler(VALUE *cmd, int sig)
     }
     else {
 	command = rb_check_string_type(*cmd);
+	if (NIL_P(command) && SYMBOL_P(*cmd)) {
+	    command = rb_id2str(SYM2ID(*cmd));
+	    if (!command) rb_raise(rb_eArgError, "bad handler");
+	}
 	if (!NIL_P(command)) {
 	    SafeStringValue(command);	/* taint check */
 	    *cmd = command;