Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge 0.7->trunk
Thu, 25 Mar 2010 12:33:45 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Thu, 25 Mar 2010 12:33:45 +0000
- changeset 2942
- 29ec7cd77f81
- parent 2940
- 7486b9216879 (current diff)
- parent 2941
- a2b01936f8f9 (diff)
- child 2944
- 855c0eb80600
Merge 0.7->trunk
--- a/net/server_event.lua Wed Mar 24 22:48:12 2010 +0000 +++ b/net/server_event.lua Thu Mar 25 12:33:45 2010 +0000 @@ -535,7 +535,7 @@ end interface.eventwrite = nil return -1 - elseif byte then -- want write again + elseif byte and (err == "timeout" or err == "wantwrite") then -- want write again --vdebug( "writebuffer is not empty:", err ) interface.writebuffer = string_sub( interface.writebuffer, byte + 1, interface.writebufferlen ) -- new buffer interface.writebufferlen = interface.writebufferlen - byte
