From 1666b478a1558742a3256134228de06ef50ee60d Mon Sep 17 00:00:00 2001
From: Philipp Schafft <lion@lion.leolix.org>
Date: Sun, 4 Oct 2020 20:46:19 +0000
Subject: [PATCH] Update: Only set namespace for reportxml if not used for XSLT

---
 src/client.c    |  2 +-
 src/reportxml.c | 13 +++++++------
 src/reportxml.h |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/client.c b/src/client.c
index 2b9e397b..38b5caf9 100644
--- a/src/client.c
+++ b/src/client.c
@@ -577,7 +577,7 @@ void client_send_reportxml(client_t *client, reportxml_t *report, document_domai
         return;
     }
 
-    doc = reportxml_render_xmldoc(report);
+    doc = reportxml_render_xmldoc(report, admin_format == ADMIN_FORMAT_RAW || admin_format == ADMIN_FORMAT_JSON);
     if (!doc) {
         ICECAST_LOG_ERROR("Can not render XML Document from report. Sending 500 to client %p", client);
         client_send_500(client, "Can not render XML Document from report.");
diff --git a/src/reportxml.c b/src/reportxml.c
index 51597d58..8945715f 100644
--- a/src/reportxml.c
+++ b/src/reportxml.c
@@ -110,6 +110,7 @@ struct nodedef {
 /* Prototypes */
 static int __attach_copy_of_node_or_definition(reportxml_node_t *parent, reportxml_node_t *node, reportxml_database_t *db, ssize_t depth);
 static reportxml_node_t *      __reportxml_database_build_node_ext(reportxml_database_t *db, const char *id, ssize_t depth, reportxml_node_type_t *acst_type_ret);
+static xmlNodePtr              reportxml_node_render_xmlnode_with_ns(reportxml_node_t *node, xmlNsPtr ns, int set_namespace);
 
 /* definition of known attributes */
 static const struct nodeattr __attr__eol[1]             = {{NULL,           NULL,           NULL,     0,  NULL, {NULL}}};
@@ -330,7 +331,7 @@ reportxml_t *           reportxml_parse_xmldoc(xmlDocPtr doc)
     return ret;
 }
 
-xmlDocPtr               reportxml_render_xmldoc(reportxml_t *report)
+xmlDocPtr               reportxml_render_xmldoc(reportxml_t *report, int set_namespace)
 {
     xmlDocPtr ret;
     xmlNodePtr node;
@@ -338,7 +339,7 @@ xmlDocPtr               reportxml_render_xmldoc(reportxml_t *report)
     if (!report)
         return NULL;
 
-    node = reportxml_node_render_xmlnode(report->root);
+    node = reportxml_node_render_xmlnode_with_ns(report->root, NULL, set_namespace);
     if (!node)
         return NULL;
 
@@ -598,7 +599,7 @@ reportxml_node_t *      reportxml_node_copy(reportxml_node_t *node)
     return __reportxml_node_copy_with_db(node, NULL, -1);
 }
 
-static xmlNodePtr              reportxml_node_render_xmlnode_with_ns(reportxml_node_t *node, xmlNsPtr ns)
+static xmlNodePtr              reportxml_node_render_xmlnode_with_ns(reportxml_node_t *node, xmlNsPtr ns, int set_namespace)
 {
     xmlNodePtr ret;
     ssize_t child_count;
@@ -636,7 +637,7 @@ static xmlNodePtr              reportxml_node_render_xmlnode_with_ns(reportxml_n
         xmlFree(xmlns);
     }
 
-    if (ns)
+    if (ns && set_namespace)
         xmlSetNs(ret, ns);
 
     for (i = 0; i < (size_t)child_count; i++) {
@@ -648,7 +649,7 @@ static xmlNodePtr              reportxml_node_render_xmlnode_with_ns(reportxml_n
             return NULL;
         }
 
-        xmlchild = reportxml_node_render_xmlnode_with_ns(child, ns);
+        xmlchild = reportxml_node_render_xmlnode_with_ns(child, ns, set_namespace);
         refobject_unref(child);
         if (!xmlchild) {
             xmlFreeNode(ret);
@@ -686,7 +687,7 @@ static xmlNodePtr              reportxml_node_render_xmlnode_with_ns(reportxml_n
 
 xmlNodePtr              reportxml_node_render_xmlnode(reportxml_node_t *node)
 {
-    return reportxml_node_render_xmlnode_with_ns(node, NULL);
+    return reportxml_node_render_xmlnode_with_ns(node, NULL, 1);
 }
 
 reportxml_node_type_t   reportxml_node_get_type(reportxml_node_t *node)
diff --git a/src/reportxml.h b/src/reportxml.h
index fb4c494c..427bc57b 100644
--- a/src/reportxml.h
+++ b/src/reportxml.h
@@ -87,7 +87,7 @@ reportxml_node_t *      reportxml_get_node_by_type(reportxml_t *report, reportxm
 /* This function parses an XML document and returns the parst report XML document */
 reportxml_t *           reportxml_parse_xmldoc(xmlDocPtr doc);
 /* This function renders an report XML document as XML structure */
-xmlDocPtr               reportxml_render_xmldoc(reportxml_t *report);
+xmlDocPtr               reportxml_render_xmldoc(reportxml_t *report, int set_namespace);
 
 
 /* ---[ Node level ]--- */