Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Made SGIs even more standards compliant (respect EOF command from LuCI)

Browse source
This commit is contained in:
Steven Barth 2008-07-23 18:52:12 +00:00
parent 59bef00fc3
commit 22451345d8
4 changed files with 39 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/httpd/luasrc/httpd/handler/luci.lua
View file

@ -55,6 +55,7 @@ function Luci.handle_get(self, request, sourcein, sinkerr)
local res, id, data1, data2 = true, 0, nil, nil local res, id, data1, data2 = true, 0, nil, nil
local headers = {} local headers = {}
local status = 200 local status = 200
local active = true
local x = coroutine.create(luci.dispatcher.httpdispatch) local x = coroutine.create(luci.dispatcher.httpdispatch)
while not id or id < 3 do while not id or id < 3 do
@ -81,9 +82,10 @@ function Luci.handle_get(self, request, sourcein, sinkerr)
local res, id, data = coroutine.resume(x) local res, id, data = coroutine.resume(x)
if not res then if not res then
return nil, id return nil, id
elseif not id then elseif not id or not active then
return true return true
elseif id == 5 then elseif id == 5 then
active = false
return true return true
elseif id == 4 then elseif id == 4 then
return data return data

24
libs/sgi-cgi/luasrc/sgi/cgi.lua
View file

@ -38,6 +38,7 @@ function run()
local x = coroutine.create(luci.dispatcher.httpdispatch) local x = coroutine.create(luci.dispatcher.httpdispatch)
local hcache = "" local hcache = ""
local active = true
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)
@ -49,16 +50,19 @@ function run()
break; break;
end end
if id == 1 then if active then
io.write("Status: " .. tostring(data1) .. " " .. data2 .. "\r\n") if id == 1 then
elseif id == 2 then io.write("Status: " .. tostring(data1) .. " " .. data2 .. "\r\n")
hcache = hcache .. data1 .. ": " .. data2 .. "\r\n" elseif id == 2 then
elseif id == 3 then hcache = hcache .. data1 .. ": " .. data2 .. "\r\n"
io.write(hcache) elseif id == 3 then
io.write("\r\n") io.write(hcache)
elseif id == 4 then io.write("\r\n")
io.write(data1) elseif id == 4 then
io.write(data1)
elseif id == 5 then
active = false
end
end end
end end
end end

28
libs/sgi-webuci/luasrc/sgi/webuci.lua
View file

@ -41,6 +41,7 @@ function run(env, vars)
local x = coroutine.create(luci.dispatcher.httpdispatch) local x = coroutine.create(luci.dispatcher.httpdispatch)
local status = "" local status = ""
local headers = {} local headers = {}
local active = true
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)
@ -52,19 +53,22 @@ function run(env, vars)
break; break;
end end
if id == 1 then if active then
status = env.SERVER_PROTOCOL .. " " .. tostring(data1) .. " " .. data2 .. "\r\n" if id == 1 then
elseif id == 2 then status = env.SERVER_PROTOCOL .. " " .. tostring(data1) .. " " .. data2 .. "\r\n"
headers[data1] = data2 elseif id == 2 then
elseif id == 3 then headers[data1] = data2
io.write(status) elseif id == 3 then
for k, v in pairs(headers) do io.write(status)
io.write(k .. ": " .. v .. "\r\n") for k, v in pairs(headers) do
io.write(k .. ": " .. v .. "\r\n")
end
io.write("\r\n")
elseif id == 4 then
io.write(data1)
elseif id == 5 then
active = false
end end
io.write("\r\n")
elseif id == 4 then
io.write(data1)
end end
end end
end end

7
libs/sgi-wsapi/luasrc/sgi/wsapi.lua
View file

@ -41,6 +41,8 @@ function run(wsapi_env)
local status = 200 local status = 200
local x = coroutine.create(luci.dispatcher.httpdispatch) local x = coroutine.create(luci.dispatcher.httpdispatch)
local active = true
while id < 3 do while id < 3 do
res, id, data1, data2 = coroutine.resume(x, r) res, id, data1, data2 = coroutine.resume(x, r)
@ -60,9 +62,12 @@ function run(wsapi_env)
local function iter() local function iter()
local res, id, data = coroutine.resume(x) local res, id, data = coroutine.resume(x)
if id == 4 then if id == 4 and active then
return data return data
elseif id == 5 then elseif id == 5 then
active = false
return ""
else
return "" return ""
end end
if coroutine.status(x) == "dead" then if coroutine.status(x) == "dead" then