diff options
| author | Steven Barth <steven@midlink.org> | 2008-07-23 18:31:47 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-07-23 18:31:47 +0000 |
| commit | 59bef00fc3a9019733103661e67268f55c93ae17 (patch) | |
| tree | e52b8b7e6ba4b4f33402a2c95299a073976079ef | |
| parent | 7a08658fe71e3b0f6e0052709d82b515599d6767 (diff) | |
Fix sgi-wsapi and sgi-luci to be standards compliant
| -rw-r--r-- | libs/httpd/luasrc/httpd/handler/luci.lua | 7 | ||||
| -rw-r--r-- | libs/sgi-wsapi/luasrc/sgi/wsapi.lua | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libs/httpd/luasrc/httpd/handler/luci.lua b/libs/httpd/luasrc/httpd/handler/luci.lua index 65f3f01b2..18715111f 100644 --- a/libs/httpd/luasrc/httpd/handler/luci.lua +++ b/libs/httpd/luasrc/httpd/handler/luci.lua @@ -84,10 +84,13 @@ function Luci.handle_get(self, request, sourcein, sinkerr) elseif not id then return true elseif id == 5 then - return nil - else + return true + elseif id == 4 then return data end + if coroutine.status(x) == "dead" then + return nil + end end headers["Expires"] = luci.http.protocol.date.to_http( os.time() ) diff --git a/libs/sgi-wsapi/luasrc/sgi/wsapi.lua b/libs/sgi-wsapi/luasrc/sgi/wsapi.lua index ebae9fc27..3b5302599 100644 --- a/libs/sgi-wsapi/luasrc/sgi/wsapi.lua +++ b/libs/sgi-wsapi/luasrc/sgi/wsapi.lua @@ -59,11 +59,14 @@ function run(wsapi_env) end local function iter() - local res, id, data1, data2 = coroutine.resume(x) - if not res or id == 5 then + local res, id, data = coroutine.resume(x) + if id == 4 then + return data + elseif id == 5 then + return "" + end + if coroutine.status(x) == "dead" then return nil - else - return data1 end end |