Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Fri, 23 Nov 2012 17:17:02 +0100
changeset 5201 99cb5170a2ea
parent 5199 e6fedce399eb (current diff)
parent 5200 cfc038f1f923 (diff)
child 5203 a971bee1a5f5
Merge 0.9->trunk
--- 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;
prosody