From 56b103662b7cd6c74b09b239250e461bc9a59b64 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 16 Apr 2011 22:50:05 +0000 Subject: [PATCH] =?utf8?q?Fix=20https://issues.apache.org/bugzilla/show=5F?= =?utf8?q?bug.cgi=3Fid=3D51050=20Add=20additional=20common=20but=20non-sta?= =?utf8?q?ndard=20file=20extension=20to=20MIME=20type=20mappings=20for=20M?= =?utf8?q?PEG=204=20files.=20Based=20on=20a=20patch=20by=20C=C3=A9drik=20L?= =?utf8?q?ime.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1094084 13f79535-47bb-0310-9956-ffa450edef68 --- conf/web.xml | 16 ++++++++++++++++ webapps/docs/changelog.xml | 5 +++++ 2 files changed, 21 insertions(+) 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 @@ audio/x-mpegurl + m4a + audio/mp4 + + + m4b + audio/mp4 + + + m4r + audio/mp4 + + + m4v + video/mp4 + + mac image/x-macpaint 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 @@ 51042: Don't trigger session creation listeners when a session ID is changed as part of the authentication process. (markt) + + 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. + (markt) + -- 2.11.0