From: Rainer Jung <rjung@apache.org>
Date: Thu, 7 Jan 2016 15:04:33 +0000 (+0000)
Subject: Add common extension "m4a" for MPEG 4 Audio to
X-Git-Tag: 2.5.0-alpha~2450
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79b3863c6139820faeee90956c60eee1e89e6221;p=thirdparty%2Fapache%2Fhttpd.git

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


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

diff --git a/CHANGES b/CHANGES
index 2bd0ecf6f3d..be9a9db902f 100644
--- 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 
diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index da8cd691879..69021c9ca5d 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