diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-06-20 22:18:46 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-06-20 22:18:46 +0300 |
| commit | 72376dc3d20d564082367d170fab579393baf1ab (patch) | |
| tree | 7b80822432923edb32a528e891ff7d5114578e48 | |
| parent | e7897dc0cd78234857241912ac200af89578a671 (diff) | |
| download | php-git-72376dc3d20d564082367d170fab579393baf1ab.tar.gz | |
Improved support for zend-signals.
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index e3398e03e0..01ab2ad098 100644 --- 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 index a9d4a533b3..650f488752 100644 --- 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); |