From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 22 Jul 2011 14:00:14 +0000 (+0000)
Subject: luci-0Ã.10: merge r7332
X-Git-Tag: 0.10.0~92
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=072f01704d0cd4edc5d331ef3a0adcf2e670c1c1;p=oweals%2Fluci.git

luci-0Ã.10: merge r7332
---

diff --git a/libs/lucid/luasrc/lucid.lua b/libs/lucid/luasrc/lucid.lua
index 5d62a6cd8..7ecdf2acd 100644
--- a/libs/lucid/luasrc/lucid.lua
+++ b/libs/lucid/luasrc/lucid.lua
@@ -136,7 +136,6 @@ function run()
 			end
 		elseif stat == 0 then
 			ifaddrs = nixio.getifaddrs()
-			collectgarbage("collect")
 		end
 		
 		for _, cb in ipairs(tickt) do
@@ -231,6 +230,8 @@ function create_process(threadcb, waitcb)
 	if threadlimit and tcount >= threadlimit then
 		nixio.syslog("warning", "Cannot create thread: process limit reached")
 		return nil
+	else
+		collectgarbage("collect")
 	end
 	local pid, code, err = nixio.fork()
 	if pid and pid ~= 0 then