From: André Malo <nd@apache.org>
Date: Wed, 28 Jan 2004 19:12:53 +0000 (+0000)
Subject: Fixed file extensions for real media files and removed rpm extension
X-Git-Tag: pre_ajp_proxy~760
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7603b2fc7f1e8ddba333b866edd79162a5fcc191;p=apache

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 7b3df99b6f..68ea4e7a66 100644
--- 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 a331a9c68d..74c5f36d71 100644
--- 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