From d60907bc227f7434a7ca36ba93b09e4e30696187 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Wed, 10 Aug 2016 20:59:54 +0200
Subject: net.server_epoll: Use first writable event to signal onconnect

---
 net/server_epoll.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index c1bcbc39..5b61bd26 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -374,6 +374,7 @@ local function wrapsocket(client, server, pattern, listeners, tls) -- luasocket
 		created = gettime();
 		listeners = listeners;
 		_pattern = pattern or server._pattern;
+		onwriteable = interface.onconnect;
 		writebuffer = {};
 		tls = tls;
 	}, interface_mt);
@@ -397,8 +398,7 @@ function interface:onacceptable()
 		client._tls = false;
 		client:starttls();
 	else
-		self.listeners.onconnect(client);
-		client:setflags(true);
+		client:setflags(false, true);
 	end
 	client:setreadtimeout();
 end
@@ -419,9 +419,10 @@ function interface:pausefor(t)
 end
 
 function interface:onconnect()
-	self.onreadable = nil;
 	self.onwriteable = nil;
 	self.listeners.onconnect(self);
+	self:setflags(true);
+	return self:onwriteable();
 end
 
 local function addserver(addr, port, listeners, pattern, tls)
@@ -451,7 +452,6 @@ local function wrapclient(conn, addr, port, listeners, pattern, tls)
 		_pattern = pattern;
 		writebuffer = {};
 		tls = tls;
-		onreadable = interface.onconnect;
 		onwriteable = interface.onconnect;
 		peer = { addr, port };
 	}, interface_mt);
-- 
cgit v1.2.3