Fix bug 41990. Add some new mime-type mappings.

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

diff --git a/conf/web.xml b/conf/web.xml
index 69bd4d2..1431327 100644 (file)
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -734,6 +734,10 @@
         <mime-type>audio/x-mpeg</mime-type>
     </mime-mapping>
     <mime-mapping>
+        <extension>mp4</extension>
+        <mime-type>video/mp4</mime-type>
+    </mime-mapping>
+    <mime-mapping>
         <extension>mpa</extension>
         <mime-type>audio/x-mpeg</mime-type>
     </mime-mapping>
@@ -1115,6 +1119,10 @@
         <mime-type>application/vnd.wap.wmlscriptc</mime-type>
     </mime-mapping>
     <mime-mapping>
+        <extension>wmv</extension>
+        <mime-type>video/x-ms-wmv</mime-type>
+    </mime-mapping>
+    <mime-mapping>
         <extension>wrl</extension>
         <mime-type>x-world/x-vrml</mime-type>
     </mime-mapping>

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d82a4f0..079b2a2 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -21,6 +21,9 @@
         <bug>42039</bug> Log a stack trace if a servlet throws an
          UnavailableException. Patch provided by Kawasima Kazuh. (markt)
       </fix>
+      <fix>
+        <bug>41990</bug> Add some additional mime-type mappings. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">