diff options
| author | Stefan Bühler <stbuehler@web.de> | 2019-01-13 19:31:22 +0100 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2019-01-13 15:26:27 -0500 |
| commit | 9b7a32ea70e0f955489b21a64b416cf167558595 (patch) | |
| tree | 1da3d755e9b743fb5d68285f491d0d2a4dab8bae /doc | |
| parent | a70cf6e5dcf4a82e15ccd7e39ffb5687050f6cc9 (diff) | |
| download | lighttpd-git-9b7a32ea70e0f955489b21a64b416cf167558595.tar.gz | |
[doc/conf] resolve some mime type conflicts from debian buster, regenerate mime.conf
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/conf.d/mime.conf | 9 | ||||
| -rwxr-xr-x | doc/scripts/create-mime.conf.pl | 21 |
2 files changed, 27 insertions, 3 deletions
diff --git a/doc/config/conf.d/mime.conf b/doc/config/conf.d/mime.conf index 063bdd6c..3fd09150 100644 --- a/doc/config/conf.d/mime.conf +++ b/doc/config/conf.d/mime.conf @@ -52,10 +52,8 @@ mimetype.assign = ( ".dcm" => "application/dicom", ".tsp" => "application/dsptype", ".es" => "application/ecmascript", - ".otf" => "application/font-sfnt", - ".ttf" => "application/font-sfnt", + ".epub" => "application/epub+zip", ".pfr" => "application/font-tdpfr", - ".woff" => "application/font-woff", ".spl" => "application/futuresplash", ".gz" => "application/gzip", ".hta" => "application/hta", @@ -428,6 +426,11 @@ mimetype.assign = ( ".vmd" => "chemical/x-vmd", ".xtel" => "chemical/x-xtel", ".xyz" => "chemical/x-xyz", + ".ttc" => "font/collection", + ".otf" => "font/ttf", + ".ttf" => "font/ttf", + ".woff" => "font/woff", + ".woff2" => "font/woff2", ".gif" => "image/gif", ".ief" => "image/ief", ".jp2" => "image/jp2", diff --git a/doc/scripts/create-mime.conf.pl b/doc/scripts/create-mime.conf.pl index ba5fddf3..969292c7 100755 --- a/doc/scripts/create-mime.conf.pl +++ b/doc/scripts/create-mime.conf.pl @@ -45,6 +45,27 @@ my %manual_conflicts_resolve = ( '.ra' => { 'audio/x-pn-realaudio' => 'audio/x-realaudio', }, + # use font media types from iana registry + '.otf' => { + 'application/font-sfnt' => 'font/ttf', + 'font/sfnt' => 'font/ttf', + 'font/ttf' => 'font/ttf', + }, + '.ttf' => { + 'application/font-sfnt' => 'font/ttf', + 'font/otf' => 'font/ttf', + 'font/sfnt' => 'font/ttf', + }, + '.woff' => { + 'application/font-woff' => 'font/woff', + }, + # end of fonts + '.asn' => { + 'chemical/x-ncbi-asn1-spec' => 'application/octet-stream', + }, + '.ent' => { + 'chemical/x-ncbi-asn1-ascii' => 'application/octet-stream', + }, ); open MIMETYPES, "/etc/mime.types" or die "Can't open /etc/mime.types: $!"; |