Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 262ED184BF for ; Thu, 7 Jan 2016 15:04:48 +0000 (UTC) Received: (qmail 18998 invoked by uid 500); 7 Jan 2016 15:04:45 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 18932 invoked by uid 500); 7 Jan 2016 15:04:45 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 18850 invoked by uid 99); 7 Jan 2016 15:04:45 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2016 15:04:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 129441A0276 for ; Thu, 7 Jan 2016 15:04:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.247 X-Spam-Level: * X-Spam-Status: No, score=1.247 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id TWcvfp80JpmM for ; Thu, 7 Jan 2016 15:04:38 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 6369431ABC for ; Thu, 7 Jan 2016 15:04:35 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 7DCFAE00AF for ; Thu, 7 Jan 2016 15:04:34 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 4C4BA3A00E7 for ; Thu, 7 Jan 2016 15:04:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1723567 - in /httpd/httpd/trunk: CHANGES docs/conf/mime.types Date: Thu, 07 Jan 2016 15:04:34 -0000 To: cvs@httpd.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160107150434.4C4BA3A00E7@svn01-us-west.apache.org> Author: rjung Date: Thu Jan 7 15:04:33 2016 New Revision: 1723567 URL: http://svn.apache.org/viewvc?rev=1723567&view=rev Log: 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 Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/docs/conf/mime.types Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1723567&r1=1723566&r2=1723567&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Thu Jan 7 15:04:33 2016 @@ -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 Modified: httpd/httpd/trunk/docs/conf/mime.types URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types?rev=1723567&r1=1723566&r2=1723567&view=diff ============================================================================== --- httpd/httpd/trunk/docs/conf/mime.types (original) +++ httpd/httpd/trunk/docs/conf/mime.types Thu Jan 7 15:04:33 2016 @@ -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