Merge branch '2.3' into 2.4

2019-07-04 09:39:52 +03:00
parent 73803fff70 be8f4fe055
commit 8960d2df8f
6 changed files with 29 additions and 12 deletions
--- a/server/core/config.cc
+++ b/server/core/config.cc
@ -2945,6 +2945,7 @@ void config_set_global_defaults()
    gateway.promoted_at = 0;
    gateway.load_persisted_configs = true;
    gateway.max_auth_errors_until_block = DEFAULT_MAX_AUTH_ERRORS_UNTIL_BLOCK;
+    gateway.users_refresh_time = USERS_REFRESH_TIME_DEFAULT;

    gateway.peer_hosts[0] = '\0';
    gateway.peer_user[0] = '\0';