Merge 0.11->trunk
authorKim Alvefur <zash@zash.se>
Sat, 04 May 2019 04:33:41 +0200
changeset 9999 8d46ecc4bd0c
parent 9997 02a41315d275 (current diff)
parent 9998 524b8cd76780 (diff)
child 10000 9bb1bed3e8e3
Merge 0.11->trunk
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