Software / code / prosody
Diff
net/server.lua @ 7098:5286e79c6829
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 22 Jan 2016 14:49:05 +0100 |
| parent | 5776:bd0ff8ae98a8 |
| parent | 7095:3e1dac35af87 |
| child | 7099:8e64e7b82928 |
line wrap: on
line diff
--- a/net/server.lua Fri Jan 22 13:20:00 2016 +0000 +++ b/net/server.lua Fri Jan 22 14:49:05 2016 +0100 @@ -50,7 +50,7 @@ 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;
