From d71dfe3dd795e3f9e895135f6ec83e43d8877764 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 23 Dec 2009 12:40:59 +0000
Subject: [PATCH] Enforce presence of charset in content-type header of textual
 mime-types in the Examples webapp a) by using a filter, b) by adding
 mime-type mappings for htm/html files

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@893496 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/examples/WEB-INF/web.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index 58119d9b7..a249f8ac7 100644
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -53,6 +53,12 @@
         </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>
@@ -84,6 +90,11 @@
     </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>
@@ -338,4 +349,12 @@
       <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>
-- 
2.11.0