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

net.http.server: Move handling of hosts to mod_http

Browse source 
Now an event like `GET /path` is fired at first, and mod\_http
dispatches the old `GET host/path` events.
This commit is contained in:
Kim Alvefur 2018-09-21 21:19:41 +02:00
parent 2fcacff9a7
commit c6540b14f9
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/http/server.lua
View file

@ -233,7 +233,7 @@ function handle_request(conn, request, finish_cb)
return; return;
end end
local event = request.method.." "..host..request.path:match("[^?]*"); local event = request.method.." "..request.path:match("[^?]*");
local payload = { request = request, response = response }; local payload = { request = request, response = response };
log("debug", "Firing event: %s", event); log("debug", "Firing event: %s", event);
local result = events.fire_event(event, payload); local result = events.fire_event(event, payload);

8
plugins/mod_http.lua
View file

@ -172,7 +172,13 @@ module:wrap_object_event(server._events, false, function (handlers, event_name,
-- Not included in eg http-error events -- Not included in eg http-error events
request.ip = get_ip_from_request(request); request.ip = get_ip_from_request(request);
end end
return handlers(event_name, event_data); 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);
end); end);
module:provides("net", { module:provides("net", {