# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1353613332 -3600
# Node ID 9ab06d0dbf6853650c99d97cd6da7f6352992bf2
# Parent  7f6cc8ed22477f641f6d6cdbe12e777d45602b99# Parent  76c73bd3d48381fdce6abb6a9cb0c39f5c11fff9
Merge 0.9->trunk

diff -r 7f6cc8ed2247 -r 9ab06d0dbf68 plugins/mod_http.lua
--- a/plugins/mod_http.lua	Thu Nov 22 19:38:42 2012 +0000
+++ b/plugins/mod_http.lua	Thu Nov 22 20:42:12 2012 +0100
@@ -55,7 +55,7 @@
 		for port, services in pairs(ports) do
 			local url = {
 				scheme = (external_url.scheme or services[1].service.name);
-				host = (external_url.host or module.host);
+				host = (external_url.host or module:get_option_string("http_host", module.host));
 				port = tonumber(external_url.port) or port or 80;
 				path = normalize_path(external_url.path or "/")..
 					(get_base_path(module, app_name, default_path or "/"..app_name):sub(2));