summaryrefslogtreecommitdiffhomepage
path: root/libs
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-09-12 16:12:51 +0000
committerSteven Barth <steven@midlink.org>2008-09-12 16:12:51 +0000
commit871f07ad2e02040e10f85c7c77dca465932582ab (patch)
treeee100f70206b52f4336c724c3b898d444f6177a9 /libs
parent2bbc4eb3c33c3590433174c599ec9418bdb8f38a (diff)
Avoid XML errors
Diffstat (limited to 'libs')
-rw-r--r--libs/web/luasrc/http.lua14
1 files changed, 8 insertions, 6 deletions
diff --git a/libs/web/luasrc/http.lua b/libs/web/luasrc/http.lua
index 6b73b9414..c5a85ea4d 100644
--- a/libs/web/luasrc/http.lua
+++ b/libs/web/luasrc/http.lua
@@ -192,14 +192,16 @@ end
--- Set the mime type of following content data.
-- @param mime Mimetype of following content
function prepare_content(mime)
- if mime == "application/xhtml+xml" then
- if not getenv("HTTP_ACCEPT") or
- not getenv("HTTP_ACCEPT"):find("application/xhtml+xml", nil, true) then
- mime = "text/html; charset=UTF-8"
+ if not context.headers or not context.headers["content-type"] then
+ if mime == "application/xhtml+xml" then
+ if not getenv("HTTP_ACCEPT") or
+ not getenv("HTTP_ACCEPT"):find("application/xhtml+xml", nil, true) then
+ mime = "text/html; charset=UTF-8"
+ end
+ header("Vary", "Accept")
end
- header("Vary", "Accept")
+ header("Content-Type", mime)
end
- header("Content-Type", mime)
end
--- Get the RAW HTTP input source