mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert 2dc7490899ae::5d6b252bc36f: Unfinished and broken

Browse source
This commit is contained in:
Kim Alvefur 2018-09-21 22:14:40 +02:00
parent 83cd0e7ba7
commit a31b6728d4
2 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/http/server.lua
View file

@ -219,7 +219,7 @@ function handle_request(conn, request, finish_cb)
err_code, err = 400, "Invalid path";
elseif not hosts[host] then
if hosts[default_host] then
request.host = default_host;
host = default_host;
elseif host then
err_code, err = 404, "Unknown host: "..host;
else
@ -233,7 +233,7 @@ function handle_request(conn, request, finish_cb)
return;
end
local event = request.method.." "..request.path:match("[^?]*");
local event = request.method.." "..host..request.path:match("[^?]*");
local payload = { request = request, response = response };
log("debug", "Firing event: %s", event);
local result = events.fire_event(event, payload);

14
plugins/mod_http.lua
View file

@ -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", {