aboutsummaryrefslogtreecommitdiffstats
path: root/net/server_epoll.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-05-04 04:33:41 +0200
committerKim Alvefur <zash@zash.se>2019-05-04 04:33:41 +0200
commit446025683221e23ae3c12abd1e665ea7529e14f9 (patch)
tree2231f627acbd1e0e7d9889e88c3b82cead6b3119 /net/server_epoll.lua
parentf65c017ee107f86b353d5931e85a70e8c6067f1f (diff)
parentd2d042186f440e4f95444c693c9a7737cc377e56 (diff)
downloadprosody-446025683221e23ae3c12abd1e665ea7529e14f9.tar.gz
prosody-446025683221e23ae3c12abd1e665ea7529e14f9.zip
Merge 0.11->trunk
Diffstat (limited to 'net/server_epoll.lua')
-rw-r--r--net/server_epoll.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index be0a5b6a..5f62d931 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -596,10 +596,10 @@ function interface:pausefor(t)
self:set(false);
self._pausefor = addtimer(t, function ()
self._pausefor = nil;
+ self:set(true);
if self.conn and self.conn:dirty() then
self:onreadable();
end
- self:set(true);
end);
end