You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2010/01/14 09:26:37 UTC

svn commit: r899109 - /tomcat/trunk/webapps/examples/WEB-INF/web.xml

Author: kkolinko
Date: Thu Jan 14 08:26:37 2010
New Revision: 899109

URL: http://svn.apache.org/viewvc?rev=899109&view=rev
Log:
Revert examples app patch of r893496
Setting org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true also provides this feature,
and, I think, better than this patch does.

Modified:
    tomcat/trunk/webapps/examples/WEB-INF/web.xml

Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=899109&r1=899108&r2=899109&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Thu Jan 14 08:26:37 2010
@@ -54,12 +54,6 @@
         </init-param>
     </filter>
 
-    <!-- Enforce presence of charset in content-type header of textual mime-types -->
-    <filter>
-        <filter-name>Add Charset to Content-Type Filter</filter-name>
-        <filter-class>org.apache.catalina.filters.AddDefaultCharsetFilter</filter-class>
-    </filter>
-
     <filter>
         <filter-name>Compression Filter</filter-name>
         <filter-class>compressionFilters.CompressionFilter</filter-class>
@@ -91,11 +85,6 @@
     </filter-mapping>
 -->
 
-    <filter-mapping>
-        <filter-name>Add Charset to Content-Type Filter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
 <!--
     <filter-mapping>
       <filter-name>Compression Filter</filter-name>
@@ -350,12 +339,4 @@
       <url-pattern>/async/stockticker</url-pattern>
     </servlet-mapping>
 
-    <mime-mapping>
-        <extension>htm</extension>
-        <mime-type>text/html;charset=iso-8859-1</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>html</extension>
-        <mime-type>text/html;charset=iso-8859-1</mime-type>
-    </mime-mapping>
 </web-app>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org