[nginx] svn commit: r4360 - in branches/stable-1.0: . conf

[mdounin at mdounin.ru]

Author: mdounin
Date: 2011-12-14 15:16:05 +0000 (Wed, 14 Dec 2011)
New Revision: 4360

Log:
Merge of r4282, r4302:

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


Modified:
   branches/stable-1.0/
   branches/stable-1.0/conf/mime.types


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4283,4300-4301,4303-4304,4308-4309,4321,4342-4343
   + /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4283,4300-4304,4308-4309,4321,4342-4343

Modified: branches/stable-1.0/conf/mime.types
===================================================================
--- branches/stable-1.0/conf/mime.types	2011-12-14 15:13:25 UTC (rev 4359)
+++ branches/stable-1.0/conf/mime.types	2011-12-14 15:16:05 UTC (rev 4360)
@@ -21,7 +21,8 @@
     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 @@
     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;