diff options
author | Kim Alvefur <zash@zash.se> | 2018-11-09 15:59:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-11-09 15:59:32 +0100 |
commit | 8226d6de4cf4c690167847de3f56f0b30de1294f (patch) | |
tree | 695fe64c232d7d4348c96f309b263c45eaf9e85f /net/http.lua | |
parent | f014ba0feb218c5131e68cd14cafb1feb3e8d7ad (diff) | |
download | prosody-8226d6de4cf4c690167847de3f56f0b30de1294f.tar.gz prosody-8226d6de4cf4c690167847de3f56f0b30de1294f.zip |
net.http: Manually merge settings (fixes #1231)
Metatable table indexing is done raw, so metatables can't be chained
Diffstat (limited to 'net/http.lua')
-rw-r--r-- | net/http.lua | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/http.lua b/net/http.lua index b401b040..fe5250ac 100644 --- a/net/http.lua +++ b/net/http.lua @@ -24,7 +24,6 @@ local tonumber, tostring, traceback = tonumber, tostring, debug.traceback; local xpcall = require "util.xpcall".xpcall; local error = error -local setmetatable = setmetatable; local log = require "util.logger".init("http"); @@ -273,7 +272,12 @@ local function new(options) options = options; request = request; new = options and function (new_options) - return new(setmetatable(new_options, { __index = options })); + local final_options = {}; + for k, v in pairs(options) do final_options[k] = v; end + if new_options then + for k, v in pairs(new_options) do final_options[k] = v; end + end + return new(final_options); end or new; events = events.new(); }; |