Merge branch 'master' into xftp

This commit is contained in:
Evgeny Poberezkin committed 2023-02-18 18:46:28 +00:00
commit fcef7deec0
4 files changed
+13 -6

No files matched your search

+4 -4
View File
@@ -123,13 +123,13 @@ defaultMessageRetryInterval =
maxInterval = 60_000000
},
riSlow =
-- TODO: these timeouts can be increased in v4.6 once most clients are updated
-- TODO: these timeouts can be increased in v5.0 once most clients are updated
-- to resume sending on QCONT messages.
-- After that local message expiration period should be also increased.
RetryInterval
{ initialInterval = 30_000000,
increaseAfter = 30_000000,
maxInterval = 600_000000
{ initialInterval = 60_000000,
increaseAfter = 60_000000,
maxInterval = 1200_000000 -- 20min
}
}