annotate conf/mime.types @ 4167:e917fc5eceb7 stable-1.0

Merging r4011, r4012, r4136: Proxy related fixes: *) Fixing cpu hog with all upstream servers marked "down". The following configuration causes nginx to hog cpu due to infinite loop in ngx_http_upstream_get_peer(): upstream backend { server 127.0.0.1:8080 down; server 127.0.0.1:8080 down; } server { ... location / { proxy_pass http://backend; } } Make sure we don't loop infinitely in ngx_http_upstream_get_peer() but stop after resetting peer weights once. Return 0 if we are stuck. This is guaranteed to work as peer 0 always exists, and eventually ngx_http_upstream_get_round_robin_peer() will do the right thing falling back to backup servers or returning NGX_BUSY. *) Upstream: properly allocate memory for tried flags. Previous allocation only took into account number of non-backup servers, and this caused memory corruption with many backup servers. See report here: http://mailman.nginx.org/pipermail/nginx/2011-May/026531.html *) Fix of cpu hog in event pipe. If client closed connection in ngx_event_pipe_write_to_downstream(), buffers in the "out" chain were lost. This caused cpu hog if all available buffers were in the "out" chain. Fix is to call ngx_chain_update_chains() before checking return code of output filter to avoid loosing buffers in the "out" chain. Note that this situation (all available buffers in the "out" chain) isn't normal, it should be prevented by busy buffers limit. Though right now it may happen with complex protocols like fastcgi. This should be addressed separately.
author Igor Sysoev <igor@sysoev.ru>
date Fri, 30 Sep 2011 14:30:01 +0000
parents cff87803b898
children dceb4f509661
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;
1413
be1e56a892d8 add svg mime type
Igor Sysoev <igor@sysoev.ru>
parents: 1004
diff changeset
24 image/svg+xml svg;
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
25
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
26 application/java-archive jar war ear;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
27 application/mac-binhex40 hqx;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
28 application/msword doc;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
29 application/pdf pdf;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
30 application/postscript ps eps ai;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
31 application/rtf rtf;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
32 application/vnd.ms-excel xls;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
33 application/vnd.ms-powerpoint ppt;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
34 application/vnd.wap.wmlc wmlc;
2194
d3f833da6b65 add Google Earth MIME types
Igor Sysoev <igor@sysoev.ru>
parents: 2053
diff changeset
35 application/vnd.google-earth.kml+xml kml;
d3f833da6b65 add Google Earth MIME types
Igor Sysoev <igor@sysoev.ru>
parents: 2053
diff changeset
36 application/vnd.google-earth.kmz kmz;
3465
7f7f5805c11c add 7z MIME type
Igor Sysoev <igor@sysoev.ru>
parents: 2194
diff changeset
37 application/x-7z-compressed 7z;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
38 application/x-cocoa cco;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
39 application/x-java-archive-diff jardiff;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
40 application/x-java-jnlp-file jnlp;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
41 application/x-makeself run;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
42 application/x-perl pl pm;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
43 application/x-pilot prc pdb;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
44 application/x-rar-compressed rar;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
45 application/x-redhat-package-manager rpm;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
46 application/x-sea sea;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
47 application/x-shockwave-flash swf;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
48 application/x-stuffit sit;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
49 application/x-tcl tcl tk;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
50 application/x-x509-ca-cert der pem crt;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
51 application/x-xpinstall xpi;
3865
cff87803b898 fix xhtml mime type
Igor Sysoev <igor@sysoev.ru>
parents: 3807
diff changeset
52 application/xhtml+xml xhtml;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
53 application/zip zip;
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
54
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
55 application/octet-stream bin exe dll;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
56 application/octet-stream deb;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
57 application/octet-stream dmg;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
58 application/octet-stream eot;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
59 application/octet-stream iso img;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
60 application/octet-stream msi msp msm;
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
61
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
62 audio/midi mid midi kar;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
63 audio/mpeg mp3;
3807
bc00fc9eabb7 add audio/ogg
Igor Sysoev <igor@sysoev.ru>
parents: 3465
diff changeset
64 audio/ogg ogg;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
65 audio/x-realaudio ra;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
66
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
67 video/3gpp 3gpp 3gp;
567
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
68 video/mpeg mpeg mpg;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
69 video/quicktime mov;
1af2fcb3be8a nginx-0.3.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
70 video/x-flv flv;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
71 video/x-mng mng;
649
1e720b0be7ec nginx-0.3.46-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 589
diff changeset
72 video/x-ms-asf asx asf;
863
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
73 video/x-ms-wmv wmv;
57cb2052dcc6 add mime types
Igor Sysoev <igor@sysoev.ru>
parents: 667
diff changeset
74 video/x-msvideo avi;
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
75 }