prosody
99cb5170a2ea
net/server.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/server.lua @ 5201:99cb5170a2ea

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 23 Nov 2012 17:17:02 +0100
parent 5200:cfc038f1f923
child 5284:5d2282a29387
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;