From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 28 Oct 2011 15:24:31 +0000 (+0000)
Subject: Adding m4a and m4v MIME types (closed #42).
X-Git-Tag: release-1.1.7~6
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=200a0d86562d23176d0147936c518e99cf807fa0;p=nginx.git

Adding m4a and m4v MIME types (closed #42).
---

diff --git a/conf/mime.types b/conf/mime.types
index c4ab45ec9..24e866e8f 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -62,6 +62,7 @@ types {
     audio/midi                            mid midi kar;
     audio/mpeg                            mp3;
     audio/ogg                             ogg;
+    audio/x-m4a                           m4a;
     audio/x-realaudio                     ra;
 
     video/3gpp                            3gpp 3gp;
@@ -69,6 +70,7 @@ types {
     video/mpeg                            mpeg mpg;
     video/quicktime                       mov;
     video/x-flv                           flv;
+    video/x-m4v                           m4v;
     video/x-mng                           mng;
     video/x-ms-asf                        asx asf;
     video/x-ms-wmv                        wmv;