# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1556937221 -7200
# Node ID 8d46ecc4bd0c6f1bc4a31da8572f4eb90452a049
# Parent  02a41315d27593a951977fc95e5ab99065d09d7e# Parent  524b8cd76780ca2b3e537ffc0b52724902bcf7f3
Merge 0.11->trunk

diff -r 02a41315d275 -r 8d46ecc4bd0c net/server_epoll.lua
--- a/net/server_epoll.lua	Fri May 03 20:54:24 2019 +0200
+++ b/net/server_epoll.lua	Sat May 04 04:33:41 2019 +0200
@@ -596,10 +596,10 @@
 	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