# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1743606929 -7200
# Node ID 363f1e3c900593d1e86eab2ee54dd21a57fb2f43
# Parent  d005ee01cafd8cfd9c8b1c19228635fb752b6d59# Parent  2cfb6625b6d2d54a0924b9a0ec1fc7eb0e781dcd
Merge 13.0->trunk

diff -r d005ee01cafd -r 363f1e3c9005 net/server_epoll.lua
--- a/net/server_epoll.lua	Wed Apr 02 16:14:24 2025 +0100
+++ b/net/server_epoll.lua	Wed Apr 02 17:15:29 2025 +0200
@@ -772,7 +772,7 @@
 		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