prosody
363f1e3c9005

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

13810:363f1e3c9005

Merge 13.0->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 02 Apr 2025 17:15:29 +0200
parents 13808:d005ee01cafd (current diff) 13809:2cfb6625b6d2 (diff)
children 13812:04232123ba66
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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