summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-02-21 09:44:08 +0000
committerJonathan Kolb <jon@b0g.us>2011-02-21 09:44:08 +0000
commit88f3a051fd196735cdf47a67ddc14cf298cbfe63 (patch)
tree75152dc461e0b9a5f567451970ddf2abf324b988 /conf
parente52b136dd7a6ad34b361b8b48eef7cbaa48282ca (diff)
downloadnginx-88f3a051fd196735cdf47a67ddc14cf298cbfe63.tar.gz
Changes with nginx 0.9.5 21 Feb 2011v0.9.5
*) Change: now nginx uses a default listen backlog value -1 on Linux. Thanks to Andrei Nigmatulin. *) Feature: the "utf8" parameter of "geoip_country" and "geoip_city" directives. Thanks to Denis F. Latypoff. *) Bugfix: in a default "proxy_redirect" directive if "proxy_pass" directive has no URI part. Thanks to Maxim Dounin. *) Bugfix: an "error_page" directive did not work with nonstandard error codes; the bug had appeared in 0.8.53. Thanks to Maxim Dounin.
Diffstat (limited to 'conf')
-rw-r--r--conf/mime.types2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/mime.types b/conf/mime.types
index b64f2277a..f750acd7b 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -32,7 +32,6 @@ types {
application/vnd.ms-excel xls;
application/vnd.ms-powerpoint ppt;
application/vnd.wap.wmlc wmlc;
- application/vnd.wap.xhtml+xml xhtml;
application/vnd.google-earth.kml+xml kml;
application/vnd.google-earth.kmz kmz;
application/x-7z-compressed 7z;
@@ -50,6 +49,7 @@ types {
application/x-tcl tcl tk;
application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi;
+ application/xhtml+xml xhtml;
application/zip zip;
application/octet-stream bin exe dll;