summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ejabberd_options.erl2
-rw-r--r--src/ejabberd_options_doc.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_options.erl b/src/ejabberd_options.erl
index bbf21853..49fc6612 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 5cc0cc72..16771596 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 =>