Improved support for zend-signals.

dstogov · dstogov · commit 7cc1b0016301 · 2016-06-20T22:41:14.000+03:00
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
@@ -2066,6 +2066,7 @@ consult the installation file that came with this distribution, or visit \n\
 						sigaction(SIGTERM, &old_term, 0);
 						sigaction(SIGQUIT, &old_quit, 0);
 						sigaction(SIGINT,  &old_int,  0);
+						zend_signal_init();
 						break;
 					case -1:
 						perror("php (pre-forking)");
@@ -2105,6 +2106,7 @@ consult the installation file that came with this distribution, or visit \n\
 			}
 		} else {
 			parent = 0;
+			zend_signal_init();
 		}
 
 #else
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
@@ -2548,6 +2548,7 @@ int do_cli_server(int argc, char **argv) /* {{{ */
 
 #if defined(HAVE_SIGNAL_H) && defined(SIGINT)
 	signal(SIGINT, php_cli_server_sigint_handler);
+	zend_signal_init();
 #endif
 	php_cli_server_do_event_loop(&server);
 	php_cli_server_dtor(&server);

Original file line number	Diff line number	Diff line change
`@@ -2066,6 +2066,7 @@ consult the installation file that came with this distribution, or visit \n\`
`2066`	`2066`	`sigaction(SIGTERM, &old_term, 0);`
`2067`	`2067`	`sigaction(SIGQUIT, &old_quit, 0);`
`2068`	`2068`	`sigaction(SIGINT, &old_int, 0);`
	`2069`	`+ zend_signal_init();`
`2069`	`2070`	`break;`
`2070`	`2071`	`case -1:`
`2071`	`2072`	`perror("php (pre-forking)");`
`@@ -2105,6 +2106,7 @@ consult the installation file that came with this distribution, or visit \n\`
`2105`	`2106`	`}`
`2106`	`2107`	`} else {`
`2107`	`2108`	`parent = 0;`
	`2109`	`+ zend_signal_init();`
`2108`	`2110`	`}`
`2109`	`2111`
`2110`	`2112`	`#else`