move string interning to MINIT

realFlowControl · realFlowControl · commit 13a243b997ee · 2025-07-24T08:06:58.000+02:00
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -453,7 +453,6 @@ static void php_soap_init_globals(zend_soap_globals *soap_globals)
 	soap_globals->soap_version = SOAP_1_1;
 	soap_globals->mem_cache = NULL;
 	soap_globals->ref_map = NULL;
-	soap_globals->lang_en = zend_string_init_interned(ZEND_STRL("en"), true);
 }
 
 PHP_MSHUTDOWN_FUNCTION(soap)
@@ -553,6 +552,8 @@ PHP_MINIT_FUNCTION(soap)
 	old_error_handler = zend_error_cb;
 	zend_error_cb = soap_error_handler;
 
+	SAPI_GLOBAL(lang_en) = zend_string_init_interned(ZEND_STRL("en"), true);
+
 	return SUCCESS;
 }
 
@@ -4205,7 +4206,7 @@ static xmlNodePtr serialize_zval(zval *val, sdlParamPtr param, const char *param
 	}
 	xmlParam = master_to_xml(enc, val, style, parent);
 	zval_ptr_dtor(&defval);
-	if (xmlParam != NULL) { 
+	if (xmlParam != NULL) {
 		if (xmlParam->name == NULL || strcmp((char*)xmlParam->name, "BOGUS") == 0) {
 			xmlNodeSetName(xmlParam, BAD_CAST(paramName));
 		}

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,6 @@ static void php_soap_init_globals(zend_soap_globals *soap_globals)`
`453`	`453`	`soap_globals->soap_version = SOAP_1_1;`
`454`	`454`	`soap_globals->mem_cache = NULL;`
`455`	`455`	`soap_globals->ref_map = NULL;`
`456`		`- soap_globals->lang_en = zend_string_init_interned(ZEND_STRL("en"), true);`
`457`	`456`	`}`
`458`	`457`
`459`	`458`	`PHP_MSHUTDOWN_FUNCTION(soap)`
`@@ -553,6 +552,8 @@ PHP_MINIT_FUNCTION(soap)`
`553`	`552`	`old_error_handler = zend_error_cb;`
`554`	`553`	`zend_error_cb = soap_error_handler;`
`555`	`554`
	`555`	`+ SAPI_GLOBAL(lang_en) = zend_string_init_interned(ZEND_STRL("en"), true);`
	`556`	`+`
`556`	`557`	`return SUCCESS;`
`557`	`558`	`}`
`558`	`559`
`@@ -4205,7 +4206,7 @@ static xmlNodePtr serialize_zval(zval val, sdlParamPtr param, const char param`
`4205`	`4206`	`}`
`4206`	`4207`	`xmlParam = master_to_xml(enc, val, style, parent);`
`4207`	`4208`	`zval_ptr_dtor(&defval);`
`4208`		`- if (xmlParam != NULL) {`
	`4209`	`+ if (xmlParam != NULL) {`
`4209`	`4210`	`if (xmlParam->name == NULL \|\| strcmp((char*)xmlParam->name, "BOGUS") == 0) {`
`4210`	`4211`	`xmlNodeSetName(xmlParam, BAD_CAST(paramName));`
`4211`	`4212`	`}`