X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_http.lua;h=018f2ea31f3d39c159650e64a65165c34971b76e;hb=1137daf303ac8d7316f212c1b551d2ac4c0a8cf7;hp=634fb1884e3527c3bd112992046666a69ef7b5ae;hpb=819b0e7193f84d36f0d689efdc19fef2415f386b;p=prosody.git

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 634fb188..018f2ea3 100644
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -11,6 +11,7 @@ module:depends("http_errors");
 
 local moduleapi = require "core.moduleapi";
 local url_parse = require "socket.url".parse;
+local url_build = require "socket.url".build;
 
 local server = require "net.http.server";
 
@@ -30,6 +31,9 @@ local function get_http_event(host, app_path, key)
 	if method:sub(1,1) == "/" then
 		return nil;
 	end
+	if app_path == "/" and path:sub(1,1) == "/" then
+		app_path = "";
+	end
 	return method:upper().." "..host..app_path..path;
 end
 
@@ -39,26 +43,31 @@ local function get_base_path(host_module, app_name, default_app_path)
 		or default_app_path); -- Default
 end
 
+local ports_by_scheme = { http = 80, https = 443, };
+
 -- Helper to deduce a module's external URL
 function moduleapi.http_url(module, app_name, default_path)
 	app_name = app_name or (module.name:gsub("^http_", ""));
-	local ext = url_parse(module:get_option_string("http_external_url")) or {};
+	local external_url = url_parse(module:get_option_string("http_external_url")) or {};
 	local services = portmanager.get_active_services();
-	local http_services = services:get("https") or services:get("http");
+	local http_services = services:get("https") or services:get("http") or {};
 	for interface, ports in pairs(http_services) do
 		for port, services in pairs(ports) do
-			local path = get_base_path(module, app_name, default_path or "/"..app_name);
-			port = tonumber(ext.port) or port or 80;
-			if port == 80 then port = ""; else port = ":"..port; end
-			return (ext.scheme or services[1].service.name).."://"
-				..(ext.host or module.host)..port
-				..normalize_path(ext.path or "/")..(path:sub(2));
+			local url = {
+				scheme = (external_url.scheme or services[1].service.name);
+				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));
+			}
+			if ports_by_scheme[url.scheme] == url.port then url.port = nil end
+			return url_build(url);
 		end
 	end
 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)
@@ -79,10 +88,10 @@ function module.add_host(module)
 					local data = handler;
 					handler = function () return data; end
 				elseif event_name:sub(-2, -1) == "/*" then
-					local base_path = event_name:match("/(.+)/*$");
+					local base_path_len = #event_name:match("/.+$");
 					local _handler = handler;
 					handler = function (event)
-						local path = event.request.path:sub(#base_path+1);
+						local path = event.request.path:sub(base_path_len);
 						return _handler(event, path);
 					end;
 				end
@@ -114,7 +123,7 @@ function module.add_host(module)
 	end
 end
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "http";
 	listener = server.listener;
 	default_port = 5280;
@@ -123,7 +132,7 @@ module:add_item("net-provider", {
 	};
 });
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "https";
 	listener = server.listener;
 	default_port = 5281;