From: Anatol Belski <ab@php.net>
Date: Sun, 22 Oct 2017 09:57:35 +0000 (+0200)
Subject: Simplify tsrm cache update
X-Git-Tag: php-7.3.0alpha1~1213
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbc8f8327f05c5dd01732625ca6674ff768aab55;p=php

Simplify tsrm cache update
---

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 21deb4ec80..2fbc47fa75 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -568,6 +568,9 @@ static void php_soap_prepare_globals()
 
 static void php_soap_init_globals(zend_soap_globals *soap_globals)
 {
+#if defined(COMPILE_DL_SOAP) && defined(ZTS)
+	ZEND_TSRMLS_CACHE_UPDATE();
+#endif
 	soap_globals->defEnc = defEnc;
 	soap_globals->defEncIndex = defEncIndex;
 	soap_globals->defEncNs = defEncNs;
@@ -597,9 +600,6 @@ PHP_MSHUTDOWN_FUNCTION(soap)
 
 PHP_RINIT_FUNCTION(soap)
 {
-#if defined(COMPILE_DL_SOAP) && defined(ZTS)
-	ZEND_TSRMLS_CACHE_UPDATE();
-#endif
 	SOAP_GLOBAL(typemap) = NULL;
 	SOAP_GLOBAL(use_soap_error_handler) = 0;
 	SOAP_GLOBAL(error_code) = NULL;
@@ -637,9 +637,6 @@ PHP_MINIT_FUNCTION(soap)
 {
 	zend_class_entry ce;
 
-#if defined(COMPILE_DL_SOAP) && defined(ZTS)
-	ZEND_TSRMLS_CACHE_UPDATE();
-#endif
 	/* TODO: add ini entry for always use soap errors */
 	php_soap_prepare_globals();
 	ZEND_INIT_MODULE_GLOBALS(soap, php_soap_init_globals, NULL);