summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2011-12-14 15:16:05 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2011-12-14 15:16:05 +0000
commit214dfd3e22fed5d02ce54b9e81a899134c84f694 (patch)
treeff69b538a0dbf28c0bf1f1fd2e40049b2b3248f5
parent7377d07c39e7e009391716d22b8d0e5fc2ae8b69 (diff)
downloadnginx-214dfd3e22fed5d02ce54b9e81a899134c84f694.tar.gz
nginx-214dfd3e22fed5d02ce54b9e81a899134c84f694.tar.bz2
Merge of r4282, r4302:
Added image/webp and video/webm MIME types. Added svgz extension for compressed SVG.
-rw-r--r--conf/mime.types4
1 files changed, 3 insertions, 1 deletions
diff --git a/conf/mime.types b/conf/mime.types
index 24e866e8f..8a218b22a 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -21,7 +21,8 @@ types {
image/x-icon ico;
image/x-jng jng;
image/x-ms-bmp bmp;
- image/svg+xml svg;
+ image/svg+xml svg svgz;
+ image/webp webp;
application/java-archive jar war ear;
application/mac-binhex40 hqx;
@@ -69,6 +70,7 @@ types {
video/mp4 mp4;
video/mpeg mpeg mpg;
video/quicktime mov;
+ video/webm webm;
video/x-flv flv;
video/x-m4v m4v;
video/x-mng mng;