- mimetype_textcharsetheader to tune (now) optional charset header for text/* content...

  see http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2012-February/022488.html for discussion

Changed files:
    lighttpd-mime.types.sh -> 1.4
    lighttpd.spec -> 1.361

diff --git a/lighttpd-mime.types.sh b/lighttpd-mime.types.sh
index 6acbe063863bfec2f21a66b1903285b680e68b6c..5252638ff7cc945ab38c71d9d9a2565be0205bea 100644 (file)
--- a/lighttpd-mime.types.sh
+++ b/lighttpd-mime.types.sh
@@ -19,7 +19,7 @@ awk '{
        charset = "";
        # add charset for "text/*" types
        if (type ~ "text/") {
-               type = "\"" type "; charset=\" + mimetype_textcharset"
+               type = "\"" type "\" + mimetype_textcharsetheader"
        } else {
                type = "\"" type "\""
        }
@@ -41,7 +41,13 @@ mv -f mime.types.conf mime.types.conf.tmp
 # header
 cat >> mime.types.conf <<EOF
 # charset used for "text/*" mimetypes
-mimetype_textcharset = "utf-8"
+# Apache's AddCharset equivalent. Leave empty to add no charset.
+# AddCharset "utf-8" would be "; charset=\"utf-8\""
+# See this post about what it affects:
+# http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2012-February/022499.html
+mimetype_textcharsetheader = ""
+#mimetype_textcharsetheader = "; charset=\"utf-8\""
+
 # mimetype mapping
 mimetype.assign = (
 EOF

diff --git a/lighttpd.spec b/lighttpd.spec
index 9401a7f67f9ed1da3547118f4a2eddc06c515a93..354fd5cb528b6ae394f69a3db06229b04116461b 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -29,7 +29,7 @@ Summary:      Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
 Version:       1.4.30
-Release:       7
+Release:       8
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2