Software / code / prosody
Changeset
12449:6ec3fbae05c9
Merge 0.12->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 03 Apr 2022 12:57:11 +0100 |
| parents | 12447:07d25714c40c (current diff) 12448:fb7e76c1ad1c (diff) |
| children | 12451:76887863a6ae |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/core/configmanager.lua Sat Apr 02 16:39:29 2022 +0200 +++ b/core/configmanager.lua Sun Apr 03 12:57:11 2022 +0100 @@ -160,6 +160,11 @@ set(config_table, name or "*", "defined", true); return function (config_options) 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 set(config_table, name or "*", option_name, option_value); end
