prosody
ab68bb837fe0
net/server_select.lua

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

Software / code / prosody

Diff

net/server_select.lua @ 6465:ab68bb837fe0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Oct 2014 15:37:46 +0200
parent 6442:0f4025abbe8f
parent 6459:ba421af3dfd3
child 6481:dbc72cd1332e
line wrap: on
line diff
--- a/net/server_select.lua	Mon Sep 29 13:59:16 2014 -0400
+++ b/net/server_select.lua	Sun Oct 05 15:37:46 2014 +0200
@@ -888,6 +888,8 @@
 					if not(handler.onreadtimeout) or handler:onreadtimeout() ~= true then
 						handler.disconnect( )( handler, "read timeout" )
 						handler:close( )	-- forced disconnect?
+					else
+						_readtimes[ handler ] = _currenttime -- reset timer
 					end
 				end
 			end