From 055951dc96d1ba9457cdce04bad60fe50b6ea7be Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 21 Oct 2005 19:12:18 +0000 Subject: nginx-0.3.5-RELEASE import *) Bugfix: the segmentation fault may occurred if the IMAP/POP3 login was changed by authorization server; the bug had appeared in 0.2.2. *) Bugfix: the accept mutex did not work and all connections were handled by one process; the bug had appeared in 0.3.3. *) Bugfix: the timeout did not work if the "rtsig" method and the "timer_resolution" directive were used. --- conf/mime.types | 69 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 24 deletions(-) (limited to 'conf') diff --git a/conf/mime.types b/conf/mime.types index 6ef277763..079874ee5 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -1,31 +1,52 @@ types { - text/html html htm shtml; - text/xml xml rss; - text/css css; - text/plain txt; - text/x-component htc; + text/css css; + text/html html htm shtml; + text/plain txt; + text/xml xml rss; + text/x-component htc; + text/mathml mml; - image/gif gif; - image/png png; - image/jpeg jpeg jpg; - image/x-icon ico; - image/x-jng jng; + image/gif gif; + image/jpeg jpeg jpg; + image/png png; + image/x-icon ico; + image/x-jng jng; - application/pdf pdf; - application/x-shockwave-flash swf; - application/x-javascript js; - application/x-rar-compressed rar; - application/x-xpinstall xpi; - application/x-x509-ca-cert der pem crt; + application/java-archive jar war ear; + application/mac-binhex40 hqx; + application/pdf pdf; + application/x-cocoa cco; + application/x-javascript js; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/zip zip; - audio/mpeg mp3; - audio/x-realaudio ra; + application/octet-stream deb; + application/octet-stream bin exe dll; + application/octet-stream dmg; + application/octet-stream eot; + application/octet-stream iso img; + application/octet-stream msi msp msm; - video/mpeg mpeg mpg; - video/quicktime mov; - video/x-flv flv; - video/x-msvideo avi; - video/x-ms-wmv wmv; - video/x-mng mng; + audio/mpeg mp3; + audio/x-realaudio ra; + + video/mpeg mpeg mpg; + video/quicktime mov; + video/x-flv flv; + video/x-msvideo avi; + video/x-ms-wmv wmv; + video/x-mng mng; } -- cgit v1.2.3