diff plugins/mod_http.lua @ 5182:9b93b0698d7e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 15 Nov 2012 14:07:53 -0500
parents 4ef69555a879
children 8461e8ed7c09
line wrap: on
line diff
--- a/plugins/mod_http.lua	Sun Nov 11 23:48:38 2012 +0100
+++ b/plugins/mod_http.lua	Thu Nov 15 14:07:53 2012 -0500
@@ -67,7 +67,7 @@
 end
 
 function module.add_host(module)
-	local host = module.host;
+	local host = module:get_option_string("http_host", module.host);
 	local apps = {};
 	module.environment.apps = apps;
 	local function http_app_added(event)