net/server_epoll.lua
changeset 11680 993462e5e4d4
parent 11679 139d80774f11
child 11681 98bcc19361db
--- a/net/server_epoll.lua	Tue Jul 13 14:51:05 2021 +0200
+++ b/net/server_epoll.lua	Tue Jul 13 14:55:21 2021 +0200
@@ -570,7 +570,7 @@
 	end
 end
 
-function interface:inittls(tls_ctx)
+function interface:inittls(tls_ctx, now)
 	if self._tls then return end
 	if tls_ctx then self.tls_ctx = tls_ctx; end
 	self._tls = true;
@@ -612,6 +612,9 @@
 	self.ondrain = nil;
 	self.onwritable = interface.tlshandshake;
 	self.onreadable = interface.tlshandshake;
+	if now then
+		return self:tlshandshake()
+	end
 	self:setreadtimeout(cfg.ssl_handshake_timeout);
 	self:setwritetimeout(cfg.ssl_handshake_timeout);
 	self:set(true, true);
@@ -701,11 +704,7 @@
 	client:debug("New connection %s on server %s", client, self);
 	if self.tls_direct then
 		client:add(true, true);
-		if client:inittls(self.tls_ctx) then
-			client:setreadtimeout(cfg.ssl_handshake_timeout);
-			client:setwritetimeout(cfg.ssl_handshake_timeout);
-			client:tlshandshake();
-		end
+		client:inittls(self.tls_ctx, true);
 	else
 		client:add(true, false);
 		client:onconnect();