Merge 0.10->trunk

[prosody.git] / net / server_event.lua

diff --git a/net/server_event.lua b/net/server_event.lua
index 025e39498de7aaffee0defddc9c217a353c48f6a..cfe9c6f58b3482f610647ae6cf6e6d90a7a8164b 100644 (file)
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -518,12 +518,11 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx
                                elseif interface.startsslcallback then  -- start ssl connection if needed
                                        debug "starting ssl handshake after writing"
                                        interface.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, interface.startsslcallback, 0 )
-                               elseif interface.eventreadtimeout then
-                                       return EV_WRITE, EV_TIMEOUT
-                               end
-                               if interface.writebuffer ~= 0 then
+                               elseif interface.writebuffer ~= 0 then
                                        -- data possibly written from ondrain
                                        return EV_WRITE, cfg.WRITE_TIMEOUT
+                               elseif interface.eventreadtimeout then
+                                       return EV_WRITE, cfg.WRITE_TIMEOUT
                                end
                                interface.eventwrite = nil
                                return -1