Merge r1723567 from trunk:

Add common extension "m4a" for MPEG 4 Audio to
mime.types.

As a reference see Wikipedia:
https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A

PR: 57895

Submitted by: rjung
Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index 6c6146fc1f641b97aef91680cce4f8b02dbd3749..c9e3a0c99c926d1f54393e15ae2dec67e5fa7d22 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.19
 
+  *) mime.types: add common extension "m4a" for MPEG 4 Audio.
+     PR 57895 [Dylan Millikin <dylan.millikin gmail.com>]
+
   *) mod_log_config: Add GlobalLog to allow a globally defined log to
      be inherited by virtual hosts that define a CustomLog.
      [Edward Lu]

diff --git a/STATUS b/STATUS
index 8742d3973f317d54512ae54221b32ccc84f0ba74..adf48a5c75204f2ff490396ea85c522eb367fdca 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -112,14 +112,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mime.types: Add common extension "m4a" for MPEG 4 Audio.
-     As a reference see Wikipedia:
-     https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A
-     PR: 57895
-     trunk patch: http://svn.apache.org/r1723567
-     2.4.x patch: trunk works, modulo CHANGES
-     +1: rjung, covener, jim
-
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index b90b1658761a6a3318b6f889cd4e5d5082d08a00..51752426266375c595683f8efb82435b604ca371 100644 (file)
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -1212,7 +1212,7 @@ audio/basic                                       au snd
 # audio/lpc
 audio/midi                                     mid midi kar rmi
 # audio/mobile-xmf
-audio/mp4                                      mp4a
+audio/mp4                                      m4a mp4a
 # audio/mp4a-latm
 # audio/mpa
 # audio/mpa-robust