Merge pull request #5 from j15e/patch-1

Update with more complete default mime.types
This commit is contained in:
rhy-jot 2014-06-25 10:16:27 -07:00
commit 75f5e89851
2 changed files with 85 additions and 46 deletions

View File

@ -1,48 +1,86 @@
types { types {
text/html html htm shtml; text/html html htm shtml;
text/css css; text/css css;
text/xml xml rss; text/xml xml;
image/gif gif; image/gif gif;
image/jpeg jpeg jpg; image/jpeg jpeg jpg;
application/x-javascript js; application/javascript js;
text/plain txt; application/atom+xml atom;
text/x-component htc; application/rss+xml rss;
text/mathml mml;
image/png png; text/mathml mml;
image/x-icon ico; text/plain txt;
image/x-jng jng; text/vnd.sun.j2me.app-descriptor jad;
image/vnd.wap.wbmp wbmp; text/vnd.wap.wml wml;
application/java-archive jar war ear; text/x-component htc;
application/mac-binhex40 hqx;
application/pdf pdf; image/png png;
application/x-cocoa cco; image/tiff tif tiff;
application/x-java-archive-diff jardiff; image/vnd.wap.wbmp wbmp;
application/x-java-jnlp-file jnlp; image/x-icon ico;
application/x-makeself run; image/x-jng jng;
application/x-perl pl pm; image/x-ms-bmp bmp;
application/x-pilot prc pdb; image/svg+xml svg svgz;
application/x-rar-compressed rar; image/webp webp;
application/x-redhat-package-manager rpm;
application/x-sea sea; application/font-woff woff;
application/x-shockwave-flash swf; application/java-archive jar war ear;
application/x-stuffit sit; application/json json;
application/x-tcl tcl tk; application/mac-binhex40 hqx;
application/x-x509-ca-cert der pem crt; application/msword doc;
application/x-xpinstall xpi; application/pdf pdf;
application/zip zip; application/postscript ps eps ai;
application/octet-stream deb; application/rtf rtf;
application/octet-stream bin exe dll; application/vnd.ms-excel xls;
application/octet-stream dmg; application/vnd.ms-fontobject eot;
application/octet-stream eot; application/vnd.ms-powerpoint ppt;
application/octet-stream iso img; application/vnd.wap.wmlc wmlc;
application/octet-stream msi msp msm; application/vnd.google-earth.kml+xml kml;
audio/mpeg mp3; application/vnd.google-earth.kmz kmz;
audio/x-realaudio ra; application/x-7z-compressed 7z;
video/mpeg mpeg mpg; application/x-cocoa cco;
video/quicktime mov; application/x-java-archive-diff jardiff;
video/x-flv flv; application/x-java-jnlp-file jnlp;
video/x-msvideo avi; application/x-makeself run;
video/x-ms-wmv wmv; application/x-perl pl pm;
video/x-ms-asf asx asf; application/x-pilot prc pdb;
video/x-mng mng; 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/xhtml+xml xhtml;
application/zip zip;
application/octet-stream bin exe dll;
application/octet-stream deb;
application/octet-stream dmg;
application/octet-stream iso img;
application/octet-stream msi msp msm;
application/vnd.openxmlformats-officedocument.wordprocessingml.document docx;
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx;
application/vnd.openxmlformats-officedocument.presentationml.presentation pptx;
audio/midi mid midi kar;
audio/mpeg mp3;
audio/ogg ogg;
audio/x-m4a m4a;
audio/x-realaudio ra;
video/3gpp 3gpp 3gp;
video/mp4 mp4;
video/mpeg mpeg mpg;
video/quicktime mov;
video/webm webm;
video/x-flv flv;
video/x-m4v m4v;
video/x-mng mng;
video/x-ms-asf asx asf;
video/x-ms-wmv wmv;
video/x-msvideo avi;
} }

View File

@ -2,6 +2,7 @@ worker_processes 1;
error_log stderr; error_log stderr;
pid nginx.pid; pid nginx.pid;
daemon off; daemon off;
types_hash_max_size 2048;
events { events {
worker_connections 768; worker_connections 768;