Merge 0.9->trunk

1 files changed, 16 insertions, 0 deletions

diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index 30360f73..9baf4fba 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -270,6 +270,22 @@ function api:get_option_set(name, ...)
 	return set.new(value);
 end
 
+function api:get_option_inherited_set(name, ...)
+	local value = self:get_option_set(name, ...);
+	local global_value = self:context("*"):get_option_set(name, ...);
+	if not value then
+		return global_value;
+	elseif not global_value then
+		return value;
+	end
+	value:include(global_value);
+	return value;
+end
+
+function api:context(host)
+	return setmetatable({host=host or "*"}, {__index=self,__newindex=self});
+end
+
 function api:add_item(key, value)
 	self.items = self.items or {};
 	self.items[key] = self.items[key] or {};