summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2017-01-02 16:08:49 +0100
committerGlenn Strauss <gstrauss@gluelogic.com>2017-01-31 14:40:05 -0500
commit1c3e7095d951b1f4cf99cdf3f4980423d934a033 (patch)
treed83ce5fc20f124574bf23a00cbfa17f01fb8f0a9 /doc
parent0ae6bab4a97f12a0c93200df36ac1741696eeed5 (diff)
downloadlighttpd-git-1c3e7095d951b1f4cf99cdf3f4980423d934a033.tar.gz
[mime.conf] add text/markdown to utf-8 list, regenerate mime.conf
Diffstat (limited to 'doc')
-rw-r--r--doc/config/conf.d/mime.conf7
-rwxr-xr-xdoc/scripts/create-mime.conf.pl3
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/config/conf.d/mime.conf b/doc/config/conf.d/mime.conf
index 8d8d69c1..063bdd6c 100644
--- a/doc/config/conf.d/mime.conf
+++ b/doc/config/conf.d/mime.conf
@@ -76,7 +76,10 @@ mimetype.assign = (
".mxf" => "application/mxf",
".asn" => "application/octet-stream",
".bin" => "application/octet-stream",
+ ".deploy" => "application/octet-stream",
".ent" => "application/octet-stream",
+ ".msp" => "application/octet-stream",
+ ".msu" => "application/octet-stream",
".oda" => "application/oda",
".opf" => "application/oebps-package+xml",
".ogx" => "application/ogg",
@@ -263,6 +266,8 @@ mimetype.assign = (
".maker" => "application/x-maker",
".mif" => "application/x-mif",
".m3u8" => "application/x-mpegURL",
+ ".application" => "application/x-ms-application",
+ ".manifest" => "application/x-ms-manifest",
".wmd" => "application/x-ms-wmd",
".wmz" => "application/x-ms-wmz",
".bat" => "application/x-msdos-program",
@@ -485,6 +490,8 @@ mimetype.assign = (
".html" => "text/html",
".shtml" => "text/html",
".uls" => "text/iuls",
+ ".markdown" => "text/markdown; charset=utf-8",
+ ".md" => "text/markdown; charset=utf-8",
".mml" => "text/mathml",
".asc" => "text/plain; charset=utf-8",
".brf" => "text/plain; charset=utf-8",
diff --git a/doc/scripts/create-mime.conf.pl b/doc/scripts/create-mime.conf.pl
index 5a9b3be3..ba5fddf3 100755
--- a/doc/scripts/create-mime.conf.pl
+++ b/doc/scripts/create-mime.conf.pl
@@ -9,9 +9,12 @@ use strict;
# text/html IS NOT INCLUDED: html has its own method for defining charset
# (<meta>), but the standards specify that content-type in HTTP wins over
# the setting in the html document.
+# text/markdown doesn't have an official default charset, but requires
+# one being specified - it seems reasonable to hardcode it to UTF-8
my %text_utf8 = map { $_ => 1 } qw(
css
csv
+ markdown
plain
x-bibtex
x-boo