From: Roman Arutyunyan <arut@nginx.com>
Date: Tue, 4 Mar 2014 19:40:35 +0000 (+0400)
Subject: MIME: added video/mp2t and application/vnd.apple.mpegurl types.
X-Git-Tag: release-1.5.12~8
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=39b04fce3ac86f053e8a471fcb65ba53cffab4e9;p=nginx.git

MIME: added video/mp2t and application/vnd.apple.mpegurl types.

Both types are used by HLS.  The values are taken from RFC 3555
and HLS specification respectively.
---

diff --git a/conf/mime.types b/conf/mime.types
index f63a77a55..a6bc0161a 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -32,6 +32,7 @@ types {
     application/pdf                       pdf;
     application/postscript                ps eps ai;
     application/rtf                       rtf;
+    application/vnd.apple.mpegurl         m3u8;
     application/vnd.ms-excel              xls;
     application/vnd.ms-fontobject         eot;
     application/vnd.ms-powerpoint         ppt;
@@ -73,6 +74,7 @@ types {
     audio/x-realaudio                     ra;
 
     video/3gpp                            3gpp 3gp;
+    video/mp2t                            ts;
     video/mp4                             mp4;
     video/mpeg                            mpeg mpg;
     video/quicktime                       mov;