Diff

net/server_epoll.lua @ 9995:8d46ecc4bd0c

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 04 May 2019 04:33:41 +0200
parent 9933:aac4c55721f9
parent 9994:524b8cd76780
child 10061:5c71693c8345
line wrap: on
line diff
--- 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