Mercurial Mercurial > prosody > prosody / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core/certmanager.lua
changeset 6087 821756a862b0
parent 6080 b7d1607df87d
child 6089 d774cb85664b 
--- a/core/certmanager.lua	Sat Apr 19 21:59:53 2014 +0200
+++ b/core/certmanager.lua	Sun Apr 20 21:25:26 2014 +0200
@@ -111,7 +111,9 @@
 	for option in pairs(set_options) do
 		local merged = {};
 		merge_set(core_defaults[option], merged);
-		merge_set(global_ssl_config[option], merged);
+		if global_ssl_config then
+			merge_set(global_ssl_config[option], merged);
+		end
 		merge_set(user_ssl_config[option], merged);
 		local final_array = {};
 		for opt, enable in pairs(merged) do
prosody