From 13d4787ea9f2ecfc2f8b1be4b8d7559f6099b0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Wei=C3=9F?= <holger@zedat.fu-berlin.de>
Date: Tue, 18 Oct 2022 16:08:16 +0200
Subject: [PATCH] Bump default 's2s_timeout' value (#3653)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Wait for an hour before closing an idle s2s connection.

It's not uncommon for a connection to be idle for longer than ten
minutes but less than an hour.  For example, XEP-0410 suggests a ping
interval of fifteen minutes.  A longer idle timeout avoids the latency
and log entries associated with constantly re-establishing such
connections.

Co-authored-by: Paweł Chmielowski <pawel@process-one.net>
---
 src/ejabberd_options.erl     | 2 +-
 src/ejabberd_options_doc.erl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ejabberd_options.erl b/src/ejabberd_options.erl
index bbf218532..49fc66124 100644
--- a/src/ejabberd_options.erl
+++ b/src/ejabberd_options.erl
@@ -644,7 +644,7 @@ options() ->
      {s2s_protocol_options, undefined},
      {s2s_queue_type,
       fun(Host) -> ejabberd_config:get_option({queue_type, Host}) end},
-     {s2s_timeout, timer:minutes(10)},
+     {s2s_timeout, timer:hours(1)},
      {s2s_tls_compression, undefined},
      {s2s_use_starttls, false},
      {s2s_zlib, false},
diff --git a/src/ejabberd_options_doc.erl b/src/ejabberd_options_doc.erl
index 5cc0cc721..167715964 100644
--- a/src/ejabberd_options_doc.erl
+++ b/src/ejabberd_options_doc.erl
@@ -1172,7 +1172,7 @@ doc() ->
       #{value => "timeout()",
         desc =>
             ?T("A time to wait before closing an idle s2s connection. "
-               "The default value is '10 minutes'.")}},
+               "The default value is '1' hour.")}},
      {s2s_use_starttls,
       #{value => "true | false | optional | required",
         desc =>