yoavs 2004/07/28 10:26:03
Modified: catalina/src/share/org/apache/catalina/ssi SSIServlet.java
webapps/docs changelog.xml
Log:
Addressed Bugzilla 30144, SSIServlet MIME type.
Revision Changes Path
1.7 +6 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java
Index: SSIServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SSIServlet.java 27 Feb 2004 14:58:47 -0000 1.6
+++ SSIServlet.java 28 Jul 2004 17:26:03 -0000 1.7
@@ -164,7 +164,11 @@
return;
}
- res.setContentType("text/html;charset=UTF-8");
+ String resourceMimeType = servletContext.getMimeType(path);
+ if(resourceMimeType == null) {
+ resourceMimeType = "text/html;charset=UTF-8";
+ }
+ res.setContentType(resourceMimeType);
if (expires != null) {
res.setDateHeader("Expires", (
1.82 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- changelog.xml 28 Jul 2004 15:49:19 -0000 1.81
+++ changelog.xml 28 Jul 2004 17:26:03 -0000 1.82
@@ -46,6 +46,9 @@
<fix>
<bug>30325</bug>: Only set CATALINA_HOME if not already set (in
bin/catalina.sh). (yoavs)
</fix>
+ <fix>
+ <bug>30144</bug>: Made SSIServlet check resource MimeType before using
text/html and UTF-8 default. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
