Skip to content

ext/libxml: Fix build failure with libxml2 2.15. #22755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
devnexen wants to merge 4 commits into from
Closed

ext/libxml: Fix build failure with libxml2 2.15. #22755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce9acaa
ext/libxml: Fix build failure with libxml2 2.15.
devnexen Jul 15, 2026
6c7469d
Complete the libxml2 2.15 export prune and select a single .def
devnexen Jul 16, 2026
c3b688b
Restore the chvalid exports and add the new 2.15 symbols
devnexen Jul 17, 2026
2e8e348
Adjust the ext/dom tests for the libxml2 2.15 URI change
devnexen Aug 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_02.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_03.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_04.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_05.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_06.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ext/dom/tests/modern/html/serializer/sample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 9 additions & 1 deletion ext/libxml/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading
Loading