Mercurial > hg > nginx
annotate conf/mime.types @ 4169:432243531ce3 stable-1.0
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
r4106, r4107, r4108, r4113, r4156, r4157:
*) ngx_http_mp4_module.
*) "video/mp4" mime type added.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 30 Sep 2011 15:13:47 +0000 |
parents | cff87803b898 |
children | d50883ff2433 |
rev | line source |
---|---|
450 | 1 |
2 types { | |
589 | 3 text/html html htm shtml; |
567 | 4 text/css css; |
2053 | 5 text/xml xml; |
589 | 6 image/gif gif; |
7 image/jpeg jpeg jpg; | |
8 application/x-javascript js; | |
1004 | 9 application/atom+xml atom; |
2053 | 10 application/rss+xml rss; |
589 | 11 |
863 | 12 text/mathml mml; |
567 | 13 text/plain txt; |
863 | 14 text/vnd.sun.j2me.app-descriptor jad; |
15 text/vnd.wap.wml wml; | |
567 | 16 text/x-component htc; |
450 | 17 |
567 | 18 image/png png; |
863 | 19 image/tiff tif tiff; |
20 image/vnd.wap.wbmp wbmp; | |
567 | 21 image/x-icon ico; |
22 image/x-jng jng; | |
863 | 23 image/x-ms-bmp bmp; |
1413 | 24 image/svg+xml svg; |
450 | 25 |
567 | 26 application/java-archive jar war ear; |
27 application/mac-binhex40 hqx; | |
863 | 28 application/msword doc; |
567 | 29 application/pdf pdf; |
863 | 30 application/postscript ps eps ai; |
31 application/rtf rtf; | |
32 application/vnd.ms-excel xls; | |
33 application/vnd.ms-powerpoint ppt; | |
34 application/vnd.wap.wmlc wmlc; | |
2194 | 35 application/vnd.google-earth.kml+xml kml; |
36 application/vnd.google-earth.kmz kmz; | |
3465 | 37 application/x-7z-compressed 7z; |
567 | 38 application/x-cocoa cco; |
39 application/x-java-archive-diff jardiff; | |
40 application/x-java-jnlp-file jnlp; | |
41 application/x-makeself run; | |
42 application/x-perl pl pm; | |
43 application/x-pilot prc pdb; | |
44 application/x-rar-compressed rar; | |
45 application/x-redhat-package-manager rpm; | |
46 application/x-sea sea; | |
47 application/x-shockwave-flash swf; | |
48 application/x-stuffit sit; | |
49 application/x-tcl tcl tk; | |
50 application/x-x509-ca-cert der pem crt; | |
51 application/x-xpinstall xpi; | |
3865 | 52 application/xhtml+xml xhtml; |
567 | 53 application/zip zip; |
450 | 54 |
863 | 55 application/octet-stream bin exe dll; |
567 | 56 application/octet-stream deb; |
57 application/octet-stream dmg; | |
58 application/octet-stream eot; | |
59 application/octet-stream iso img; | |
60 application/octet-stream msi msp msm; | |
450 | 61 |
863 | 62 audio/midi mid midi kar; |
567 | 63 audio/mpeg mp3; |
3807 | 64 audio/ogg ogg; |
567 | 65 audio/x-realaudio ra; |
66 | |
863 | 67 video/3gpp 3gpp 3gp; |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
3865
diff
changeset
|
68 video/mp4 mp4; |
567 | 69 video/mpeg mpeg mpg; |
70 video/quicktime mov; | |
71 video/x-flv flv; | |
863 | 72 video/x-mng mng; |
649 | 73 video/x-ms-asf asx asf; |
863 | 74 video/x-ms-wmv wmv; |
75 video/x-msvideo avi; | |
450 | 76 } |