Improved support for zend-signals.

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index e3398e03e05608d513ddf4cc723584b1adccf713..01ab2ad09825a47977a588b1e0f9bf7aec244380 100644 (file)
--- 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 a9d4a533b36063da5739762d00bcffb0c884edc8..650f4887522687aa641392e5927ff1e2d76652d6 100644 (file)
--- 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);