svn commit: r1094084 - in /tomcat/trunk: conf/web.xml webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Apr 16 22:50:05 2011
New Revision: 1094084

URL: http://svn.apache.org/viewvc?rev=1094084&view=rev
Log:
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.

Modified:
    tomcat/trunk/conf/web.xml
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1094084&r1=1094083&r2=1094084&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Sat Apr 16 22:50:05 2011
@@ -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>

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1094084&r1=1094083&r2=1094084&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Apr 16 22:50:05 2011
@@ -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">



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