From 18281f5d23c26a2936c1e8492d606be547eaeac8 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Thu, 30 Jun 2016 17:10:32 +0000 Subject: [PATCH] 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 Submitted by: Dylan Millikin PR: 57895 Backports: r1723567 Reviewed by: rjung, wrowe, ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1750837 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 8 -------- docs/conf/mime.types | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 0ebe8a1aae0..3a8319c2d7b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.2.32 + *) mime.types: add common extension "m4a" for MPEG 4 Audio. + PR 57895 [Dylan Millikin ] + *) mod_proxy: don't recyle backend announced "Connection: close" connections to avoid reusing it should the close be effective after some new request is ready to be sent. [Yann Ylavic] diff --git a/STATUS b/STATUS index 66ee651f080..aaf1dafb869 100644 --- a/STATUS +++ b/STATUS @@ -130,14 +130,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: http://people.apache.org/~rpluem/patches/proxy_post_request_status_code.diff +1: rpluem, wrowe, ylavic - *) 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.2.x patch: trunk works, modulo CHANGES - +1: rjung, wrowe, ylavic - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/docs/conf/mime.types b/docs/conf/mime.types index b90b1658761..51752426266 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.47.2