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 | 6116ba8cfbeff29bd3c4cedd1b05babec47e1507 (patch) | |
| tree | 3f7098f07d3ae232ef8a765d0bedcc4d1cda8df2 /net/server.lua | |
| parent | f9bec76a46fe06d38d82f11489a191574302bc21 (diff) | |
| parent | 2ed7876beae4800d8ba88a61607612350bfeca73 (diff) | |
| download | prosody-6116ba8cfbeff29bd3c4cedd1b05babec47e1507.tar.gz prosody-6116ba8cfbeff29bd3c4cedd1b05babec47e1507.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; |