Author: markt
Date: Thu Oct 5 14:46:48 2006
New Revision: 453398
URL: http://svn.apache.org/viewvc?view=rev&rev=453398
Log:
Fix bug 36247. xml is text too.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?view=diff&rev=453398&r1=453397&r2=453398
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Thu Oct 5 14:46:48 2006
@@ -788,7 +788,8 @@
// 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;
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=453398&r1=453397&r2=453398
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Oct 5 14:46:48 2006
@@ -29,6 +29,11 @@
is required to enable this test. (markt)
</fix>
<fix>
+ <bug>36274</bug>: When including static content with the
+ DefaultServlet also treat content types ending in xml as text.
+ (markt)
+ </fix>
+ <fix>
<bug>39724</bug>: Removing the last valve from a pipeline did not
return the pipeline to the original state. Patch provided by
David Gagon. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
