diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-22 14:49:05 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-22 14:49:05 +0100 |
| commit | 9cfa6a9d4994b61842b2478df4470922fb3a2546 (patch) | |
| tree | 3f7098f07d3ae232ef8a765d0bedcc4d1cda8df2 /net/server.lua | |
| parent | 19b9ea3838a29c06f1bbb6ddec5645187e675dac (diff) | |
| parent | 48feb105c43a32c3e956ade72946551efed82b93 (diff) | |
| download | prosody-9cfa6a9d4994b61842b2478df4470922fb3a2546.tar.gz prosody-9cfa6a9d4994b61842b2478df4470922fb3a2546.zip | |
Merge 0.9->0.10
Diffstat (limited to 'net/server.lua')
| -rw-r--r-- | net/server.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server.lua b/net/server.lua index 2a0b89ae..41e180fa 100644 --- a/net/server.lua +++ b/net/server.lua @@ -50,7 +50,7 @@ if prosody then local settings = config_get("*", "network_settings") or {}; if use_luaevent then local event_settings = { - ACCEPT_DELAY = settings.event_accept_retry_interval; + ACCEPT_DELAY = settings.accept_retry_interval; ACCEPT_QUEUE = settings.tcp_backlog; CLEAR_DELAY = settings.event_clear_interval; CONNECT_TIMEOUT = settings.connect_timeout; |