# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1686395165 -7200
# Node ID 451cb119026e156ffb47800982862135ef65a896
# Parent  7a6874f9fd4050756558a7c53ec170b38ff0fec6# Parent  5d5869f14c4de5231be0264098a6232ab44957d2
Merge 0.12->trunk

diff -r 7a6874f9fd40 -r 451cb119026e plugins/mod_http.lua
--- a/plugins/mod_http.lua	Sat Jun 10 12:18:09 2023 +0200
+++ b/plugins/mod_http.lua	Sat Jun 10 13:06:05 2023 +0200
@@ -155,7 +155,7 @@
 		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)
diff -r 7a6874f9fd40 -r 451cb119026e util/array.lua
--- a/util/array.lua	Sat Jun 10 12:18:09 2023 +0200
+++ b/util/array.lua	Sat Jun 10 13:06:05 2023 +0200
@@ -36,6 +36,8 @@
 	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);