From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 9 Jun 2006 23:09:40 +0000 (+0000)
Subject: Port fix for bug 39752 from 5.5.x.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9df075ef74ac6974535bd8a9e91fc16a8860461a;p=tomcat7.0

Port fix for bug 39752 from 5.5.x.

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

diff --git a/conf/web.xml b/conf/web.xml
index 1e117b82e..90fadaa94 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -392,8 +392,10 @@
   <!-- directives in HTML pages consistent with similar support in web      -->
   <!-- servers like Apache.  Traditionally, this filter is mapped to the    -->
   <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will     -->
-  <!-- selectively enable/disable SSI processing based on mime types.  The  -->
-  <!-- contentType init param allows you to apply SSI processing to JSP     -->
+  <!-- selectively enable/disable SSI processing based on mime types. For   -->
+  <!-- this to work you will need to uncomment the .shtml mime type         -->
+  <!-- definition towards the bottom of this file.                          -->
+  <!-- The contentType init param allows you to apply SSI processing to JSP -->
   <!-- pages, javascript, or any other content you wish.  This filter       -->
   <!-- supports the following initialization parameters (default values are -->
   <!-- in square brackets):                                                 -->
@@ -875,10 +877,12 @@
         <extension>shar</extension>
         <mime-type>application/x-shar</mime-type>
     </mime-mapping>
+<!--
     <mime-mapping>
         <extension>shtml</extension>
         <mime-type>text/x-server-parsed-html</mime-type>
     </mime-mapping>
+-->
     <mime-mapping>
         <extension>smf</extension>
         <mime-type>audio/x-midi</mime-type>