diff options
| author | Kim Alvefur <zash@zash.se> | 2012-11-23 17:17:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2012-11-23 17:17:02 +0100 |
| commit | 7f7456af86f1a03716b80007f8ad55a4542783d9 (patch) | |
| tree | 493c1f07d1691e50b7e113a42783bd3baed96acb | |
| parent | 42c35b589bb632bddbf14d7a8569b71be8d461f5 (diff) | |
| parent | 22e8b30fef19893b4e521a9346b2b614486733f4 (diff) | |
| download | prosody-7f7456af86f1a03716b80007f8ad55a4542783d9.tar.gz prosody-7f7456af86f1a03716b80007f8ad55a4542783d9.zip | |
Merge 0.9->trunk
| -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 23c6f956..d80b8a18 100644 --- a/net/server.lua +++ b/net/server.lua @@ -43,7 +43,7 @@ end 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; |