]> granicus.if.org Git - php/commitdiff
init mbstring tsrm_ls_cache on MINIT
authorAnatol Belski <ab@php.net>
Wed, 11 Mar 2015 22:42:39 +0000 (23:42 +0100)
committerAnatol Belski <ab@php.net>
Wed, 11 Mar 2015 22:42:39 +0000 (23:42 +0100)
as some globals are accessed there already

ext/mbstring/mbstring.c

index d2c9ace36ec8f3f2e89c5264c183fa4147daedc8..ded79341a81720c7334c3e1095ce235201846709 100644 (file)
@@ -1546,6 +1546,9 @@ static PHP_GSHUTDOWN_FUNCTION(mbstring)
 /* {{{ PHP_MINIT_FUNCTION(mbstring) */
 PHP_MINIT_FUNCTION(mbstring)
 {
+#if defined(COMPILE_DL_MBSTRING) && defined(ZTS)
+ZEND_TSRMLS_CACHE_UPDATE();
+#endif
        __mbfl_allocators = &_php_mb_allocators;
 
        REGISTER_INI_ENTRIES();