Update mime.types file.

Map video/vnd.mpegurl to mxu according to
ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/video/vnd.mpegurl
and audio/x-mpegurl to m3u, because it is commonly used.

Submitted by: Heiko Recktenwald <uzs106@uni-bonn.de>
Reviewed by: Sander van Zoest, Lars Eilebrecht

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

diff --git a/CHANGES b/CHANGES
index 7d0ee15751b63c0234e06021e8a6763d01d4a432..a2ed80345aa86d59d8899cb21e216c3bbe78286d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.26-dev
 
+  *) Update the mime.types file to map video/vnd.mpegurl to mxu
+     and add commonly used audio/x-mpegurl for m3u extensions.        
+     [Heiko Recktenwald <uzs106@uni-bonn.de>, Lars Eilebrecht]
+
   *) Eliminate the depreciated r->content_language, in favor of the array
      r->content_languages introduced many years ago.  Module authors must
      substantially overhaul their modules, so this needs to be upgraded

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index b5088256defd085a6bbbed7b72537386d80c0419..16c8cbd5cbd991f788fce592cdb35169cbe13d9a 100644 (file)
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -346,6 +346,7 @@ audio/vnd.qcelp
 audio/vnd.rhetorex.32kadpcm
 audio/vnd.vmx.cvsd
 audio/x-aiff                   aif aiff aifc
+audio/x-mpegurl                        m3u
 audio/x-pn-realaudio           ram rm
 audio/x-pn-realaudio-plugin    rpm
 audio/x-realaudio              ra
@@ -459,7 +460,7 @@ video/quicktime                     qt mov
 video/vnd.fvt
 video/vnd.motorola.video
 video/vnd.motorola.videop
-video/vnd.mpegurl
+video/vnd.mpegurl              mxu
 video/vnd.mts
 video/vnd.nokia.interleaved-multimedia
 video/vnd.vivo