call previous signal handler

Author: dunglas

Zend/zend.c

@@ -843,6 +843,8 @@ static void zend_timer_create() /* {{{ */
 #  ifdef TIMER_DEBUG
 		fprintf(stderr, "Timer %#jx created on thread %d\n", (uintmax_t) EG(timer), sev.sigev_notify_thread_id);
 #  endif
+
+	sigaction(sev.sigev_signo, NULL, &EG(oldact));
 }
 /* }}} */
 # endif

Zend/zend_execute_API.c

@@ -1334,9 +1334,16 @@ static void zend_timeout_handler(int dummy, siginfo_t *si, void *uc) /* {{{ */
 {
 	if (si->si_value.sival_ptr != &EG(timer)) {
 #ifdef TIMER_DEBUG
-		fprintf(stderr, "ignoring timeout signal SIGIO received on thread %d\n", (pid_t) syscall(SYS_gettid));
+		fprintf(stderr, "Executing previous handler (if set) for unexpected signal SIGIO received on thread %d\n", (pid_t) syscall(SYS_gettid));
 #endif
 
+		if (EG(oldact).sa_sigaction) {
+			EG(oldact).sa_sigaction(dummy, si, uc);
+
+			return;
+		}
+		if (EG(oldact).sa_handler) EG(oldact).sa_handler(dummy);
+
 		return;
 	}
 # else

Zend/zend_globals.h

@@ -24,6 +24,7 @@
 #include <setjmp.h>
 #ifdef ZEND_TIMER
 #include <time.h>
+#include <signal.h>
 #endif
 
 #include "zend_globals_macros.h"
@@ -271,6 +272,7 @@ struct _zend_executor_globals {
 
 #ifndef ZEND_TIMER
 	timer_t timer;
+	struct sigaction oldact;
 #endif
 
 	void *reserved[ZEND_MAX_RESERVED_RESOURCES];