diff options
| author | Jim Jagielski <jim@apache.org> | 2016-01-19 12:58:52 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2016-01-19 12:58:52 +0000 |
| commit | 50521c10eba5635498c6af6c666f47ccf58152ee (patch) | |
| tree | 3fd4dde0c0f33771267095c8d1d2ca45b24653eb /docs/conf | |
| parent | 1ae744a2168300dacb512b46cd5fa6067d7a8edb (diff) | |
| download | httpd-50521c10eba5635498c6af6c666f47ccf58152ee.tar.gz | |
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
Diffstat (limited to 'docs/conf')
| -rw-r--r-- | docs/conf/mime.types | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/conf/mime.types b/docs/conf/mime.types index b90b165876..5175242626 100644 --- 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 |