Fixed file extensions for real media files and removed rpm extension

from mime.types.

PR: 26079
Submitted by:	Allan Sandfeld <kde carewolf.com>
Reviewed by:	nd, trawick, jerenkrantz

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

diff --git a/CHANGES b/CHANGES
index 0f462ddd5369965989087e3c3e507fa15004f873..27ef69fe3c44f8ae473048b4e9de47c8070f2d3f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) Fixed file extensions for real media files and removed rpm extension
+     from mime.types. PR 26079.  [Allan Sandfeld <kde carewolf.com>]
+
   *) Remove compile-time length limit on request strings. Length is
      now enforced solely with the LimitRequestLine config directive.
      [Paul J. Reder]

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index a331a9c68da119b07590228f3832f03cc194c3f8..2802f29d50ead0a56b39a642c36aeffc71eef3c4 100644 (file)
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -442,9 +442,9 @@ audio/vnd.vmx.cvsd
 audio/x-aiff                   aif aiff aifc
 audio/x-alaw-basic
 audio/x-mpegurl                        m3u
-audio/x-pn-realaudio           ram rm
-audio/x-pn-realaudio-plugin    rpm
-audio/x-realaudio              ra
+audio/x-pn-realaudio           ram ra
+audio/x-pn-realaudio-plugin
+application/vnd.rn-realmedia   rm
 audio/x-wav                    wav
 chemical/x-pdb                 pdb
 chemical/x-xyz                 xyz