From 384224276d25be24b6988e4dab69d56df1d09538 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 20 Jun 2016 17:15:04 +0300 Subject: [PATCH 1/2] Enable Zend signals by default --- Zend/Zend.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index bdeac672b40..9d3b46a755f 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -370,10 +370,10 @@ AC_CHECK_FUNCS(mremap) AC_ARG_ENABLE(zend-signals, -[ --enable-zend-signals Use zend signal handling],[ +[ --disable-zend-signals whether to enable zend signal handling],[ ZEND_SIGNALS=$enableval ],[ - ZEND_SIGNALS=no + ZEND_SIGNALS=yes ]) AC_CHECK_FUNC(sigaction, [ From 72376dc3d20d564082367d170fab579393baf1ab Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 20 Jun 2016 22:18:46 +0300 Subject: [PATCH 2/2] Improved support for zend-signals. --- sapi/cgi/cgi_main.c | 2 ++ sapi/cli/php_cli_server.c | 1 + 2 files changed, 3 insertions(+) diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index e3398e03e05..01ab2ad0982 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 a9d4a533b36..650f4887522 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);