# HG changeset patch # User Kim Alvefur # Date 1471534860 -7200 # Node ID f40f1d9b7872bcd3ce93588a2391ec6a4df7a91b # Parent 2481ebc7f715e86f19d25e450d81cd5b73a04028 net.server_epoll: Set timers before calling onincoming, fixes traceback if connection is closed before onincoming returns diff -r 2481ebc7f715 -r f40f1d9b7872 net/server_epoll.lua --- a/net/server_epoll.lua Thu Aug 18 17:36:46 2016 +0200 +++ b/net/server_epoll.lua Thu Aug 18 17:41:00 2016 +0200 @@ -268,6 +268,12 @@ -- Called when socket is readable function interface:onreadable() local data, err, partial = self.conn:receive(self._pattern); + if self.conn:dirty() then + self:setreadtimeout(false); + self:pausefor(cfg.read_retry_delay); + else + self:setreadtimeout(); + end if data or partial then self:on("incoming", data or partial, err); end @@ -280,12 +286,6 @@ self:destroy() return; end - if self.conn:dirty() then - self:setreadtimeout(false); - self:pausefor(cfg.read_retry_delay); - else - self:setreadtimeout(); - end end -- Called when socket is writable