XMLOutputFormat uses application/xml instead of text/xml
diff --git a/src/main/java/freemarker/core/XMLOutputFormat.java b/src/main/java/freemarker/core/XMLOutputFormat.java
index 41b0a6f..9c45b7d 100644
--- a/src/main/java/freemarker/core/XMLOutputFormat.java
+++ b/src/main/java/freemarker/core/XMLOutputFormat.java
@@ -47,7 +47,7 @@
@Override
public String getMimeType() {
- return "text/xml";
+ return "application/xml";
}
@Override
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index acfead4..b997455 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -5334,7 +5334,7 @@
<literal>&gt;</literal>, <literal>&amp;</literal>,
<literal>&apos;</literal></td>
- <td><literal>text/xml</literal></td>
+ <td><literal>application/xml</literal></td>
<td><literal>XMLOutputFormat.INSTANCE</literal></td>
</tr>
@@ -26458,6 +26458,11 @@
</listitem>
<listitem>
+ <para><literal>XMLOutputFormat</literal> now uses
+ application/xml MIME type instead of text/xml MIME type</para>
+ </listitem>
+
+ <listitem>
<para>Added new built-in: <literal>is_markup_output</literal>,
returns <literal>true</literal> if the value is of type
<quote>markup output</quote>.</para>
diff --git a/src/test/java/freemarker/core/CombinedMarkupOutputFormatTest.java b/src/test/java/freemarker/core/CombinedMarkupOutputFormatTest.java
index dc7dace..fd2ce64 100644
--- a/src/test/java/freemarker/core/CombinedMarkupOutputFormatTest.java
+++ b/src/test/java/freemarker/core/CombinedMarkupOutputFormatTest.java
@@ -187,7 +187,7 @@
@Test
public void testGetMimeType() {
assertEquals("text/html", HTML_RTF.getMimeType());
- assertEquals("text/xml", XML_XML.getMimeType());
+ assertEquals("application/xml", XML_XML.getMimeType());
}
}
diff --git a/src/test/java/freemarker/core/XMLOutputFormatTest.java b/src/test/java/freemarker/core/XMLOutputFormatTest.java
index 4b65415..f9377d5 100644
--- a/src/test/java/freemarker/core/XMLOutputFormatTest.java
+++ b/src/test/java/freemarker/core/XMLOutputFormatTest.java
@@ -54,7 +54,7 @@
@Test
public void testGetMimeType() {
- assertEquals("text/xml", INSTANCE.getMimeType());
+ assertEquals("application/xml", INSTANCE.getMimeType());
}
}