summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-08-27 17:45:58 +0000
committerSteven Barth <steven@midlink.org>2008-08-27 17:45:58 +0000
commitaf18067e75c3b6d9bbfa31b7ac844e6d3c9013e0 (patch)
tree3997bb2a3b8b86376ce3e4ed0380be0babeb1876
parent4e15641c240e28d60558a4b9e0d4738d5671412d (diff)
Fix some synchronization issues
-rw-r--r--libs/httpd/luasrc/httpd.lua1
-rw-r--r--libs/httpd/luasrc/httpd/handler/luci.lua2
2 files changed, 1 insertions, 2 deletions
diff --git a/libs/httpd/luasrc/httpd.lua b/libs/httpd/luasrc/httpd.lua
index 541063cc7e..75f5132e00 100644
--- a/libs/httpd/luasrc/httpd.lua
+++ b/libs/httpd/luasrc/httpd.lua
@@ -121,7 +121,6 @@ function step()
end
if idle then
- collectgarbage()
socket.sleep(THREAD_IDLEWAIT)
end
end
diff --git a/libs/httpd/luasrc/httpd/handler/luci.lua b/libs/httpd/luasrc/httpd/handler/luci.lua
index 320ab4c10e..737abd479e 100644
--- a/libs/httpd/luasrc/httpd/handler/luci.lua
+++ b/libs/httpd/luasrc/httpd/handler/luci.lua
@@ -84,7 +84,7 @@ function Luci.handle_get(self, request, sourcein, sinkerr)
return true
elseif id == 5 then
active = false
- return true
+ return nil
elseif id == 4 then
return data
end