Commit bfea7bf8 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 2a82566b

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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]

STATUS

+0 −8
Original line number Diff line number Diff line
@@ -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:

docs/conf/mime.types

+1 −1
Original line number Diff line number Diff line
@@ -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