- Port patch.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@463861 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index fa82eb7..089fde2 100644 (file)
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -749,7 +749,8 @@ public class DefaultServlet
                 // If it fails, we try to get a Writer instead if we're
                 // trying to serve a text file
                 if ( (contentType == null)
-                     || (contentType.startsWith("text")) ) {
+                        || (contentType.startsWith("text"))
+                        || (contentType.endsWith("xml")) ) {
                     writer = response.getWriter();
                 } else {
                     throw e;