diff options
| author | Kim Alvefur <zash@zash.se> | 2025-04-02 17:15:29 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2025-04-02 17:15:29 +0200 |
| commit | 99a70ea86eaadb90128b5ded4e6e8a7603beb34f (patch) | |
| tree | 8d34c47a515993163b791e62bef187c51a0dcad6 | |
| parent | 521b13beb531a8cfcf85b6000e210847a9459f17 (diff) | |
| parent | c701571b95706403c7c714d48d2966206265499e (diff) | |
| download | prosody-99a70ea86eaadb90128b5ded4e6e8a7603beb34f.tar.gz prosody-99a70ea86eaadb90128b5ded4e6e8a7603beb34f.zip | |
Merge 13.0->trunk
| -rw-r--r-- | net/server_epoll.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_epoll.lua b/net/server_epoll.lua index 44ab4f69..ca5a950c 100644 --- 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 |