summaryrefslogtreecommitdiffhomepage
path: root/conf
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-10-28 15:24:31 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-10-28 15:24:31 +0000
commit200a0d86562d23176d0147936c518e99cf807fa0 (patch)
treee068e56b05d9f69e928d82bfff5c0501edbc5b01 /conf
parentac0e8cb2d3b942bdf90468e941b9d4ce523827e3 (diff)
downloadnginx-200a0d86562d23176d0147936c518e99cf807fa0.tar.gz
nginx-200a0d86562d23176d0147936c518e99cf807fa0.tar.bz2
Adding m4a and m4v MIME types (closed #42).
Diffstat (limited to 'conf')
-rw-r--r--conf/mime.types2
1 files changed, 2 insertions, 0 deletions
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;