From: Maxim Dounin <mdounin@mdounin.ru>
Date: Wed, 14 Dec 2011 15:16:05 +0000 (+0000)
Subject: Merge of r4282, r4302:
X-Git-Tag: release-1.0.11~9
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=214dfd3e22fed5d02ce54b9e81a899134c84f694;p=nginx.git

Merge of r4282, r4302:

Added image/webp and video/webm MIME types.  Added svgz extension for
compressed SVG.
---

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;