Commit 8a37b4d5264 for php.net

commit 8a37b4d526487b8dd49caf2a87f567ded1134ac1
Merge: 19eda22e90b bc7537dbf01
Author: David Carlier <devnexen@gmail.com>
Date:   Sat Aug 8 20:34:40 2026 +0100

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      ext/libxml: Fix build failure with libxml2 2.15.

    # Conflicts:
    #       ext/libxml/config.w32

diff --cc ext/libxml/config.w32
index 2362ea0c2ba,68e96bd5137..8c9bb90edde
--- a/ext/libxml/config.w32
+++ b/ext/libxml/config.w32
@@@ -11,7 -12,9 +11,9 @@@ if (PHP_LIBXML == "yes")
  		if (GREP_HEADER("libxml/xmlversion.h", "#define\\s+LIBXML_VERSION\\s+(\\d+)", PHP_PHP_BUILD + "\\include\\libxml2") &&
  				+RegExp.$1 >= 20904) {

+ 			var libxml_ver = +RegExp.$1; /* capture now; RegExp.$1 gets clobbered below */
+
 -			EXTENSION("libxml", "libxml.c mime_sniff.c", false /* never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 +			EXTENSION("libxml", "libxml.c mime_sniff.c image_svg.c", false /* never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
  			AC_DEFINE("HAVE_LIBXML", 1, "Define to 1 if the PHP extension 'libxml' is available.");
  			ADD_FLAG("CFLAGS_LIBXML", "/D LIBXML_STATIC /D LIBXML_STATIC_FOR_DLL /D HAVE_WIN32_THREADS ");
  			if (!PHP_LIBXML_SHARED) {