diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | doc/config/conf.d/mime.conf | 43 | ||||
| -rwxr-xr-x | doc/scripts/create-mime.conf.pl | 2 |
3 files changed, 37 insertions, 9 deletions
@@ -26,6 +26,7 @@ NEWS * fix memory leak in mod_status when no counters are set (found by coverity) * [mod_magnet] fix segfault when accessing not existing lighty.req_env[] entry (found by coverity) * fix segfault when temp file for upload couldn't be created (found by coverity) + * mime.conf: add some new mime types, remove .dat, .sha1, .md5, update .vcf - 1.4.35 - 2014-03-12 * [network/ssl] fix build error if TLSEXT is disabled diff --git a/doc/config/conf.d/mime.conf b/doc/config/conf.d/mime.conf index f65a02cd..c4d6ce41 100644 --- a/doc/config/conf.d/mime.conf +++ b/doc/config/conf.d/mime.conf @@ -27,6 +27,7 @@ ## This matches all extensions and acts as default mime type, and enables ## caching for those. mimetype.assign = ( + ".pcf.Z" => "application/x-font-pcf", ".tar.bz2" => "application/x-gtar-compressed", ".tar.gz" => "application/x-gtar-compressed", ".ez" => "application/andrew-inset", @@ -40,7 +41,12 @@ mimetype.assign = ( ".dcm" => "application/dicom", ".tsp" => "application/dsptype", ".es" => "application/ecmascript", + ".otf" => "application/font-sfnt", + ".ttf" => "application/font-sfnt", + ".pfr" => "application/font-tdpfr", + ".woff" => "application/font-woff", ".spl" => "application/futuresplash", + ".gz" => "application/gzip", ".hta" => "application/hta", ".jar" => "application/java-archive", ".ser" => "application/java-serialized-object", @@ -61,6 +67,7 @@ mimetype.assign = ( ".bin" => "application/octet-stream", ".ent" => "application/octet-stream", ".oda" => "application/oda", + ".opf" => "application/oebps-package+xml", ".ogx" => "application/ogg", ".one" => "application/onenote", ".onepkg" => "application/onenote", @@ -95,17 +102,32 @@ mimetype.assign = ( ".zip" => "application/zip", ".apk" => "application/vnd.android.package-archive", ".cdy" => "application/vnd.cinderella", + ".ddeb" => "application/vnd.debian.binary-package", + ".deb" => "application/vnd.debian.binary-package", + ".udeb" => "application/vnd.debian.binary-package", + ".sfd" => "application/vnd.font-fontforge-sfd", ".kml" => "application/vnd.google-earth.kml+xml", ".kmz" => "application/vnd.google-earth.kmz", ".xul" => "application/vnd.mozilla.xul+xml", ".xlb" => "application/vnd.ms-excel", ".xls" => "application/vnd.ms-excel", ".xlt" => "application/vnd.ms-excel", + ".xlam" => "application/vnd.ms-excel.addin.macroEnabled.12", + ".xlsb" => "application/vnd.ms-excel.sheet.binary.macroEnabled.12", + ".xlsm" => "application/vnd.ms-excel.sheet.macroEnabled.12", + ".xltm" => "application/vnd.ms-excel.template.macroEnabled.12", ".eot" => "application/vnd.ms-fontobject", ".thmx" => "application/vnd.ms-officetheme", ".cat" => "application/vnd.ms-pki.seccat", ".pps" => "application/vnd.ms-powerpoint", ".ppt" => "application/vnd.ms-powerpoint", + ".ppam" => "application/vnd.ms-powerpoint.addin.macroEnabled.12", + ".pptm" => "application/vnd.ms-powerpoint.presentation.macroEnabled.12", + ".sldm" => "application/vnd.ms-powerpoint.slide.macroEnabled.12", + ".ppsm" => "application/vnd.ms-powerpoint.slideshow.macroEnabled.12", + ".potm" => "application/vnd.ms-powerpoint.template.macroEnabled.12", + ".docm" => "application/vnd.ms-word.document.macroEnabled.12", + ".dotm" => "application/vnd.ms-word.template.macroEnabled.12", ".odc" => "application/vnd.oasis.opendocument.chart", ".odb" => "application/vnd.oasis.opendocument.database", ".odf" => "application/vnd.oasis.opendocument.formula", @@ -151,6 +173,9 @@ mimetype.assign = ( ".cap" => "application/vnd.tcpdump.pcap", ".pcap" => "application/vnd.tcpdump.pcap", ".vsd" => "application/vnd.visio", + ".vss" => "application/vnd.visio", + ".vst" => "application/vnd.visio", + ".vsw" => "application/vnd.visio", ".wbxml" => "application/vnd.wap.wbxml", ".wmlc" => "application/vnd.wap.wmlc", ".wmlsc" => "application/vnd.wap.wmlscriptc", @@ -172,15 +197,16 @@ mimetype.assign = ( ".pgn" => "application/x-chess-pgn", ".mph" => "application/x-comsol", ".cpio" => "application/x-cpio", - ".deb" => "application/x-debian-package", - ".udeb" => "application/x-debian-package", ".dcr" => "application/x-director", ".dir" => "application/x-director", ".dxr" => "application/x-director", ".dms" => "application/x-dms", ".wad" => "application/x-doom", ".dvi" => "application/x-dvi", - ".woff" => "application/x-font-woff", + ".gsf" => "application/x-font", + ".pfa" => "application/x-font", + ".pfb" => "application/x-font", + ".pcf" => "application/x-font-pcf", ".mm" => "application/x-freemind", ".gan" => "application/x-ganttproject", ".gnumeric" => "application/x-gnumeric", @@ -190,7 +216,6 @@ mimetype.assign = ( ".taz" => "application/x-gtar-compressed", ".tbz" => "application/x-gtar-compressed", ".tgz" => "application/x-gtar-compressed", - ".gz" => "application/x-gzip", ".hdf" => "application/x-hdf", ".hwp" => "application/x-hwp", ".ica" => "application/x-ica", @@ -225,8 +250,8 @@ mimetype.assign = ( ".frame" => "application/x-maker", ".frm" => "application/x-maker", ".maker" => "application/x-maker", - ".md5" => "application/x-md5", ".mif" => "application/x-mif", + ".m3u8" => "application/x-mpegURL", ".wmd" => "application/x-ms-wmd", ".wmz" => "application/x-ms-wmz", ".bat" => "application/x-msdos-program", @@ -235,7 +260,6 @@ mimetype.assign = ( ".exe" => "application/x-msdos-program", ".msi" => "application/x-msi", ".nc" => "application/x-netcdf", - ".dat" => "application/x-ns-proxy-autoconfig", ".pac" => "application/x-ns-proxy-autoconfig", ".nwc" => "application/x-nwc", ".o" => "application/x-object", @@ -255,7 +279,6 @@ mimetype.assign = ( ".sce" => "application/x-scilab", ".sci" => "application/x-scilab", ".xcos" => "application/x-scilab-xcos", - ".sha1" => "application/x-sha1", ".shar" => "application/x-shar", ".swf" => "application/x-shockwave-flash", ".swfl" => "application/x-shockwave-flash", @@ -283,6 +306,7 @@ mimetype.assign = ( ".xcf" => "application/x-xcf", ".fig" => "application/x-xfig", ".xpi" => "application/x-xpinstall", + ".xz" => "application/x-xz", ".amr" => "audio/amr", ".awb" => "audio/amr-wb", ".axa" => "audio/annodex", @@ -370,6 +394,7 @@ mimetype.assign = ( ".tgf" => "chemical/x-mdl-tgf", ".mcif" => "chemical/x-mmcif", ".mol2" => "chemical/x-mol2", + ".b" => "chemical/x-molconn-Z", ".gpt" => "chemical/x-mopac-graph", ".mop" => "chemical/x-mopac-input", ".mopcrt" => "chemical/x-mopac-input", @@ -465,6 +490,8 @@ mimetype.assign = ( ".tsv" => "text/tab-separated-values", ".tm" => "text/texmacs", ".ttl" => "text/turtle", + ".vcard" => "text/vcard", + ".vcf" => "text/vcard", ".jad" => "text/vnd.sun.j2me.app-descriptor", ".wml" => "text/vnd.wap.wml", ".wmls" => "text/vnd.wap.wmlscript", @@ -507,8 +534,8 @@ mimetype.assign = ( ".sty" => "text/x-tex; charset=utf-8", ".tex" => "text/x-tex; charset=utf-8", ".vcs" => "text/x-vcalendar", - ".vcf" => "text/x-vcard", ".3gp" => "video/3gpp", + ".ts" => "video/MP2T", ".axv" => "video/annodex", ".dl" => "video/dl", ".dif" => "video/dv", diff --git a/doc/scripts/create-mime.conf.pl b/doc/scripts/create-mime.conf.pl index 7c9e3781..c96ee5aa 100755 --- a/doc/scripts/create-mime.conf.pl +++ b/doc/scripts/create-mime.conf.pl @@ -106,7 +106,7 @@ while (<MIMETYPES>) { chomp; s/\#.*//; next if /^\w*$/; - if (/^([a-z0-9\/+-.]+)\s+((?:[a-z0-9.+-]+[ ]?)+)$/) { + if (/^([a-z0-9\/+-.]+)\s+((?:[a-z0-9.+-]+[ ]?)+)$/i) { my $mimetype = $1; my @extensions = split / /, $2; |