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 | 7d8a4f67a2ce94a4ea70ddfbceddbb19ad0c5500 (patch) | |
| tree | 493c1f07d1691e50b7e113a42783bd3baed96acb | |
| parent | 6896ddaea37097cf8252f94750f3a57c29ded584 (diff) | |
| parent | d5176c487ce843f40d85a2d90b300c34c6bca1ef (diff) | |
| download | prosody-7d8a4f67a2ce94a4ea70ddfbceddbb19ad0c5500.tar.gz prosody-7d8a4f67a2ce94a4ea70ddfbceddbb19ad0c5500.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; |