From: Steven Barth <steven@midlink.org>
Date: Wed, 23 Jul 2008 18:31:47 +0000 (+0000)
Subject: Fix sgi-wsapi and sgi-luci to be standards compliant
X-Git-Tag: 0.8.0~584
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;ds=sidebyside;h=59bef00fc3a9019733103661e67268f55c93ae17;p=project%2Fluci.git

Fix sgi-wsapi and sgi-luci to be standards compliant
---

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