aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-11-22 01:44:28 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-11-22 01:44:28 +0500
commit0c22db44a1d07c7e7d5683ab65f03e6883631521 (patch)
tree4419a42d4342b3f8b5f0f5cd1c9455bdcd6e6aec
parent2311895df93e3b5ad63fa75fd66c17056bd2bca4 (diff)
downloadprosody-0c22db44a1d07c7e7d5683ab65f03e6883631521.tar.gz
prosody-0c22db44a1d07c7e7d5683ab65f03e6883631521.zip
util.xmppstream: A little cleanup.
-rw-r--r--util/xmppstream.lua10
1 files changed, 2 insertions, 8 deletions
diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index e5271b72..018f238d 100644
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -11,26 +11,23 @@ local lxp = require "lxp";
local st = require "util.stanza";
local stanza_mt = st.stanza_mt;
+local error = error;
local tostring = tostring;
local t_insert = table.insert;
local t_concat = table.concat;
local t_remove = table.remove;
local setmetatable = setmetatable;
-local default_log = require "util.logger".init("xmppstream");
-
-- COMPAT: w/LuaExpat 1.1.0
local lxp_supports_doctype = pcall(lxp.new, { StartDoctypeDecl = false });
-
if not lxp_supports_doctype then
+ local default_log = require "util.logger".init("xmppstream");
default_log("warn", "The version of LuaExpat on your system leaves Prosody "
.."vulnerable to denial-of-service attacks. You should upgrade to "
.."LuaExpat 1.1.1 or higher as soon as possible. See "
.."http://prosody.im/doc/depends#luaexpat for more information.");
end
-local error = error;
-
module "xmppstream"
local new_parser = lxp.new;
@@ -50,8 +47,6 @@ _M.ns_pattern = ns_pattern;
function new_sax_handlers(session, stream_callbacks)
local xml_handlers = {};
- local log = session.log or default_log;
-
local cb_streamopened = stream_callbacks.streamopened;
local cb_streamclosed = stream_callbacks.streamclosed;
local cb_error = stream_callbacks.error or function(session, e) error("XML stream error: "..tostring(e)); end;
@@ -188,7 +183,6 @@ function new_sax_handlers(session, stream_callbacks)
local function set_session(stream, new_session)
session = new_session;
- log = new_session.log or default_log;
end
return xml_handlers, { reset = reset, set_session = set_session };