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

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2023-03-05 15:45:44 +01:00
commit 11a3373e89
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/mod_http.lua
View file

@ -261,7 +261,9 @@ function module.add_host(module)
apps[event.item.name] = nil; apps[event.item.name] = nil;
for event_name, handlers in pairs(app_handlers) do for event_name, handlers in pairs(app_handlers) do
module:unhook_object_event(server, event_name, handlers.main); module:unhook_object_event(server, event_name, handlers.main);
module:unhook_object_event(server, event_name, handlers.cors); if handlers.cors then
module:unhook_object_event(server, event_name, handlers.cors);
end
if event_name:sub(-2, -1) == "/*" then if event_name:sub(-2, -1) == "/*" then
module:unhook_object_event(server, event_name:sub(1, -3), redir_handler, -1); module:unhook_object_event(server, event_name:sub(1, -3), redir_handler, -1);
@ -269,8 +271,10 @@ function module.add_host(module)
module:unhook_object_event(server, event_name:sub(1, -2), redir_handler, -1); module:unhook_object_event(server, event_name:sub(1, -2), redir_handler, -1);
end end
local options_event_name = event_name:gsub("^%S+", "OPTIONS"); if handlers.options then
module:unhook_object_event(server, options_event_name, handlers.options); local options_event_name = event_name:gsub("^%S+", "OPTIONS");
module:unhook_object_event(server, options_event_name, handlers.options);
end
end end
end end