diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-03-14 03:02:10 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-03-14 03:02:10 +0300 |
| commit | 2dd2dcaf9c8bcdda9c687660da887c5fddeb7448 (patch) | |
| tree | 0815453b216df50724b504f01825f3c4ca368f3e /sapi | |
| parent | d349ea3ceb30b99657c0843f6ffc4ed7af619dd5 (diff) | |
| parent | 9499484ed2f0377678b2b4d88573327ee0e4ce6d (diff) | |
| download | php-git-2dd2dcaf9c8bcdda9c687660da887c5fddeb7448.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 3 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 3 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 3 | ||||
| -rw-r--r-- | sapi/embed/php_embed.c | 3 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 7 | ||||
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 3 |
7 files changed, 7 insertions, 19 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index f3325dae89..7b9107e7fc 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -474,8 +474,7 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp apache2_sapi_module.php_ini_path_override = apache2_php_ini_path_override; } #ifdef ZTS - tsrm_startup(1, 1, 0, NULL); - (void)ts_resource(0); + php_tsrm_startup(); # ifdef PHP_WIN32 ZEND_TSRMLS_CACHE_UPDATE(); # endif diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 84d2213cd6..b22d37f89b 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1791,8 +1791,7 @@ int main(int argc, char *argv[]) #endif #ifdef ZTS - tsrm_startup(1, 1, 0, NULL); - (void)ts_resource(0); + php_tsrm_startup(); # ifdef PHP_WIN32 ZEND_TSRMLS_CACHE_UPDATE(); # endif diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 46ed5cb5fb..1aa5d83dd9 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1246,8 +1246,7 @@ int main(int argc, char *argv[]) #ifdef ZTS - tsrm_startup(1, 1, 0, NULL); - (void)ts_resource(0); + php_tsrm_startup(); # ifdef PHP_WIN32 ZEND_TSRMLS_CACHE_UPDATE(); # endif diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 4221e6e0eb..4fcb181cc0 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -171,8 +171,7 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv) #endif #ifdef ZTS - tsrm_startup(1, 1, 0, NULL); - (void)ts_resource(0); + php_tsrm_startup(); # ifdef PHP_WIN32 ZEND_TSRMLS_CACHE_UPDATE(); # endif diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 843e5d913f..307c02ed7c 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1550,10 +1550,6 @@ int main(int argc, char *argv[]) int ini_entries_len = 0; /* end of temporary locals */ -#ifdef ZTS - void ***tsrm_ls; -#endif - int max_requests = 0; int requests = 0; int fcgi_fd = 0; @@ -1583,8 +1579,7 @@ int main(int argc, char *argv[]) #endif #ifdef ZTS - tsrm_startup(1, 1, 0, NULL); - tsrm_ls = ts_resource(0); + php_tsrm_startup(); #endif zend_signal_startup(); diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index be97c46ff4..64e95d5ceb 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -86,7 +86,6 @@ zend_compiler_globals *compiler_globals; zend_executor_globals *executor_globals; php_core_globals *core_globals; sapi_globals_struct *sapi_globals; -void ***tsrm_ls; #endif zend_module_entry litespeed_module_entry; @@ -1234,7 +1233,7 @@ int main( int argc, char * argv[] ) #endif #ifdef ZTS - tsrm_startup(1, 1, 0, NULL); + php_tsrm_startup(); #endif #if PHP_MAJOR_VERSION >= 7 @@ -1262,7 +1261,6 @@ int main( int argc, char * argv[] ) executor_globals = ts_resource(executor_globals_id); core_globals = ts_resource(core_globals_id); sapi_globals = ts_resource(sapi_globals_id); - tsrm_ls = ts_resource(0); SG(request_info).path_translated = NULL; #endif diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 11e1fcf574..51c6cde122 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1416,8 +1416,7 @@ int main(int argc, char **argv) /* {{{ */ phpdbg_main: #ifdef ZTS - tsrm_startup(1, 1, 0, NULL); - (void)ts_resource(0); + php_tsrm_startup(); # ifdef PHP_WIN32 ZEND_TSRMLS_CACHE_UPDATE(); # endif |