diff options
Diffstat (limited to 'main/output.c')
| -rw-r--r-- | main/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/output.c b/main/output.c index c8b41ba1eb..7811316358 100644 --- a/main/output.c +++ b/main/output.c @@ -81,6 +81,7 @@ static int php_output_handler_devnull_func(void **handler_context, php_output_co * Initialize the module globals on MINIT */ static inline void php_output_init_globals(zend_output_globals *G) { + ZEND_TSRMLS_CACHE_UPDATE; memset(G, 0, sizeof(*G)); } /* }}} */ @@ -160,7 +161,7 @@ PHPAPI void php_output_shutdown(void) PHPAPI int php_output_activate(TSRMLS_D) { #ifdef ZTS - memset((*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(output_globals_id)], 0, sizeof(zend_output_globals)); + memset((*((void ***) ZEND_TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(output_globals_id)], 0, sizeof(zend_output_globals)); #else memset(&output_globals, 0, sizeof(zend_output_globals)); #endif @@ -784,7 +785,6 @@ static inline php_output_context *php_output_context_init(php_output_context *co } memset(context, 0, sizeof(php_output_context)); - TSRMLS_SET_CTX(context->tsrm_ls); context->op = op; return context; |