annotate conf/mime.types @ 4729:4ff2131dbce5 stable-1.2

Merge of r4691: changed default alignment to 16. This fixes alignment problems observerd on ARMs, and likely also needed for MIPSes. Unless we know alignment is not required just assume we need 16, which appears to be safe default for all architectures. See here for details: http://mailman.nginx.org/pipermail/nginx/2012-June/034139.html
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 02 Jul 2012 17:08:26 +0000
parents 0688cf5d73ec
children ae3fd1ca62e0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
1
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
2 types {
589
d4e858a5751a nginx-0.3.16-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 567
diff changeset
3 text/html html htm shtml;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
4 text/css css;
2053
dd5ca07f5cdd change RSS MIME type
Igor Sysoev <igor@sysoev.ru>
parents: 1413
diff changeset
5 text/xml xml;
589
d4e858a5751a nginx-0.3.16-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 567
diff changeset
6 image/gif gif;
d4e858a5751a nginx-0.3.16-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 567
diff changeset
7 image/jpeg jpeg jpg;
d4e858a5751a nginx-0.3.16-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 567
diff changeset
8 application/x-javascript js;
1004
d7f827a9af89 application/atom+xml
Igor Sysoev <igor@sysoev.ru>
parents: 863
diff changeset
9 application/atom+xml atom;
2053
dd5ca07f5cdd change RSS MIME type
Igor Sysoev <igor@sysoev.ru>
parents: 1413
diff changeset
10 application/rss+xml rss;
589
d4e858a5751a nginx-0.3.16-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 567
diff changeset
11
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
12 text/mathml mml;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
13 text/plain txt;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
14 text/vnd.sun.j2me.app-descriptor jad;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
15 text/vnd.wap.wml wml;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
16 text/x-component htc;
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
17
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
18 image/png png;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
19 image/tiff tif tiff;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
20 image/vnd.wap.wbmp wbmp;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
21 image/x-icon ico;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
22 image/x-jng jng;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
23 image/x-ms-bmp bmp;
4301
0688cf5d73ec svgz extension for compressed SVG added (close #56).
Maxim Konovalov <maxim@nginx.com>
parents: 4281
diff changeset
24 image/svg+xml svg svgz;
4281
3a3a2d767ecd Added image/webp and video/webm MIME types.
Valentin Bartenev <vbart@nginx.com>
parents: 4231
diff changeset
25 image/webp webp;
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
26
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
27 application/java-archive jar war ear;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
28 application/mac-binhex40 hqx;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
29 application/msword doc;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
30 application/pdf pdf;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
31 application/postscript ps eps ai;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
32 application/rtf rtf;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
33 application/vnd.ms-excel xls;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
34 application/vnd.ms-powerpoint ppt;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
35 application/vnd.wap.wmlc wmlc;
2194
d3f833da6b65 add Google Earth MIME types
Igor Sysoev <igor@sysoev.ru>
parents: 2053
diff changeset
36 application/vnd.google-earth.kml+xml kml;
d3f833da6b65 add Google Earth MIME types
Igor Sysoev <igor@sysoev.ru>
parents: 2053
diff changeset
37 application/vnd.google-earth.kmz kmz;
3465
7f7f5805c11c add 7z MIME type
Igor Sysoev <igor@sysoev.ru>
parents: 2194
diff changeset
38 application/x-7z-compressed 7z;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
39 application/x-cocoa cco;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
40 application/x-java-archive-diff jardiff;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
41 application/x-java-jnlp-file jnlp;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
42 application/x-makeself run;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
43 application/x-perl pl pm;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
44 application/x-pilot prc pdb;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
45 application/x-rar-compressed rar;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
46 application/x-redhat-package-manager rpm;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
47 application/x-sea sea;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
48 application/x-shockwave-flash swf;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
49 application/x-stuffit sit;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
50 application/x-tcl tcl tk;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
51 application/x-x509-ca-cert der pem crt;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
52 application/x-xpinstall xpi;
3865
cff87803b898 fix xhtml mime type
Igor Sysoev <igor@sysoev.ru>
parents: 3807
diff changeset
53 application/xhtml+xml xhtml;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
54 application/zip zip;
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
55
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
56 application/octet-stream bin exe dll;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
57 application/octet-stream deb;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
58 application/octet-stream dmg;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
59 application/octet-stream eot;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
60 application/octet-stream iso img;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
61 application/octet-stream msi msp msm;
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
62
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
63 audio/midi mid midi kar;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
64 audio/mpeg mp3;
3807
bc00fc9eabb7 add audio/ogg
Igor Sysoev <igor@sysoev.ru>
parents: 3465
diff changeset
65 audio/ogg ogg;
4231
d50883ff2433 Adding m4a and m4v MIME types (closed #42).
Igor Sysoev <igor@sysoev.ru>
parents: 4086
diff changeset
66 audio/x-m4a m4a;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
67 audio/x-realaudio ra;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
68
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
69 video/3gpp 3gpp 3gp;
4086
dceb4f509661 "video/mp4" mime type added.
Igor Sysoev <igor@sysoev.ru>
parents: 3865
diff changeset
70 video/mp4 mp4;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
71 video/mpeg mpeg mpg;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
72 video/quicktime mov;
4281
3a3a2d767ecd Added image/webp and video/webm MIME types.
Valentin Bartenev <vbart@nginx.com>
parents: 4231
diff changeset
73 video/webm webm;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
74 video/x-flv flv;
4231
d50883ff2433 Adding m4a and m4v MIME types (closed #42).
Igor Sysoev <igor@sysoev.ru>
parents: 4086
diff changeset
75 video/x-m4v m4v;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
76 video/x-mng mng;
649
1e720b0be7ec nginx-0.3.46-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 589
diff changeset
77 video/x-ms-asf asx asf;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
78 video/x-ms-wmv wmv;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
79 video/x-msvideo avi;
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
80 }