diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-09-20 20:22:14 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-09-20 20:22:14 +0100 |
| commit | b3aebda9eaf55706af2e21178f229a171725a168 (patch) | |
| tree | 9aa1794dc4b513d5c0077adcbeb89fa215f181a4 /sapi/apache2handler/sapi_apache2.c | |
| parent | 763bfb4f3b0e66d5a961f9f367aa86e9f9da262e (diff) | |
| download | php-git-b3aebda9eaf55706af2e21178f229a171725a168.tar.gz | |
native tls initial patch
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 08e6caff3c..f993b478bc 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -451,6 +451,7 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp } #ifdef ZTS tsrm_startup(1, 1, 0, NULL); + TSRMLS_INIT(); #endif sapi_startup(&apache2_sapi_module); apache2_sapi_module.startup(&apache2_sapi_module); @@ -540,7 +541,7 @@ static int php_handler(request_rec *r) apr_bucket *bucket; apr_status_t rv; request_rec * volatile parent_req = NULL; - TSRMLS_FETCH(); + TSRMLS_INIT(); #define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC); |