gaja-group
/
server-configs-nginx
mirror of https://github.com/h5bp/server-configs-nginx
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'leek-patch-1' into develop 

Conflicts:
	nginx/mime.types
This commit is contained in:
AD7six 2012-06-14 08:47:25 +02:00
parent 6b6fa6efeb e9cdc5dcb3
commit 2615c2c2b1
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nginx/mime.types
View File

@ -1,24 +1,19 @@
# this file is used by the nginx.conf
types { types {
text/html html htm shtml; text/html html htm shtml;
text/css css; text/css css;
# application/rss+xml causes some browsers to start a download
text/xml rss;
image/gif gif;
image/jpeg jpeg jpg;
application/json json;
# http://www.rfc-editor.org/rfc/rfc4329.txt
application/javascript js;
application/atom+xml atom;
text/cache-manifest manifest appcache; text/cache-manifest manifest appcache;
text/mathml mml; text/mathml mml;
text/plain txt; text/plain txt;
text/vnd.sun.j2me.app-descriptor jad; text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml; text/vnd.wap.wml wml;
text/x-component htc; text/x-component htc;
text/x-vcard vcf;
# JavaScript
application/javascript js jsonp;
application/json json;
# Images
image/png png; image/png png;
image/svg+xml svg svgz; image/svg+xml svg svgz;
image/tiff tif tiff; image/tiff tif tiff;
@ -27,8 +22,10 @@ types {
image/x-icon ico; image/x-icon ico;
image/x-jng jng; image/x-jng jng;
image/bmp bmp; image/bmp bmp;
image/gif gif;
image/jpeg jpeg jpg;
application/xml xml; application/xml rss atom xml rdf;
application/java-archive jar war ear; application/java-archive jar war ear;
application/mac-binhex40 hqx; application/mac-binhex40 hqx;
application/msword doc; application/msword doc;
@ -36,7 +33,6 @@ types {
application/postscript ps eps ai; application/postscript ps eps ai;
application/rtf rtf; application/rtf rtf;
application/vnd.ms-excel xls; application/vnd.ms-excel xls;
application/vnd.ms-fontobject eot;
application/vnd.ms-powerpoint ppt; application/vnd.ms-powerpoint ppt;
application/vnd.wap.wmlc wmlc; application/vnd.wap.wmlc wmlc;
application/xhtml+xml xhtml; application/xhtml+xml xhtml;
@ -44,8 +40,9 @@ types {
application/vnd.google-earth.kmz kmz; application/vnd.google-earth.kmz kmz;
application/x-7z-compressed 7z; application/x-7z-compressed 7z;
application/x-chrome-extension crx; application/x-chrome-extension crx;
application/x-opera-extension oex;
application/x-xpinstall xpi;
application/x-cocoa cco; application/x-cocoa cco;
application/x-font-ttf ttf ttc;
application/x-java-archive-diff jardiff; application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp; application/x-java-jnlp-file jnlp;
application/x-makeself run; application/x-makeself run;
@ -57,9 +54,7 @@ types {
application/x-shockwave-flash swf; application/x-shockwave-flash swf;
application/x-stuffit sit; application/x-stuffit sit;
application/x-tcl tcl tk; application/x-tcl tcl tk;
application/x-web-app-manifest+json webapp;
application/x-x509-ca-cert der pem crt; application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi;
application/zip zip; application/zip zip;
application/octet-stream bin exe dll; application/octet-stream bin exe dll;
@ -69,15 +64,17 @@ types {
application/octet-stream msi msp msm; application/octet-stream msi msp msm;
application/octet-stream safariextz; application/octet-stream safariextz;
# Audio
audio/midi mid midi kar; audio/midi mid midi kar;
audio/mpeg mp3; audio/mpeg mp3;
audio/ogg oga ogg; audio/ogg oga ogg;
audio/x-m4a m4a; audio/mp4 m4a f4a f4b;
audio/x-realaudio ra; audio/x-realaudio ra;
audio/x-wav wav; audio/x-wav wav;
# Video
video/3gpp 3gpp 3gp; video/3gpp 3gpp 3gp;
video/mp4 m4v mp4; video/mp4 mp4 m4v f4v f4p;
video/mpeg mpeg mpg; video/mpeg mpeg mpg;
video/ogg ogv; video/ogg ogv;
video/quicktime mov; video/quicktime mov;
@ -88,6 +85,9 @@ types {
video/x-ms-wmv wmv; video/x-ms-wmv wmv;
video/x-msvideo avi; video/x-msvideo avi;
# Webfonts
application/vnd.ms-fontobject eot;
application/x-font-ttf ttf ttc;
font/opentype otf; font/opentype otf;
font/woff woff; application/x-font-woff woff;
} }