1 files changed, 4 insertions, 1 deletions
diff --git a/signal.c b/signal.c
index 8e84db5874..75908420ef 100644
--- a/signal.c
+++ b/signal.c
@@ -595,7 +595,10 @@ ruby_signal(int signum, sighandler_t handler)
 	    rb_bug_errno("sigaction", errno);
 	}
     }
-    return old.sa_handler;
+    if (old.sa_flags & SA_SIGINFO)
+	return (sighandler_t)old.sa_sigaction;
+    else
+	return old.sa_handler;
 }
 
 sighandler_t