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

4 files changed, 39 insertions, 24 deletions

diff --git a/libs/httpd/luasrc/httpd/handler/luci.lua b/libs/httpd/luasrc/httpd/handler/luci.lua
index 18715111f8..232883256e 100644
--- a/libs/httpd/luasrc/httpd/handler/luci.lua
+++ b/libs/httpd/luasrc/httpd/handler/luci.lua
@@ -55,6 +55,7 @@ function Luci.handle_get(self, request, sourcein, sinkerr)
 	local res, id, data1, data2 = true, 0, nil, nil
 	local headers = {}
 	local status = 200
+	local active = true
 
 	local x = coroutine.create(luci.dispatcher.httpdispatch)
 	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)
 		if not res then
 			return nil, id
-		elseif not id then
+		elseif not id or not active then
 			return true
 		elseif id == 5 then
+			active = false
 			return true
 		elseif id == 4 then
 			return data
diff --git a/libs/sgi-cgi/luasrc/sgi/cgi.lua b/libs/sgi-cgi/luasrc/sgi/cgi.lua
index 0d5ba6ff1b..d36d43fb51 100644
--- a/libs/sgi-cgi/luasrc/sgi/cgi.lua
+++ b/libs/sgi-cgi/luasrc/sgi/cgi.lua
@@ -38,6 +38,7 @@ function run()
 	
 	local x = coroutine.create(luci.dispatcher.httpdispatch)
 	local hcache = ""
+	local active = true
 	
 	while coroutine.status(x) ~= "dead" do
 		local res, id, data1, data2 = coroutine.resume(x, r)
@@ -49,16 +50,19 @@ function run()
 			break;
 		end
 
-		if id == 1 then
-			io.write("Status: " .. tostring(data1) .. " " .. data2 .. "\r\n")
-		elseif id == 2 then
-			hcache = hcache .. data1 .. ": " .. data2 .. "\r\n"
-		elseif id == 3 then
-			io.write(hcache)
-			io.write("\r\n")
-		elseif id == 4 then
-			io.write(data1)
+		if active then
+			if id == 1 then
+				io.write("Status: " .. tostring(data1) .. " " .. data2 .. "\r\n")
+			elseif id == 2 then
+				hcache = hcache .. data1 .. ": " .. data2 .. "\r\n"
+			elseif id == 3 then
+				io.write(hcache)
+				io.write("\r\n")
+			elseif id == 4 then
+				io.write(data1)
+			elseif id == 5 then
+				active = false
+			end
 		end
-		
 	end
 end
diff --git a/libs/sgi-webuci/luasrc/sgi/webuci.lua b/libs/sgi-webuci/luasrc/sgi/webuci.lua
index 3143fb1a31..e20dc5de02 100644
--- a/libs/sgi-webuci/luasrc/sgi/webuci.lua
+++ b/libs/sgi-webuci/luasrc/sgi/webuci.lua
@@ -41,6 +41,7 @@ function run(env, vars)
 	local x = coroutine.create(luci.dispatcher.httpdispatch)
 	local status = ""
 	local headers = {}
+	local active = true
 	
 	while coroutine.status(x) ~= "dead" do
 		local res, id, data1, data2 = coroutine.resume(x, r)
@@ -52,19 +53,22 @@ function run(env, vars)
 			break;
 		end
 		
-		if id == 1 then
-			status = env.SERVER_PROTOCOL .. " " .. tostring(data1) .. " " .. data2 .. "\r\n"
-		elseif id == 2 then
-			headers[data1] = data2
-		elseif id == 3 then
-			io.write(status)
-			for k, v in pairs(headers) do
-				io.write(k .. ": " .. v .. "\r\n")
+		if active then
+			if id == 1 then
+				status = env.SERVER_PROTOCOL .. " " .. tostring(data1) .. " " .. data2 .. "\r\n"
+			elseif id == 2 then
+				headers[data1] = data2
+			elseif id == 3 then
+				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
+				io.write(data1)
+			elseif id == 5 then
+				active = false
 			end
-			io.write("\r\n")
-		elseif id == 4 then
-			io.write(data1)
 		end
-		
 	end
 end
diff --git a/libs/sgi-wsapi/luasrc/sgi/wsapi.lua b/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
index 3b53025990..836295be92 100644
--- a/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
+++ b/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
@@ -41,6 +41,8 @@ function run(wsapi_env)
 	local status = 200
 	
 	local x = coroutine.create(luci.dispatcher.httpdispatch)
+	local active = true
+	
 	while id < 3 do
 		res, id, data1, data2 = coroutine.resume(x, r)
 		
@@ -60,9 +62,12 @@ function run(wsapi_env)
 	
 	local function iter()
 		local res, id, data = coroutine.resume(x)
-		if id == 4 then
+		if id == 4 and active then
 			return data
 		elseif id == 5 then
+			active = false
+			return ""
+		else
 			return ""
 		end
 		if coroutine.status(x) == "dead" then