From be4dab31a7e7848d4640871443da3e1d46107f31 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 8 Dec 2015 23:20:37 +0100 Subject: util.uuid: Remove unused import --- util/uuid.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/util/uuid.lua b/util/uuid.lua index 796c8ee4..bb70d000 100644 --- a/util/uuid.lua +++ b/util/uuid.lua @@ -7,7 +7,6 @@ -- -local m_random = math.random; local tostring = tostring; local os_time = os.time; local os_clock = os.clock; -- cgit v1.2.3 From 16f55dac025fd4e40eb8b19e3cc69d68354b8feb Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 11 Dec 2015 14:00:42 +0000 Subject: loggingmanager: Add prosody.log (intended to be used instead of _G.log now) --- core/loggingmanager.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index e21e3901..15d2ee3c 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -26,6 +26,7 @@ local logger = require "util.logger"; local prosody = prosody; _G.log = logger.init("general"); +prosody.log = logger.init("general"); local _ENV = nil; -- cgit v1.2.3 From 275bfb45fa0972832ffc760d512845d4b0f9be44 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 15 Dec 2015 13:15:30 +0100 Subject: mod_storage_sql: Fix use of SQLite3 in-memory database (no path expansion) --- plugins/mod_storage_sql.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index adf9f9b6..57d964e2 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -417,7 +417,9 @@ end local function normalize_params(params) if params.driver == "SQLite3" then - params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite"); + if params.database ~= ":memory:" then + params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite"); + end end assert(params.driver and params.database, "Configuration error: Both the SQL driver and the database need to be specified"); return params; -- cgit v1.2.3 From c2c82b591a34d539692cb6b36f0edafdfb4ef9dd Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Wed, 16 Dec 2015 02:22:16 +0000 Subject: util.dependencies: Use prosody.log() instead of global log() --- util/dependencies.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/dependencies.lua b/util/dependencies.lua index 5e3b03d8..9ab40765 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -137,25 +137,25 @@ end local function log_warnings() if _VERSION > "Lua 5.1" then - log("warn", "Support for %s is experimental, please report any issues", _VERSION); + prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION); end local ssl = softreq"ssl"; if ssl then local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)"); if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then - log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends"); + prosody.log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends"); end end local lxp = softreq"lxp"; if lxp then if not pcall(lxp.new, { StartDoctypeDecl = false }) then - log("error", "The version of LuaExpat on your system leaves Prosody " + prosody.log("error", "The version of LuaExpat on your system leaves Prosody " .."vulnerable to denial-of-service attacks. You should upgrade to " .."LuaExpat 1.3.0 or higher as soon as possible. See " .."http://prosody.im/doc/depends#luaexpat for more information."); end if not lxp.new({}).getcurrentbytecount then - log("error", "The version of LuaExpat on your system does not support " + prosody.log("error", "The version of LuaExpat on your system does not support " .."stanza size limits, which may leave servers on untrusted " .."networks (e.g. the internet) vulnerable to denial-of-service " .."attacks. You should upgrade to LuaExpat 1.3.0 or higher as " -- cgit v1.2.3 From 54e77b9859b2c0e94624d1eeb3c929693a0ce304 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Wed, 16 Dec 2015 16:41:48 +0000 Subject: MUC: Fix incorrect nesting of status codes when room config changes (fixes #579) --- plugins/muc/muc.lib.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index d42fb2eb..5879c256 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -736,7 +736,7 @@ function room_mt:process_form(origin, stanza) if dirty or whois_changed then local msg = st.message({type='groupchat', from=self.jid}) - :tag('x', {xmlns='http://jabber.org/protocol/muc#user'}):up() + :tag('x', {xmlns='http://jabber.org/protocol/muc#user'}); if dirty then msg.tags[1]:tag('status', {code = '104'}):up(); @@ -745,6 +745,7 @@ function room_mt:process_form(origin, stanza) local code = (whois == 'moderators') and "173" or "172"; msg.tags[1]:tag('status', {code = code}):up(); end + msg:up(); self:broadcast_message(msg, false) end -- cgit v1.2.3