From 85a511d2c1b7d7489630d7e2d1112bddd4e20203 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Tue, 1 Sep 2015 09:34:54 +0100 Subject: fix zend signal and tsrm compat --- Zend/zend.c | 4 ---- sapi/apache2handler/sapi_apache2.c | 5 +++++ sapi/cgi/cgi_main.c | 4 ++++ sapi/cli/php_cli.c | 4 ++++ sapi/embed/php_embed.c | 4 ++++ sapi/fpm/fpm/fpm_main.c | 4 ++++ sapi/litespeed/lsapi_main.c | 4 ++++ sapi/phpdbg/phpdbg.c | 4 ++++ 8 files changed, 29 insertions(+), 4 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index d9f29ab0ff..c11f0d62c5 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -755,10 +755,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) / tsrm_set_new_thread_end_handler(zend_new_thread_end_handler); #endif -#ifdef ZEND_SIGNALS - zend_signal_startup(); -#endif - return SUCCESS; } /* }}} */ diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 42861bcf04..3791120c5e 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -455,6 +455,11 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp (void)ts_resource(0); ZEND_TSRMLS_CACHE_UPDATE(); #endif + +#ifdef ZEND_SIGNALS + zend_signal_startup(); +#endif + sapi_startup(&apache2_sapi_module); apache2_sapi_module.startup(&apache2_sapi_module); apr_pool_cleanup_register(pconf, NULL, php_apache_server_shutdown, apr_pool_cleanup_null); diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 3de902a557..e76da2a5b1 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1773,6 +1773,10 @@ int main(int argc, char *argv[]) ZEND_TSRMLS_CACHE_UPDATE(); #endif +#ifdef ZEND_SIGNALS + zend_signal_startup(); +#endif + #ifdef ZTS ts_allocate_id(&php_cgi_globals_id, sizeof(php_cgi_globals_struct), (ts_allocate_ctor) php_cgi_globals_ctor, NULL); #else diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 3b2bed8538..94d5b84f67 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1220,6 +1220,10 @@ int main(int argc, char *argv[]) ZEND_TSRMLS_CACHE_UPDATE(); #endif +#ifdef ZEND_SIGNALS + zend_signal_startup(); +#endif + #ifdef PHP_WIN32 _fmode = _O_BINARY; /*sets default for file streams to binary */ setmode(_fileno(stdin), O_BINARY); /* make the stdio mode be binary */ diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 4e50133dd4..70cc2f1ba3 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -177,6 +177,10 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv) ZEND_TSRMLS_CACHE_UPDATE(); #endif +#ifdef ZEND_SIGNALS + zend_signal_startup(); +#endif + sapi_startup(&php_embed_module); #ifdef PHP_WIN32 diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index e836c7a284..7b02d33dff 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1589,6 +1589,10 @@ int main(int argc, char *argv[]) tsrm_ls = ts_resource(0); #endif +#ifdef ZEND_SIGNALS + zend_signal_startup(); +#endif + sapi_startup(&cgi_sapi_module); cgi_sapi_module.php_ini_path_override = NULL; cgi_sapi_module.php_ini_ignore_cwd = 1; diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index f5f7d39b44..e58587dbe3 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -1005,6 +1005,10 @@ int main( int argc, char * argv[] ) tsrm_startup(1, 1, 0, NULL); #endif +#ifdef ZEND_SIGNALS + zend_signal_startup(); +#endif + if (argc > 1 ) { if ( parse_opt( argc, argv, &climode, &php_ini_path, &php_bind ) == -1 ) { diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 9d87fdfa76..a8247844c8 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1332,6 +1332,10 @@ int main(int argc, char **argv) /* {{{ */ tsrm_ls = ts_resource(0); #endif +#ifdef ZEND_SIGNALS + zend_signal_startup(); +#endif + phpdbg_main: ini_entries = NULL; ini_entries_len = 0; -- cgit v1.2.1