Merge 13.0->trunk

9 months ago · 99a70ea86e
parent 521b13beb5 c701571b95
commit 99a70ea86e
1 changed files with 1 additions and 1 deletions
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@ -772,7 +772,7 @@ function interface:starttls(tls_ctx)
 		self.onreadable = interface.inittls;
 		self:set(true, true);
 		self:setreadtimeout(false);
-		self:setwritetimeout(cfg.ssl_handshake_timeout);
+		self:setwritetimeout(self._connected and cfg.ssl_handshake_timeout or cfg.connect_timeout);
 		self:debug("Prepared to start TLS");
 	end
 end