luci-0.10: merge r6988

diff --git a/libs/json/luasrc/json.lua b/libs/json/luasrc/json.lua
index 5b0928590f9f5a661cbd06e024baa0ed257ac629..9e38339be731ced5e5da1027b0a5a7e18ea9a5ef 100644 (file)
--- 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