prosody
861a747e441b
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 @ 7690:861a747e441b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 08 Oct 2016 21:07:12 +0200
parent 7422:41be97f8158f
parent 7688:88ad2d5bcf80
child 7810:cdb5dd9f35c0
line wrap: on
line diff
--- a/net/server_event.lua	Fri Oct 07 17:18:29 2016 +0200
+++ b/net/server_event.lua	Sat Oct 08 21:07:12 2016 +0200
@@ -561,6 +561,10 @@
 			return -1
 		end
 		if EV_TIMEOUT == event and not interface.conn:dirty() and interface:onreadtimeout() ~= true then
+			interface.fatalerror = "timeout during receiving"
+			debug( "connection failed:", interface.fatalerror )
+			interface:_close()
+			interface.eventread = nil
 			return -1 -- took too long to get some data from client -> disconnect
 		end
 		if interface._usingssl then  -- handle luasec