Mercurial > hg > nginx-mail
diff conf/mime.types @ 665:0b460e61bdcd default tip
Merge with nginx 1.0.0.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:22:17 +0400 |
parents | bb20316269e4 |
children |
line wrap: on
line diff
--- a/conf/mime.types +++ b/conf/mime.types @@ -32,9 +32,9 @@ 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; application/x-cocoa cco; application/x-java-archive-diff jardiff; application/x-java-jnlp-file jnlp; @@ -49,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; @@ -60,6 +61,7 @@ types { audio/midi mid midi kar; audio/mpeg mp3; + audio/ogg ogg; audio/x-realaudio ra; video/3gpp 3gpp 3gp;