Mercurial > hg > nginx
comparison conf/mime.types @ 4359:a1bb976ec16a stable-1.0
Merge of r4282, r4302:
Added image/webp and video/webm MIME types. Added svgz extension for
compressed SVG.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Wed, 14 Dec 2011 15:16:05 +0000 |
| parents | cc7ea429170d |
| children |
comparison
equal
deleted
inserted
replaced
| 4358:94b995c7c614 | 4359:a1bb976ec16a |
|---|---|
| 19 image/tiff tif tiff; | 19 image/tiff tif tiff; |
| 20 image/vnd.wap.wbmp wbmp; | 20 image/vnd.wap.wbmp wbmp; |
| 21 image/x-icon ico; | 21 image/x-icon ico; |
| 22 image/x-jng jng; | 22 image/x-jng jng; |
| 23 image/x-ms-bmp bmp; | 23 image/x-ms-bmp bmp; |
| 24 image/svg+xml svg; | 24 image/svg+xml svg svgz; |
| 25 image/webp webp; | |
| 25 | 26 |
| 26 application/java-archive jar war ear; | 27 application/java-archive jar war ear; |
| 27 application/mac-binhex40 hqx; | 28 application/mac-binhex40 hqx; |
| 28 application/msword doc; | 29 application/msword doc; |
| 29 application/pdf pdf; | 30 application/pdf pdf; |
| 67 | 68 |
| 68 video/3gpp 3gpp 3gp; | 69 video/3gpp 3gpp 3gp; |
| 69 video/mp4 mp4; | 70 video/mp4 mp4; |
| 70 video/mpeg mpeg mpg; | 71 video/mpeg mpeg mpg; |
| 71 video/quicktime mov; | 72 video/quicktime mov; |
| 73 video/webm webm; | |
| 72 video/x-flv flv; | 74 video/x-flv flv; |
| 73 video/x-m4v m4v; | 75 video/x-m4v m4v; |
| 74 video/x-mng mng; | 76 video/x-mng mng; |
| 75 video/x-ms-asf asx asf; | 77 video/x-ms-asf asx asf; |
| 76 video/x-ms-wmv wmv; | 78 video/x-ms-wmv wmv; |