luci-0.10: merge r6988

This commit is contained in:
Jo-Philipp Wich 2011-04-17 11:39:52 +00:00
parent 1982f945fa
commit 6bc13b31f5

View file

@ -82,7 +82,7 @@ function encode(obj, ...)
repeat repeat
chnk, err = e() chnk, err = e()
out[#out+1] = chnk out[#out+1] = chnk
until chnk until not chnk
return not err and table.concat(out) or nil return not err and table.concat(out) or nil
end end
@ -141,7 +141,7 @@ end
function Encoder.put(self, chunk) function Encoder.put(self, chunk)
if self.buffersize < 2 then if self.buffersize < 2 then
corountine.yield(chunk) coroutine.yield(chunk)
else else
if #self.buffer + #chunk > self.buffersize then if #self.buffer + #chunk > self.buffersize then
local written = 0 local written = 0