From 79b3863c6139820faeee90956c60eee1e89e6221 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Thu, 7 Jan 2016 15:04:33 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ docs/conf/mime.types | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 2bd0ecf6f3..be9a9db902 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 ] + *) 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 da8cd69187..69021c9ca5 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 -- 2.40.0