From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 16 Apr 2011 22:50:05 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51050
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=56b103662b7cd6c74b09b239250e461bc9a59b64;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51050
Add additional common but non-standard file extension to MIME type mappings for MPEG 4 files.
Based on a patch by Cédrik Lime.


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

diff --git a/conf/web.xml b/conf/web.xml
index e52355d66..b096657c7 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -690,6 +690,22 @@
         <mime-type>audio/x-mpegurl</mime-type>
     </mime-mapping>
     <mime-mapping>
+        <extension>m4a</extension>
+        <mime-type>audio/mp4</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>m4b</extension>
+        <mime-type>audio/mp4</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>m4r</extension>
+        <mime-type>audio/mp4</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>m4v</extension>
+        <mime-type>video/mp4</mime-type>
+    </mime-mapping>
+    <mime-mapping>
         <extension>mac</extension>
         <mime-type>image/x-macpaint</mime-type>
     </mime-mapping>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cf8795d3b..6e98e2b94 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -69,6 +69,11 @@
         <bug>51042</bug>: Don&apos;t trigger session creation listeners when a
         session ID is changed as part of the authentication process. (markt)
       </fix>
+      <fix>
+        <bug>51050</bug>: Add additional common but non-standard file extension
+        to MIME type mappings for MPEG 4 files. Based on a patch by Cédrik Lime.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">