diff options
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 2 | ||||
| -rw-r--r-- | sapi/embed/php_embed.c | 2 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 2 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_signals.c | 2 | ||||
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 6 |
8 files changed, 0 insertions, 20 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 456b9719fa..6f6de422ba 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -456,9 +456,7 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp ZEND_TSRMLS_CACHE_UPDATE(); #endif -#ifdef ZEND_SIGNALS zend_signal_startup(); -#endif sapi_startup(&apache2_sapi_module); apache2_sapi_module.startup(&apache2_sapi_module); diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index e758b33eeb..e3398e03e0 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1800,9 +1800,7 @@ 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); diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 09ce00f9e7..3c7a136f4e 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1230,9 +1230,7 @@ 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 */ diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 18c2027271..7cc4e6a126 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -177,9 +177,7 @@ 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); diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 5adeb63b7a..6dc8343fe6 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1612,9 +1612,7 @@ 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; diff --git a/sapi/fpm/fpm/fpm_signals.c b/sapi/fpm/fpm/fpm_signals.c index a637e69e71..8d0a4caf25 100644 --- a/sapi/fpm/fpm/fpm_signals.c +++ b/sapi/fpm/fpm/fpm_signals.c @@ -242,9 +242,7 @@ int fpm_signals_init_child() /* {{{ */ return -1; } -#ifdef ZEND_SIGNALS zend_signal_init(); -#endif return 0; } /* }}} */ diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 4dede3f717..da7ca2c30c 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -1007,9 +1007,7 @@ 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, diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 68a164c499..e72b543a42 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1241,11 +1241,7 @@ void phpdbg_signal_handler(int sig, siginfo_t *info, void *context) /* {{{ */ } is_handled = phpdbg_watchpoint_segfault_handler(info, context); if (is_handled == FAILURE) { -#ifdef ZEND_SIGNALS zend_sigaction(sig, &PHPDBG_G(old_sigsegv_signal), NULL); -#else - sigaction(sig, &PHPDBG_G(old_sigsegv_signal), NULL); -#endif } break; } @@ -1342,9 +1338,7 @@ int main(int argc, char **argv) /* {{{ */ ZEND_TSRMLS_CACHE_UPDATE(); #endif -#ifdef ZEND_SIGNALS zend_signal_startup(); -#endif phpdbg_main: ini_entries = NULL; |