Mercurial > hg > nginx
annotate conf/mime.types @ 5418:6961d52ebc49 stable-1.4
Core: fix misallocation at ngx_crypt_apr1 (ticket #412).
Found by using auth_basic.t from mdounin nginx-tests under valgrind.
==10470== Invalid write of size 1
==10470== at 0x43603D: ngx_crypt_to64 (ngx_crypt.c:168)
==10470== by 0x43648E: ngx_crypt (ngx_crypt.c:153)
==10470== by 0x489D8B: ngx_http_auth_basic_crypt_handler (ngx_http_auth_basic_module.c:297)
==10470== by 0x48A24A: ngx_http_auth_basic_handler (ngx_http_auth_basic_module.c:240)
==10470== by 0x44EAB9: ngx_http_core_access_phase (ngx_http_core_module.c:1121)
==10470== by 0x44A822: ngx_http_core_run_phases (ngx_http_core_module.c:895)
==10470== by 0x44A932: ngx_http_handler (ngx_http_core_module.c:878)
==10470== by 0x455EEF: ngx_http_process_request (ngx_http_request.c:1852)
==10470== by 0x456527: ngx_http_process_request_headers (ngx_http_request.c:1283)
==10470== by 0x456A91: ngx_http_process_request_line (ngx_http_request.c:964)
==10470== by 0x457097: ngx_http_wait_request_handler (ngx_http_request.c:486)
==10470== by 0x4411EE: ngx_epoll_process_events (ngx_epoll_module.c:691)
==10470== Address 0x5866fab is 0 bytes after a block of size 27 alloc'd
==10470== at 0x4A074CD: malloc (vg_replace_malloc.c:236)
==10470== by 0x43B251: ngx_alloc (ngx_alloc.c:22)
==10470== by 0x421B0D: ngx_malloc (ngx_palloc.c:119)
==10470== by 0x421B65: ngx_pnalloc (ngx_palloc.c:147)
==10470== by 0x436368: ngx_crypt (ngx_crypt.c:140)
==10470== by 0x489D8B: ngx_http_auth_basic_crypt_handler (ngx_http_auth_basic_module.c:297)
==10470== by 0x48A24A: ngx_http_auth_basic_handler (ngx_http_auth_basic_module.c:240)
==10470== by 0x44EAB9: ngx_http_core_access_phase (ngx_http_core_module.c:1121)
==10470== by 0x44A822: ngx_http_core_run_phases (ngx_http_core_module.c:895)
==10470== by 0x44A932: ngx_http_handler (ngx_http_core_module.c:878)
==10470== by 0x455EEF: ngx_http_process_request (ngx_http_request.c:1852)
==10470== by 0x456527: ngx_http_process_request_headers (ngx_http_request.c:1283)
==10470==
author | Markus Linnala <Markus.Linnala@cybercom.com> |
---|---|
date | Fri, 20 Sep 2013 17:57:21 +0300 |
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 } |