]> granicus.if.org Git - apache/commitdiff
Add common extension "m4a" for MPEG 4 Audio to
authorRainer Jung <rjung@apache.org>
Thu, 7 Jan 2016 15:04:33 +0000 (15:04 +0000)
committerRainer Jung <rjung@apache.org>
Thu, 7 Jan 2016 15:04:33 +0000 (15:04 +0000)
mime.types.

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

PR: 57895

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

CHANGES
docs/conf/mime.types

diff --git a/CHANGES b/CHANGES
index 2bd0ecf6f3d03788952194d5db9d2c6842336444..be9a9db902f89a3c67f36db1e063562e4ccd6e3a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mime.types: add common extension "m4a" for MPEG 4 Audio.
+     PR 57895 [Dylan Millikin <dylan.millikin gmail.com>]
+
   *) mod_http2: async reading for http2 connections disabled for now. Fixed
      flushing of last GOAWAY frame. Fixed calculation of last stream id
      accepted as described in rfc7540. Reading in KEEPALIVE state now 
index da8cd691879db755fa54b2e487545ce930c69cdf..69021c9ca5db49095d06a29900339b8ebed988a1 100644 (file)
@@ -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