X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_http.lua;h=c379a5628ae281439bffb60a23707441ac48846d;hb=23407c138e72289a00f9db340bbbaf5068fb4135;hp=6da4db2438017a9b28e19d5eff98f8d03217f27b;hpb=3b635da220bdbe28712f7007be430eb6e1283912;p=prosody.git

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 6da4db24..c379a562 100644
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -8,9 +8,10 @@
 
 module:set_global();
 
-local parse_url = require "socket.url".parse;
 local server = require "net.http.server";
 
+server.set_default_host(module:get_option_string("http_default_host"));
+
 local function normalize_path(path)
 	if path:sub(1,1) ~= "/" then path = "/"..path; end
 	if path:sub(-1,-1) == "/" then path = path:sub(1, -2); end
@@ -19,16 +20,21 @@ end
 
 local function get_http_event(host, app_path, key)
 	local method, path = key:match("^(%S+)%s+(.+)$");
-	if not method then
-		if key:sub(1,1) ~= "/" then
-			return nil;
-		end
-		method, path = "GET", key;
+	if not method then -- No path specified, default to "" (base path)
+		method, path = key, "";
+	end
+	if method:sub(1,1) == "/" then
+		return nil;
 	end
-	path = normalize_path(path);
 	return method:upper().." "..host..app_path..path;
 end
 
+local function get_base_path(host_module, app_name, default_app_path)
+	return host_module:get_option("http_paths", {})[app_name] -- Host
+		or module:get_option("http_paths", {})[app_name] -- Global
+		or default_app_path; -- Default
+end
+
 function module.add_host(module)
 	local host = module.host;
 	local apps = {};
@@ -36,7 +42,7 @@ function module.add_host(module)
 	local function http_app_added(event)
 		local app_name = event.item.name;
 		local default_app_path = event.item.default_path or "/"..app_name;
-		local app_path = normalize_path(module:get_option_string(app_name.."_http_path", default_app_path));
+		local app_path = normalize_path(get_base_path(module, app_name, default_app_path));
 		if not app_name then		
 			-- TODO: Link to docs
 			module:log("error", "HTTP app has no 'name', add one or use module:provides('http', app)");
@@ -47,7 +53,10 @@ function module.add_host(module)
 		for key, handler in pairs(event.item.route or {}) do
 			local event_name = get_http_event(host, app_path, key);
 			if event_name then
-				if event_name:sub(-2, -1) == "/*" then
+				if type(handler) ~= "function" then
+					local data = handler;
+					handler = function () return data; end
+				elseif event_name:sub(-2, -1) == "/*" then
 					local base_path = event_name:match("/(.+)/*$");
 					local _handler = handler;
 					handler = function (event)
@@ -57,12 +66,12 @@ function module.add_host(module)
 				end
 				if not app_handlers[event_name] then
 					app_handlers[event_name] = handler;
-					server.add_handler(event_name, handler);
+					module:hook_object_event(server, event_name, handler);
 				else
 					module:log("warn", "App %s added handler twice for '%s', ignoring", app_name, event_name);
 				end
 			else
-				module:log("error", "Invalid route in %s: %q", app_name, key);
+				module:log("error", "Invalid route in %s, %q. See http://prosody.im/doc/developers/http#routes", app_name, key);
 			end
 		end
 	end
@@ -71,11 +80,16 @@ function module.add_host(module)
 		local app_handlers = apps[event.item.name];
 		apps[event.item.name] = nil;
 		for event, handler in pairs(app_handlers) do
-			server.remove_handler(event, handler);
+			module:unhook_object_event(server, event, handler);
 		end
 	end
 	
 	module:handle_items("http-provider", http_app_added, http_app_removed);
+
+	server.add_host(host);
+	function module.unload()
+		server.remove_host(host);
+	end
 end
 
 module:add_item("net-provider", {