Fixed incorrect signal handlers overriding

dstogov · dstogov · commit f76a955c02f6 · 2018-10-16T13:52:36.000+03:00
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
@@ -322,8 +322,10 @@ void zend_signal_activate(void)
 
 	memcpy(&SIGG(handlers), &global_orig_handlers, sizeof(global_orig_handlers));
 
-	for (x = 0; x < sizeof(zend_sigs) / sizeof(*zend_sigs); x++) {
-		zend_signal_register(zend_sigs[x], zend_signal_handler_defer);
+	if (SIGG(reset)) {
+		for (x = 0; x < sizeof(zend_sigs) / sizeof(*zend_sigs); x++) {
+			zend_signal_register(zend_sigs[x], zend_signal_handler_defer);
+		}
 	}
 
 	SIGG(active) = 1;
@@ -365,6 +367,7 @@ static void zend_signal_globals_ctor(zend_signal_globals_t *zend_signal_globals)
 	size_t x;
 
 	memset(zend_signal_globals, 0, sizeof(*zend_signal_globals));
+	zend_signal_globals->reset = 1;
 
 	for (x = 0; x < sizeof(zend_signal_globals->pstorage) / sizeof(*zend_signal_globals->pstorage); ++x) {
 		zend_signal_queue_t *queue = &zend_signal_globals->pstorage[x];
diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h
@@ -59,6 +59,7 @@ typedef struct _zend_signal_globals_t {
 	int running;            /* in signal handler execution */
 	int active;             /* internal signal handling is enabled */
 	zend_bool check;        /* check for replaced handlers on shutdown */
+	zend_bool reset;        /* reset signal handlers on each request */
 	zend_signal_entry_t handlers[NSIG];
 	zend_signal_queue_t pstorage[ZEND_SIGNAL_QUEUE_SIZE], *phead, *ptail, *pavail; /* pending queue */
 } zend_signal_globals_t;
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -3738,6 +3738,7 @@ static int accel_finish_startup(void)
 		int (*orig_send_headers)(sapi_headers_struct *sapi_headers TSRMLS_DC) = sapi_module.send_headers;
 		void (*orig_send_header)(sapi_header_struct *sapi_header, void *server_context TSRMLS_DC)= sapi_module.send_header;
 		char *(*orig_getenv)(char *name, size_t name_len TSRMLS_DC) = sapi_module.getenv;
+		zend_bool old_reset_signals = SIGG(reset);
 
 		sapi_module.activate = NULL;
 		sapi_module.deactivate = NULL;
@@ -3752,6 +3753,7 @@ static int accel_finish_startup(void)
 			zend_interned_strings_set_permanent_storage_copy_handlers(NULL, accel_use_permanent_interned_strings);
 		}
 
+		SIGG(reset) = 0;
 		if (php_request_startup() == SUCCESS) {
 
 			/* don't send headers */
@@ -3778,6 +3780,7 @@ static int accel_finish_startup(void)
 		} else {
 			ret = FAILURE;
 		}
+		SIGG(reset) = old_reset_signals;
 
 		sapi_module.activate = orig_activate;
 		sapi_module.deactivate = orig_deactivate;
