Mercurial > hg > nginx-quic
annotate conf/mime.types @ 5541:fdb67cfc957d
Fixed TCP_DEFER_ACCEPT handling (ticket #353).
Backed out 05a56ebb084a, as it turns out that kernel can return connections
without any delay if syncookies are used. This basically means we can't
assume anything about connections returned with deferred accept set.
To solve original problem the 05a56ebb084a tried to solve, i.e. to don't
wait longer than needed if a connection was accepted after deferred accept
timeout, this patch changes a timeout set with setsockopt(TCP_DEFER_ACCEPT)
to 1 second, unconditionally. This is believed to be enough for speed
improvements, and doesn't imply major changes to timeouts used.
Note that before 2.6.32 connections were dropped after a timeout. Though
it is believed that 1s is still appropriate for kernels before 2.6.32,
as previously tcp_synack_retries controlled the actual timeout and 1s results
in more than 1 minute actual timeout by default.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 28 Jan 2014 15:40:46 +0400 |
parents | 1adfe7a260eb |
children | 68e41f0cb207 |
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; | |
5311
ae3fd1ca62e0
MIME: use "application/javascript" for .js files.
Valentin Bartenev <vbart@nginx.com>
parents:
4301
diff
changeset
|
8 application/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; |
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 | 26 |
5336
aeabb6ae574d
MIME: added application/font-woff MIME type (ticket #292).
Sergey Kandaurov <pluknet@nginx.com>
parents:
5311
diff
changeset
|
27 application/font-woff woff; |
567 | 28 application/java-archive jar war ear; |
5383
1adfe7a260eb
MIME: added application/json MIME type.
Piotr Sikora <piotr@cloudflare.com>
parents:
5338
diff
changeset
|
29 application/json json; |
567 | 30 application/mac-binhex40 hqx; |
863 | 31 application/msword doc; |
567 | 32 application/pdf pdf; |
863 | 33 application/postscript ps eps ai; |
34 application/rtf rtf; | |
35 application/vnd.ms-excel xls; | |
5338
010bb2e21f3f
MIME: eot MIME type updated to follow IANA (ticket #306).
Sergey Kandaurov <pluknet@nginx.com>
parents:
5337
diff
changeset
|
36 application/vnd.ms-fontobject eot; |
863 | 37 application/vnd.ms-powerpoint ppt; |
38 application/vnd.wap.wmlc wmlc; | |
2194 | 39 application/vnd.google-earth.kml+xml kml; |
40 application/vnd.google-earth.kmz kmz; | |
3465 | 41 application/x-7z-compressed 7z; |
567 | 42 application/x-cocoa cco; |
43 application/x-java-archive-diff jardiff; | |
44 application/x-java-jnlp-file jnlp; | |
45 application/x-makeself run; | |
46 application/x-perl pl pm; | |
47 application/x-pilot prc pdb; | |
48 application/x-rar-compressed rar; | |
49 application/x-redhat-package-manager rpm; | |
50 application/x-sea sea; | |
51 application/x-shockwave-flash swf; | |
52 application/x-stuffit sit; | |
53 application/x-tcl tcl tk; | |
54 application/x-x509-ca-cert der pem crt; | |
55 application/x-xpinstall xpi; | |
3865 | 56 application/xhtml+xml xhtml; |
567 | 57 application/zip zip; |
450 | 58 |
863 | 59 application/octet-stream bin exe dll; |
567 | 60 application/octet-stream deb; |
61 application/octet-stream dmg; | |
62 application/octet-stream iso img; | |
63 application/octet-stream msi msp msm; | |
450 | 64 |
5337
07ef29f69a54
MIME: added the most common OOXML MIME types (ticket #243).
Sergey Kandaurov <pluknet@nginx.com>
parents:
5336
diff
changeset
|
65 application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; |
07ef29f69a54
MIME: added the most common OOXML MIME types (ticket #243).
Sergey Kandaurov <pluknet@nginx.com>
parents:
5336
diff
changeset
|
66 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; |
07ef29f69a54
MIME: added the most common OOXML MIME types (ticket #243).
Sergey Kandaurov <pluknet@nginx.com>
parents:
5336
diff
changeset
|
67 application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; |
07ef29f69a54
MIME: added the most common OOXML MIME types (ticket #243).
Sergey Kandaurov <pluknet@nginx.com>
parents:
5336
diff
changeset
|
68 |
863 | 69 audio/midi mid midi kar; |
567 | 70 audio/mpeg mp3; |
3807 | 71 audio/ogg ogg; |
4231
d50883ff2433
Adding m4a and m4v MIME types (closed #42).
Igor Sysoev <igor@sysoev.ru>
parents:
4086
diff
changeset
|
72 audio/x-m4a m4a; |
567 | 73 audio/x-realaudio ra; |
74 | |
863 | 75 video/3gpp 3gpp 3gp; |
4086 | 76 video/mp4 mp4; |
567 | 77 video/mpeg mpeg mpg; |
78 video/quicktime mov; | |
4281
3a3a2d767ecd
Added image/webp and video/webm MIME types.
Valentin Bartenev <vbart@nginx.com>
parents:
4231
diff
changeset
|
79 video/webm webm; |
567 | 80 video/x-flv flv; |
4231
d50883ff2433
Adding m4a and m4v MIME types (closed #42).
Igor Sysoev <igor@sysoev.ru>
parents:
4086
diff
changeset
|
81 video/x-m4v m4v; |
863 | 82 video/x-mng mng; |
649 | 83 video/x-ms-asf asx asf; |
863 | 84 video/x-ms-wmv wmv; |
85 video/x-msvideo avi; | |
450 | 86 } |