allow plain text response to be serialized with 'text/html' content-type

Conal-Tuohy · Aug 26, 2019 · fbc9ae6 · fbc9ae6
1 parent f7e12ee
commit fbc9ae6
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/com/conaltuohy/xprocz/XProcZServlet.java b/src/com/conaltuohy/xprocz/XProcZServlet.java
@@ -86,6 +86,7 @@ public class XProcZServlet extends HttpServlet {
 	private static final String XPROC_Z_SYSTEM_PROPERTIES_NS = "tag:conaltuohy.com,2019:xproc-z-system-properties";
 
 	private static final String XPROC_STEP_NS = "http://www.w3.org/ns/xproc-step";
+	private static final String HTML_NS = "http://www.w3.org/1999/xhtml";
 
 	private final static SAXTransformerFactory transformerFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
 	private final static DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -473,8 +474,16 @@ private void respond(Processor processor, HttpServletResponse resp, XdmNode outp
 					if (isXMLMediaType(contentType)) {
 						serializer.setOutputProperty(Serializer.Property.METHOD, "xml");
 					} else if (isHTMLMediaType(contentType)) {
-						serializer.setOutputProperty(Serializer.Property.METHOD, "xhtml");
-						serializer.setOutputProperty(Serializer.Property.HTML_VERSION, "5");
+						// HTML content may be in the form of an element tree,
+						// or it may be text "&lt;html&gt;" etc.
+						QName htmlName = new QName(HTML_NS, "html");
+						XdmSequenceIterator htmlIterator = bodyElement.axisIterator(Axis.CHILD, htmlName);
+						if (htmlIterator.hasNext()) {
+							serializer.setOutputProperty(Serializer.Property.METHOD, "xhtml");
+							serializer.setOutputProperty(Serializer.Property.HTML_VERSION, "5");
+						} else {
+							serializer.setOutputProperty(Serializer.Property.METHOD, "text");
+						}
 					} else {
 						serializer.setOutputProperty(Serializer.Property.METHOD, "text");
 					}