ext/libxml: Fix build failure with libxml2 2.15.

devnexen · devnexen · commit bc7537dbf014 · 2026-08-08T20:34:23.000+01:00
libxml2 2.15 removed the built-in HTTP client, the FTP module, the functions in xmlunicode.h, the shell and several other legacy symbols. The Windows export list php_libxml2.def still referenced them, so the statically linked build failed with hundreds of unresolved external symbols. Keep php_libxml2_legacy.def as the original export list, unchanged, and make php_libxml2.def the clean 2.15+ list, selecting one or the other depending on the libxml2 version being built against. Also adjust the ext/dom tests for the 2.15 URI change: drive letters are no longer URI schemes on Windows, so relaxNGValidate() reports a backslash path and xmlns="x:y" is no longer absolute. Fix GH-22752 Close GH-22755
diff --git a/NEWS b/NEWS
@@ -18,6 +18,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-23120 (Stack overflow when comparing deeply nested DOM nodes
     with DOMNode::isEqualNode()). (Weilin Du)
 
+- LibXML:
+  . Fixed bug GH-22752 (Build failure with libxml 2.15). (David Carlier)
+
 - MBString:
   . Fixed bug GH-22779 (mb_strrpos() returns the wrong position for a negative
     offset in a non-UTF-8 encoding). (Eyüp Can Akman)
diff --git a/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt b/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
@@ -22,7 +22,7 @@ var_dump($result);
 --EXPECTF--
 Warning: DOMDocument::relaxNGValidate(): I/O %s : failed to load %s
 
-Warning: DOMDocument::relaxNGValidate(): xmlRelaxNGParse: could not load %s/foo.rng in %s on line %d
+Warning: DOMDocument::relaxNGValidate(): xmlRelaxNGParse: could not load %sfoo.rng in %s on line %d
 
 Warning: DOMDocument::relaxNGValidate(): Invalid RelaxNG in %s on line %d
 bool(false)
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_02.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_02.phpt
@@ -25,7 +25,7 @@ echo $html->saveHtml(), "\n";
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>
-            <test xmlns="x:y"/>
+            <test xmlns="xy:z"/>
             <child2/>
         </subcontainer>
         <subcontainer2>
@@ -38,7 +38,7 @@ echo $html->saveHtml(), "\n";
 <html xmlns="http://www.w3.org/1999/xhtml"><head></head><body><p>foo<container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>
-            <test xmlns="x:y"/>
+            <test xmlns="xy:z"/>
             <child2/>
         </subcontainer>
         <subcontainer2>
@@ -49,7 +49,7 @@ echo $html->saveHtml(), "\n";
 <html><head></head><body><p>foo<container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>
-            <test xmlns="x:y"></test>
+            <test xmlns="xy:z"></test>
             <child2></child2>
         </subcontainer>
         <subcontainer2>
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_03.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_03.phpt
@@ -25,7 +25,7 @@ echo $html->saveHtml(), "\n";
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>
-            <test xmlns="x:y"/>
+            <test xmlns="xy:z"/>
             <child2/>
         </subcontainer>
         <subcontainer2>
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_04.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_04.phpt
@@ -25,7 +25,7 @@ echo $html->saveHtml(), "\n";
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>
-            <test xmlns="x:y"/>
+            <test xmlns="xy:z"/>
             <child2/>
         </subcontainer>
         <subcontainer2>
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_05.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_05.phpt
@@ -25,7 +25,7 @@ echo $html->saveHtml(), "\n";
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>
-            <test xmlns="x:y"/>
+            <test xmlns="xy:z"/>
             <child2/>
         </subcontainer>
         <subcontainer2>
@@ -38,7 +38,7 @@ echo $html->saveHtml(), "\n";
 <html xmlns="http://www.w3.org/1999/xhtml"><head></head><body><p>foo<container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>
-            <test xmlns="x:y"/>
+            <test xmlns="xy:z"/>
             <child2/>
         </subcontainer>
         <subcontainer2>
@@ -49,7 +49,7 @@ echo $html->saveHtml(), "\n";
 <html><head></head><body><p>foo<container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>
-            <test xmlns="x:y"></test>
+            <test xmlns="xy:z"></test>
             <child2></child2>
         </subcontainer>
         <subcontainer2>
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_06.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_06.phpt
@@ -25,7 +25,7 @@ echo $html->saveHtml(), "\n";
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>
-            <test xmlns="x:y"/>
+            <test xmlns="xy:z"/>
             <child2/>
         </subcontainer>
         <subcontainer2>
@@ -37,7 +37,7 @@ echo $html->saveHtml(), "\n";
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <html xmlns="http://www.w3.org/1999/xhtml"><head></head><body><p>foo<x xmlns="some:ns">
         <subcontainer>
-            <test xmlns="x:y"/>
+            <test xmlns="xy:z"/>
             <child2/>
         </subcontainer>
         <subcontainer2>
@@ -46,7 +46,7 @@ echo $html->saveHtml(), "\n";
     <child xmlns="some:ns2"/></x></p></body></html>
 <html><head></head><body><p>foo<x>
         <subcontainer>
-            <test xmlns="x:y"></test>
+            <test xmlns="xy:z"></test>
             <child2></child2>
         </subcontainer>
         <subcontainer2>
diff --git a/ext/dom/tests/modern/html/serializer/sample.xml b/ext/dom/tests/modern/html/serializer/sample.xml
@@ -2,7 +2,7 @@
 <container xmlns="some:ns" xmlns:bar="another:ns">
     <x>
         <subcontainer>
-            <test xmlns="x:y" />
+            <test xmlns="xy:z" />
             <child2 />
         </subcontainer>
         <subcontainer2>
diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32
@@ -12,11 +12,19 @@ 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");
 			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) {
-				ADD_DEF_FILE("ext\\libxml\\php_libxml2.def");
+				if (libxml_ver >= 21500) {
+					/* The HTTP and FTP modules, SAX1, the shell, xmlunicode.h
+						and various other legacy symbols were removed in 2.15. */
+					ADD_DEF_FILE("ext\\libxml\\php_libxml2.def");
+				} else {
+					ADD_DEF_FILE("ext\\libxml\\php_libxml2_legacy.def");
+				}
 			}
 			PHP_INSTALL_HEADERS("ext/libxml", "php_libxml.h");
 		} else {
diff --git a/ext/libxml/php_libxml2.def b/ext/libxml/php_libxml2.def
diff --git a/ext/libxml/php_libxml2_legacy.def b/ext/libxml/php_libxml2_legacy.def
