Extend C14N fast path to HTML documents too (#12293)

nielsdos · web-flow · commit 12790b2b3540 · 2023-09-24T22:18:32.000+02:00
diff --git a/ext/dom/node.c b/ext/dom/node.c
@@ -1798,7 +1798,8 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
 
 	bool simple_node_parent_lookup_callback = false;
 	if (xpath_array == NULL) {
-		if (nodep->type != XML_DOCUMENT_NODE) {
+		/* Optimization: if the node is a document, all nodes may be included, no extra filtering or nodeset necessary. */
+		if (nodep->type != XML_DOCUMENT_NODE && nodep->type != XML_HTML_DOCUMENT_NODE) {
 			simple_node_parent_lookup_callback = true;
 		}
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -1798,7 +1798,8 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{`
`1798`	`1798`
`1799`	`1799`	`bool simple_node_parent_lookup_callback = false;`
`1800`	`1800`	`if (xpath_array == NULL) {`
`1801`		`- if (nodep->type != XML_DOCUMENT_NODE) {`
	`1801`	`+ /* Optimization: if the node is a document, all nodes may be included, no extra filtering or nodeset necessary. */`
	`1802`	`+ if (nodep->type != XML_DOCUMENT_NODE && nodep->type != XML_HTML_DOCUMENT_NODE) {`
`1802`	`1803`	`simple_node_parent_lookup_callback = true;`
`1803`	`1804`	`}`
`1804`	`1805`	`} else {`