Mercurial > prosody-hg

comparison core/certmanager.lua @ 6087:821756a862b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
certmanager: Fix traceback if no global 'ssl' section set (thanks albert)
author Kim Alvefur <zash@zash.se>
date Sun, 20 Apr 2014 21:25:26 +0200
parents b7d1607df87d
children d774cb85664b
comparison
equal deleted inserted replaced
6086:3b4fde51fa25 6087:821756a862b0
109 end 109 end
110 110
111 for option in pairs(set_options) do 111 for option in pairs(set_options) do
112 local merged = {}; 112 local merged = {};
113 merge_set(core_defaults[option], merged); 113 merge_set(core_defaults[option], merged);
114 merge_set(global_ssl_config[option], merged); 114 if global_ssl_config then
115 merge_set(global_ssl_config[option], merged);
116 end
115 merge_set(user_ssl_config[option], merged); 117 merge_set(user_ssl_config[option], merged);
116 local final_array = {}; 118 local final_array = {};
117 for opt, enable in pairs(merged) do 119 for opt, enable in pairs(merged) do
118 if enable then 120 if enable then
119 final_array[#final_array+1] = opt; 121 final_array[#final_array+1] = opt;