ext/dom: resolve in-scope prefixed QName values during document valid…#22224
Closed
devnexen wants to merge 3 commits into
Closed
ext/dom: resolve in-scope prefixed QName values during document valid…#22224devnexen wants to merge 3 commits into
devnexen wants to merge 3 commits into
Conversation
…ation. Fix php#22219 Modern DOM keeps namespace declarations off the tree (node->nsDef is NULL), so libxml's native validators cannot resolve a prefixed QName appearing in element or attribute content. Temporarily materialize them as nsDef entries around schema, RelaxNG and DTD validation, reusing the C14N relink machinery, then restore the tree.
ndossche
requested changes
Jun 12, 2026
| * that libxml's native validators/canonicalizers can resolve prefixed QNames that | ||
| * appear in element/attribute *content*. Modern DOM keeps declarations off the | ||
| * tree (node->nsDef == NULL), which xmlSearchNs() cannot follow. */ | ||
| PHP_DOM_EXPORT void dom_relink_ns_decls(HashTable *links, xmlNodePtr root); |
Member
There was a problem hiding this comment.
These shouldn't become public APIs imo. It would also not be acceptable in a stable release.
The idea of this PR itself is fine.
| } | ||
|
|
||
| static void dom_relink_ns_decls(HashTable *links, xmlNodePtr root) | ||
| void dom_relink_ns_decls(HashTable *links, xmlNodePtr root) |
Member
There was a problem hiding this comment.
I think the namespace relinking may be moved to namespace_compat.c
ndossche
approved these changes
Jun 12, 2026
| PHP_DOM_EXPORT php_dom_in_scope_ns php_dom_get_in_scope_ns_legacy(const xmlNode *node); | ||
| PHP_DOM_EXPORT void php_dom_in_scope_ns_destroy(php_dom_in_scope_ns *in_scope_ns); | ||
|
|
||
| /* Temporarily materialize namespace declarations as nsDef entries on the tree so |
Member
There was a problem hiding this comment.
Nit: Since this is an installed header file, perhaps this should be moved to the (massive) php_dom.h header instead.
ndossche
approved these changes
Jun 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…ation.
Fix #22219
Modern DOM keeps namespace declarations off the tree (node->nsDef is NULL), so libxml's native validators cannot resolve a prefixed QName appearing in element or attribute content. Temporarily materialize them as nsDef entries around schema, RelaxNG and DTD validation, reusing the C14N relink machinery, then restore the tree.