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

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2023-06-10 13:06:05 +02:00
commit 0d6c625f93
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_http.lua
View file

@ -155,7 +155,7 @@ function module.add_host(module)
local app_credentials = opt_credentials;
local app_origins;
if opt_origins and not (opt_origins:empty() or opt_origins:contains("*")) then
opt_origins = opt_origins._items;
app_origins = opt_origins._items;
end
local function cors_handler(event_data)

2
util/array.lua
View file

@ -36,6 +36,8 @@ local function new_array(self, t, _s, _var)
return setmetatable(t or {}, array_mt);
end
array.new = new_array;
function array_mt.__add(a1, a2)
local res = new_array();
return res:append(a1):append(a2);