* lib/sgi-cgi, lib/sgi-webuci: Enforce HTTP standards

This commit is contained in:
Steven Barth 2008-06-28 22:17:24 +00:00
parent c7b5b23f87
commit 87e30fa12c
2 changed files with 12 additions and 6 deletions

View file

@ -49,11 +49,11 @@ function run()
end end
if id == 1 then if id == 1 then
io.write("Status: " .. tostring(data1) .. " " .. data2 .. "\n") io.write("Status: " .. tostring(data1) .. " " .. data2 .. "\r\n")
elseif id == 2 then elseif id == 2 then
io.write(data1 .. ": " .. data2 .. "\n") io.write(data1 .. ": " .. data2 .. "\r\n")
elseif id == 3 then elseif id == 3 then
io.write("\n") io.write("\r\n")
elseif id == 4 then elseif id == 4 then
io.write(data1) io.write(data1)
end end

View file

@ -39,6 +39,8 @@ function run(env, vars)
r.message.params = vars r.message.params = vars
local x = coroutine.create(luci.dispatcher.httpdispatch) local x = coroutine.create(luci.dispatcher.httpdispatch)
local status = ""
local headers = {}
while coroutine.status(x) ~= "dead" do while coroutine.status(x) ~= "dead" do
local res, id, data1, data2 = coroutine.resume(x, r) local res, id, data1, data2 = coroutine.resume(x, r)
@ -51,11 +53,15 @@ function run(env, vars)
end end
if id == 1 then if id == 1 then
io.write(env.SERVER_PROTOCOL .. " " .. tostring(data1) .. " " .. data2 .. "\n") status = env.SERVER_PROTOCOL .. " " .. tostring(data1) .. " " .. data2 .. "\r\n"
elseif id == 2 then elseif id == 2 then
io.write(data1 .. ": " .. data2 .. "\n") headers[data1] = data2
elseif id == 3 then elseif id == 3 then
io.write("\n") io.write(status)
for k, v in pairs(headers) do
io.write(k .. ": " .. v .. "\r\n")
end
io.write("\r\n")
elseif id == 4 then elseif id == 4 then
io.write(data1) io.write(data1)
end end