diff options
| author | Matthew Wild <mwild1@gmail.com> | 2022-04-03 12:57:11 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2022-04-03 12:57:11 +0100 |
| commit | 7fd595605088ef23fdc7a403c6117e7ff48282f9 (patch) | |
| tree | 32ac0b6588d54cbd1a9624187a820a4b2b85825d | |
| parent | 72d5a83e42444a596ab3df13114c0049fecf9d85 (diff) | |
| parent | 0f493bd245b85da4272d360c85d193321d7e2e3f (diff) | |
| download | prosody-7fd595605088ef23fdc7a403c6117e7ff48282f9.tar.gz prosody-7fd595605088ef23fdc7a403c6117e7ff48282f9.zip | |
Merge 0.12->trunk
| -rw-r--r-- | core/configmanager.lua | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 4cd7c9d6..092b3946 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -160,6 +160,11 @@ do 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 |