From 5976bb57b220c6e97b06dd9d4a2089edacda580d Mon Sep 17 00:00:00 2001 From: rjung Date: Fri, 24 Jun 2011 12:48:20 +0000 Subject: [PATCH] Fix IllegalStateException for JavaScript files when switching from Writer to OutputStream. The special handling of this case in the DefaultServlet was broken due to a MIME type change for JavaScript. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1139280 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/servlets/DefaultServlet.java | 3 ++- webapps/docs/changelog.xml | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java index 0cb78bfbb..46210dcc8 100644 --- a/java/org/apache/catalina/servlets/DefaultServlet.java +++ b/java/org/apache/catalina/servlets/DefaultServlet.java @@ -877,7 +877,8 @@ public class DefaultServlet // trying to serve a text file if ( (contentType == null) || (contentType.startsWith("text")) - || (contentType.endsWith("xml")) ) { + || (contentType.endsWith("xml")) + || (contentType.contains("/javascript")) ) { writer = response.getWriter(); // Cannot reliably serve partial content with a Writer ranges = FULL; diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 52df588dd..dec543061 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -142,6 +142,12 @@ Improve JMX unit test. (rjung) + + Fix IllegalStateException for JavaScript files when switching from + Writer to OutputStream. The special handling of this case in the + DefaultServlet was broken due to a MIME type change for JavaScript. + (funkman) + -- 2.11.0