diff options
| author | Anatol Belski <ab@php.net> | 2014-10-15 16:33:40 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-15 16:33:40 +0200 |
| commit | 8aeffdd74c826b5012c9b052848cfa8e593776ed (patch) | |
| tree | f1ba84465211d50075c5e3a14e9d7eaf08bd95be /sapi/apache2handler/sapi_apache2.c | |
| parent | 991a04b068c0b49ed5022d8da735002c5187031b (diff) | |
| download | php-git-8aeffdd74c826b5012c9b052848cfa8e593776ed.tar.gz | |
moved most of the core to use static tsrm ls cache pointer
plus apache2handler, cli and cgi
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 6b0ab4876d..1234f91051 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -71,6 +71,9 @@ /* A way to specify the location of the php.ini dir in an apache directive */ char *apache2_php_ini_path_override = NULL; +#ifdef ZTS +ZEND_TSRMLS_CACHE_DEFINE; +#endif static size_t php_apache_sapi_ub_write(const char *str, size_t str_length TSRMLS_DC) @@ -451,6 +454,8 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp } #ifdef ZTS tsrm_startup(1, 1, 0, NULL); + (void)ts_resource(0); + ZEND_TSRMLS_CACHE_UPDATE; #endif sapi_startup(&apache2_sapi_module); apache2_sapi_module.startup(&apache2_sapi_module); @@ -543,6 +548,7 @@ static int php_handler(request_rec *r) #ifdef ZTS /* initial resource fetch */ void ***tsrm_ls = ts_resource(0); + ZEND_TSRMLS_CACHE_UPDATE; #endif #define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC); |