diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-25 12:33:45 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-25 12:33:45 +0000 |
| commit | d06b399a17f3cb6dd362a4a97aa35e3c0d229cd5 (patch) | |
| tree | 7600bdcb05be2d1105865b176f3395a23efaf70c | |
| parent | 44fe79faff36d674623e2189f37a4e8512bc207d (diff) | |
| parent | 3a47c0c1736ab4b39d397e5d9c1285b3aba19071 (diff) | |
| download | prosody-d06b399a17f3cb6dd362a4a97aa35e3c0d229cd5.tar.gz prosody-d06b399a17f3cb6dd362a4a97aa35e3c0d229cd5.zip | |
Merge 0.7->trunk
| -rw-r--r-- | net/server_event.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 15fe4b3b..af6da45e 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -535,7 +535,7 @@ do 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 |