prosody
a700d54c620a
net/server_event.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/server_event.lua @ 7394:a700d54c620a

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Tue, 19 Apr 2016 18:23:02 +0200
parent 7385:17929cdacec2
parent 7393:1909bde0e79f
child 7395:97fe648176ab
child 7399:066a4dfdac18
line wrap: on
line diff
--- a/net/server_event.lua	Tue Apr 19 17:44:04 2016 +0200
+++ b/net/server_event.lua	Tue Apr 19 18:23:02 2016 +0200
@@ -518,11 +518,10 @@
 				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.writebuffer ~= 0 then
+					-- data possibly written from ondrain
+					return EV_WRITE, cfg.WRITE_TIMEOUT
 				elseif interface.eventreadtimeout then
-					return EV_WRITE, EV_TIMEOUT
-				end
-				if interface.writebuffer ~= 0 then
-					-- data possibly written from ondrain
 					return EV_WRITE, cfg.WRITE_TIMEOUT
 				end
 				interface.eventwrite = nil