mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

configmanager: Clearer errors when providing unexpected values after VirtualHost (fixes #1735, thanks arawaks)

Browse source
This commit is contained in:
Matthew Wild 2022-04-03 12:56:11 +01:00
parent 1e2d4026f9
commit 0f493bd245
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/configmanager.lua
View file

@ -160,6 +160,11 @@ do
set(config_table, name or "*", "defined", true); set(config_table, name or "*", "defined", true);
return function (config_options) return function (config_options)
rawset(env, "__currenthost", "*"); -- Return to global scope rawset(env, "__currenthost", "*"); -- Return to global scope
if type(config_options) == "string" then
error(format("VirtualHost entries do not accept a module name (module '%s' provided for host '%s')", config_options, name), 2);
elseif type(config_options) ~= "table" then
error("Invalid syntax following VirtualHost, expected options but received a "..type(config_options), 2);
end
for option_name, option_value in pairs(config_options) do for option_name, option_value in pairs(config_options) do
set(config_table, name or "*", option_name, option_value); set(config_table, name or "*", option_name, option_value);
end end