Mercurial > hg > nginx-quic
annotate conf/mime.types @ 4964:2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Configuration like
location / {
set $true 1;
if ($true) {
proxy_pass http://backend;
}
if ($true) {
# nothing
}
}
resulted in segmentation fault due to NULL pointer dereference as the
upstream configuration wasn't initialized in an implicit location created
by the last if(), but the r->content_handler was set due to first if().
Instead of committing a suicide by dereferencing a NULL pointer, return
500 (Internal Server Error) in such cases, i.e. if uscf is NULL. Better
fix would be to avoid such cases by fixing the "if" directive handling,
but it's out of scope of this patch.
Prodded by Piotr Sikora.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 13 Dec 2012 16:05:59 +0000 |
parents | 0688cf5d73ec |
children | ae3fd1ca62e0 |
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; |
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 |
567 | 27 application/java-archive jar war ear; |
28 application/mac-binhex40 hqx; | |
863 | 29 application/msword doc; |
567 | 30 application/pdf pdf; |
863 | 31 application/postscript ps eps ai; |
32 application/rtf rtf; | |
33 application/vnd.ms-excel xls; | |
34 application/vnd.ms-powerpoint ppt; | |
35 application/vnd.wap.wmlc wmlc; | |
2194 | 36 application/vnd.google-earth.kml+xml kml; |
37 application/vnd.google-earth.kmz kmz; | |
3465 | 38 application/x-7z-compressed 7z; |
567 | 39 application/x-cocoa cco; |
40 application/x-java-archive-diff jardiff; | |
41 application/x-java-jnlp-file jnlp; | |
42 application/x-makeself run; | |
43 application/x-perl pl pm; | |
44 application/x-pilot prc pdb; | |
45 application/x-rar-compressed rar; | |
46 application/x-redhat-package-manager rpm; | |
47 application/x-sea sea; | |
48 application/x-shockwave-flash swf; | |
49 application/x-stuffit sit; | |
50 application/x-tcl tcl tk; | |
51 application/x-x509-ca-cert der pem crt; | |
52 application/x-xpinstall xpi; | |
3865 | 53 application/xhtml+xml xhtml; |
567 | 54 application/zip zip; |
450 | 55 |
863 | 56 application/octet-stream bin exe dll; |
567 | 57 application/octet-stream deb; |
58 application/octet-stream dmg; | |
59 application/octet-stream eot; | |
60 application/octet-stream iso img; | |
61 application/octet-stream msi msp msm; | |
450 | 62 |
863 | 63 audio/midi mid midi kar; |
567 | 64 audio/mpeg mp3; |
3807 | 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 | 67 audio/x-realaudio ra; |
68 | |
863 | 69 video/3gpp 3gpp 3gp; |
4086 | 70 video/mp4 mp4; |
567 | 71 video/mpeg mpeg mpg; |
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 | 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 | 76 video/x-mng mng; |
649 | 77 video/x-ms-asf asx asf; |
863 | 78 video/x-ms-wmv wmv; |
79 video/x-msvideo avi; | |
450 | 80 } |