Merge branch 'PHP-8.4' into PHP-8.5

devnexen · devnexen · commit ea7a136c9722 · 2026-04-04T20:33:23.000+01:00
* PHP-8.4: Fix phpGH-21600: Remove xsltCleanupGlobals call in ext/xsl MSHUTDOWN.
diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c
@@ -323,7 +323,6 @@ PHP_MSHUTDOWN_FUNCTION(xsl)
 	xsltUnregisterExtModuleFunction ((const xmlChar *) "function",
 				   (const xmlChar *) "http://php.net/xsl");
 	xsltSetGenericErrorFunc(NULL, NULL);
-	xsltCleanupGlobals();
 
 	return SUCCESS;
 }

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,6 @@ PHP_MSHUTDOWN_FUNCTION(xsl)`
`323`	`323`	`xsltUnregisterExtModuleFunction ((const xmlChar *) "function",`
`324`	`324`	`(const xmlChar *) "http://php.net/xsl");`
`325`	`325`	`xsltSetGenericErrorFunc(NULL, NULL);`
`326`		`- xsltCleanupGlobals();`
`327`	`326`
`328`	`327`	`return SUCCESS;`
`329`	`328`	`}`