aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-10-08 21:07:12 +0200
committerKim Alvefur <zash@zash.se>2016-10-08 21:07:12 +0200
commitde36c063b3efe67350888cd8334c7c17a1acd439 (patch)
tree5fe55261102b6924bf57aac6168934e490359956 /net
parent15c519eb2fa4ab7a704f2f3817c41233e78c7624 (diff)
parent3dd1ce8680d7831d2934013850067c5141069adb (diff)
downloadprosody-de36c063b3efe67350888cd8334c7c17a1acd439.tar.gz
prosody-de36c063b3efe67350888cd8334c7c17a1acd439.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server_event.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index c10173e4..fc3bde9f 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -561,6 +561,10 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx
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