From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 17 Apr 2011 11:39:52 +0000 (+0000)
Subject: luci-0.10: merge r6988
X-Git-Tag: 0.10.0~161
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6bc13b31f5e03e23993ba0cdc6b5c29d2938165b;p=oweals%2Fluci.git

luci-0.10: merge r6988
---

diff --git a/libs/json/luasrc/json.lua b/libs/json/luasrc/json.lua
index 5b0928590..9e38339be 100644
--- a/libs/json/luasrc/json.lua
+++ b/libs/json/luasrc/json.lua
@@ -82,7 +82,7 @@ function encode(obj, ...)
 	repeat
 		chnk, err = e()
 		out[#out+1] = chnk
-	until chnk
+	until not chnk
 	return not err and table.concat(out) or nil
 end
 
@@ -141,7 +141,7 @@ end
 
 function Encoder.put(self, chunk)
 	if self.buffersize < 2 then
-		corountine.yield(chunk)
+		coroutine.yield(chunk)
 	else
 		if #self.buffer + #chunk > self.buffersize then
 			local written = 0