From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 14 Jan 2010 08:26:37 +0000 (+0000)
Subject: Revert examples app patch of r893496
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=102442f8734cb575c57f8a4612810287ff3f7802;p=tomcat7.0

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.

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

diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index f1c5cbe4d..70a2153f8 100644
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -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>