diff options
| author | Anatol Belski <ab@php.net> | 2014-10-17 14:16:40 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-17 14:16:40 +0200 |
| commit | fea10f6a5e5ff4d22adea5fd04476a88d4f76db8 (patch) | |
| tree | aeb75efdddd8ae643662c88bef39faafacc8130a /ext/json/json.c | |
| parent | 83b8e281dba11f4a037dd5977812f84661fe895e (diff) | |
| download | php-git-fea10f6a5e5ff4d22adea5fd04476a88d4f76db8.tar.gz | |
ext/iconv, ext/json and ext/session use static tsrmls pointer
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 8f4f281ef1..91bedcace9 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -125,6 +125,9 @@ static PHP_MINIT_FUNCTION(json) */ static PHP_GINIT_FUNCTION(json) { +#if defined(COMPILE_DL_JSON) && defined(ZTS) + ZEND_TSRMLS_CACHE_UPDATE; +#endif json_globals->encoder_depth = 0; json_globals->error_code = 0; json_globals->encode_max_depth = 0; @@ -153,6 +156,9 @@ zend_module_entry json_module_entry = { /* }}} */ #ifdef COMPILE_DL_JSON +#ifdef ZTS +ZEND_TSRMLS_CACHE_DEFINE; +#endif ZEND_GET_MODULE(json) #endif |