Software / code / prosody
Changeset
5201:99cb5170a2ea
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 23 Nov 2012 17:17:02 +0100 |
| parents | 5199:e6fedce399eb (current diff) 5200:cfc038f1f923 (diff) |
| children | 5203:a971bee1a5f5 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server.lua Fri Nov 23 01:51:53 2012 +0100 +++ b/net/server.lua Fri Nov 23 17:17:02 2012 +0100 @@ -43,7 +43,7 @@ if prosody then local config_get = require "core.configmanager".get; local function load_config() - local settings = config_get("*", "core", "network_settings"); + local settings = config_get("*", "core", "network_settings") or {}; if use_luaevent then local event_settings = { ACCEPT_DELAY = settings.event_accept_retry_interval;
