From: Kim Alvefur <zash@zash.se>
Date: Tue, 19 Apr 2016 16:18:57 +0000 (+0200)
Subject: net.server_event: Fix traceback if event re-added during starttls
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=99994f86f1e0718c4cf8bdc156f04ce14233a4f0;p=prosody.git

net.server_event: Fix traceback if event re-added during starttls
---

diff --git a/net/server_event.lua b/net/server_event.lua
index 1c6f1547..9da2e910 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -545,12 +545,11 @@ do
 					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, EV_TIMEOUT
 					end
 					interface.eventwrite = nil
 					return -1