From: Anatol Belski <ab@php.net>
Date: Wed, 11 Mar 2015 22:42:39 +0000 (+0100)
Subject: init mbstring tsrm_ls_cache on MINIT
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~694
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ee0395a4ab230fb5b3274ee9476cbcc00ccb872;p=php

init mbstring tsrm_ls_cache on MINIT

as some globals are accessed there already
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index d2c9ace36e..ded79341a8 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -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();