# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1648987031 -3600
# Node ID 6ec3fbae05c9d05c35eba8be53bc28ea97f698c5
# Parent  07d25714c40c63b40187ad2e7b98e92b6ead9b9c# Parent  fb7e76c1ad1c86be358ba5ceef88de1d8ed0c5c4
Merge 0.12->trunk

diff -r 07d25714c40c -r 6ec3fbae05c9 core/configmanager.lua
--- 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