153aa9179Sopenharmony_ciFrom 054e46b097524d3808fdc0815b64e14beb2baaf9 Mon Sep 17 00:00:00 2001 253aa9179Sopenharmony_ciFrom: David Kilzer <ddkilzer@apple.com> 353aa9179Sopenharmony_ciDate: Sat, 14 May 2022 08:48:01 -0700 453aa9179Sopenharmony_ciSubject: [PATCH 288/300] Restore behavior of htmlDocContentDumpFormatOutput() 553aa9179Sopenharmony_ci 653aa9179Sopenharmony_ciPatch by J Pascoe of Apple. 753aa9179Sopenharmony_ci 853aa9179Sopenharmony_ci* HTMLtree.c: 953aa9179Sopenharmony_ci(htmlDocContentDumpFormatOutput): 1053aa9179Sopenharmony_ci- Prior to commit b79ab6e6d92, xmlDoc.type was set to 1153aa9179Sopenharmony_ci XML_HTML_DOCUMENT_NODE before dumping the HTML output, then 1253aa9179Sopenharmony_ci restored before returning. 1353aa9179Sopenharmony_ci 1453aa9179Sopenharmony_ciReference:https://github.com/GNOME/libxml2/commit/054e46b097524d3808fdc0815b64e14beb2baaf9 1553aa9179Sopenharmony_ciConflict:NA 1653aa9179Sopenharmony_ci 1753aa9179Sopenharmony_ci--- 1853aa9179Sopenharmony_ci HTMLtree.c | 7 +++++++ 1953aa9179Sopenharmony_ci 1 file changed, 7 insertions(+) 2053aa9179Sopenharmony_ci 2153aa9179Sopenharmony_cidiff --git a/HTMLtree.c b/HTMLtree.c 2253aa9179Sopenharmony_ciindex 7a2b855..2e9fc57 100644 2353aa9179Sopenharmony_ci--- a/HTMLtree.c 2453aa9179Sopenharmony_ci+++ b/HTMLtree.c 2553aa9179Sopenharmony_ci@@ -992,7 +992,14 @@ void 2653aa9179Sopenharmony_ci htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, 2753aa9179Sopenharmony_ci const char *encoding ATTRIBUTE_UNUSED, 2853aa9179Sopenharmony_ci int format) { 2953aa9179Sopenharmony_ci+ int type = 0; 3053aa9179Sopenharmony_ci+ if (cur) { 3153aa9179Sopenharmony_ci+ type = cur->type; 3253aa9179Sopenharmony_ci+ cur->type = XML_HTML_DOCUMENT_NODE; 3353aa9179Sopenharmony_ci+ } 3453aa9179Sopenharmony_ci htmlNodeDumpFormatOutput(buf, cur, (xmlNodePtr) cur, NULL, format); 3553aa9179Sopenharmony_ci+ if (cur) 3653aa9179Sopenharmony_ci+ cur->type = (xmlElementType) type; 3753aa9179Sopenharmony_ci } 3853aa9179Sopenharmony_ci 3953aa9179Sopenharmony_ci /** 4053aa9179Sopenharmony_ci-- 4153aa9179Sopenharmony_ci2.27.0 4253aa9179Sopenharmony_ci 43