Fixed file extensions for real media files and removed rpm extension

from mime.types.

PR: 26079
Submitted by: Allan Sandfeld <kde carewolf.com>

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

diff --git a/CHANGES b/CHANGES
index 7b3df99b6f8c83d66ea5085f5ee9c8d947dbc57f..68ea4e7a667fa8b480e173c93bcf62eda53d137a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Fixed file extensions for real media files and removed rpm extension
+     from mime.types. PR 26079.  [Allan Sandfeld <kde carewolf.com>]
+
   *) worker MPM: fix stack overlay bug that could cause the parent
      process to crash.  [Jeff Trawick]
 

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index a331a9c68da119b07590228f3832f03cc194c3f8..74c5f36d7156ce9f9e16f864222a6195c0d9ff2b 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
+audio/x-realaudio              rm
 audio/x-wav                    wav
 chemical/x-pdb                 pdb
 chemical/x-xyz                 xyz