From a31b6728d47b09b101f751db192cc9e781f34b66 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 21 Sep 2018 22:14:40 +0200 Subject: Revert 2dc7490899ae::5d6b252bc36f: Unfinished and broken --- plugins/mod_http.lua | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'plugins/mod_http.lua') diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index 1f1b8a87..28d5d2d4 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -38,11 +38,7 @@ local function get_http_event(host, app_path, key) if app_path == "/" and path:sub(1,1) == "/" then app_path = ""; end - if host == "*" then - return method:upper().." "..app_path..path; - else - return method:upper().." "..host..app_path..path; - end + return method:upper().." "..host..app_path..path; end local function get_base_path(host_module, app_name, default_app_path) @@ -176,13 +172,7 @@ module:wrap_object_event(server._events, false, function (handlers, event_name, -- Not included in eg http-error events request.ip = get_ip_from_request(request); end - local ret = handlers(event_name, event_data); - if ret ~= nil then - return ret; - end - local host = (request.headers.host or ""):match("[^:]+"); - local host_event = request.method.." "..host..request.path:match("[^?]*"); - return handlers(host_event, event_data); + return handlers(event_name, event_data); end); module:provides("net", { -- cgit v1.2.3