com php-src: fix zend signal and tsrm compat: Zend/zend.c sapi/apache2handler/sapi_apache2.c sapi/cgi/cgi_mai n.c sapi/cli/php_cli.c
sapi/embed/php_embed.c s api/fpm/fpm/fpm_main.c sapi/litespeed/lsapi_main.c sapi/phpdbg/phpdbg.c
| From: | Joe Watkins | Date: | Tue, 01 Sep 2015 08:34:54 +0000 |
| Subject: | com php-src: fix zend signal and tsrm compat: Zend/zend.c sapi/apache2handler/sapi_apache2.c sapi/cgi/cgi_mai n.c sapi/cli/php_cli.c sapi/embed/php_embed.c s api/fpm/fpm/fpm_main.c sapi/litespeed/lsapi_main.c sapi/phpdbg/phpdbg.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88815@lists.php.net to get a copy of this message | ||
Commit: 85a511d2c1b7d7489630d7e2d1112bddd4e20203
Author: Joe Watkins <krakjoe@php.net> Tue, 1 Sep 2015 09:34:54 +0100
Parents: 66770f9c37e3821582b02f77867bf09141e59a51
Branches: zend-signal-zts
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=85a511d2c1b7d7489630d7e2d1112bddd4e20203
Log:
fix zend signal and tsrm compat
Changed paths:
M Zend/zend.c
M sapi/apache2handler/sapi_apache2.c
M sapi/cgi/cgi_main.c
M sapi/cli/php_cli.c
M sapi/embed/php_embed.c
M sapi/fpm/fpm/fpm_main.c
M sapi/litespeed/lsapi_main.c
M sapi/phpdbg/phpdbg.c
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index d9f29ab..c11f0d6 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 42861bc..3791120 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 3de902a..e76da2a 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 3b2bed8..94d5b84 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 4e50133..70cc2f1 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 e836c7a..7b02d33 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 f5f7d39..e58587d 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 9d87fdf..a824784 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;