prosody
451cb119026e

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

13141:451cb119026e

Merge 0.12->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 10 Jun 2023 13:06:05 +0200
parents 13140:7a6874f9fd40 (current diff) 13139:5d5869f14c4d (diff)
children 13142:879a6a33c21b
files plugins/mod_http.lua util/array.lua
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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);