Updated Branches: refs/heads/trunk 898abca02 -> a3e3d487a
AMQ-4856: Use application/xml as content-type in web servlet. Thanks to Fernando Ribeiro for the patch. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a3e3d487 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a3e3d487 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a3e3d487 Branch: refs/heads/trunk Commit: a3e3d487a33e48d0ef697340c5deacd7ba59bffe Parents: 898abca Author: Claus Ibsen <[email protected]> Authored: Fri Nov 22 10:53:07 2013 +0100 Committer: Claus Ibsen <[email protected]> Committed: Fri Nov 22 10:53:07 2013 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/activemq/web/MessageServlet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/a3e3d487/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java ---------------------------------------------------------------------- diff --git a/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java index a89935c..3c0dad2 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java @@ -62,7 +62,7 @@ public class MessageServlet extends MessageServletSupport { private long defaultReadTimeout = -1; private long maximumReadTimeout = 20000; private long requestTimeout = 1000; - private String defaultContentType = "text/xml"; + private String defaultContentType = "application/xml"; private final HashMap<String, WebClient> clients = new HashMap<String, WebClient>(); @@ -323,7 +323,7 @@ public class MessageServlet extends MessageServletSupport { protected String getContentType(HttpServletRequest request) { String value = request.getParameter("xml"); if (value != null && "true".equalsIgnoreCase(value)) { - return "text/xml"; + return "application/xml"; } value = request.getParameter("json"); if (value != null && "true".equalsIgnoreCase(value)) {
