Merge with trunk

[prosody.git] / net / server_event.lua

diff --git a/net/server_event.lua b/net/server_event.lua
index 5df764b4cbc17cd40425d29239494f84ad1316c4..b467a84dc6c147e6f8ca034fb1e0809d5dcf25a7 100644 (file)
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -291,7 +291,7 @@ do
        -- Public methods\r
        function interface_mt:write(data)\r
                if self.nowriting then return nil, "locked" end\r
-               vdebug( "try to send data to client, id/data:", self.id, data )\r
+               --vdebug( "try to send data to client, id/data:", self.id, data )\r
                data = tostring( data )\r
                local len = string_len( data )\r
                local total = len + self.writebufferlen\r
@@ -552,7 +552,7 @@ do
                                        interface.eventread = nil\r
                                        return -1\r
                                end\r
-                               if err and ( "timeout" ~= err ) then\r
+                               if err and ( err ~= "timeout" and err ~= "wantread" ) then\r
                                        if "wantwrite" == err then -- need to read on write event\r
                                                if not interface.eventwrite then  -- register new write event if needed\r
                                                        interface.eventwrite = addevent( base, interface.conn, EV_WRITE, interface.writecallback, cfg.WRITE_TIMEOUT )\r