aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-11-22 02:13:42 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-11-22 02:13:42 +0500
commit56975d6c639e95c6cb489768ebb065425a6bee7b (patch)
tree7ab6086b158298816e22968aa27e323986e69325 /util
parent0c22db44a1d07c7e7d5683ab65f03e6883631521 (diff)
downloadprosody-56975d6c639e95c6cb489768ebb065425a6bee7b.tar.gz
prosody-56975d6c639e95c6cb489768ebb065425a6bee7b.zip
util.dependencies, util.xmppstream: Move LuaExpat version checking to util.dependencies.
Diffstat (limited to 'util')
-rw-r--r--util/dependencies.lua8
-rw-r--r--util/xmppstream.lua7
2 files changed, 8 insertions, 7 deletions
diff --git a/util/dependencies.lua b/util/dependencies.lua
index 5baea942..53d2719d 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -136,6 +136,14 @@ function log_warnings()
log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends");
end
end
+ if lxp then
+ if not pcall(lxp.new, { StartDoctypeDecl = false }) then
+ log("error", "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
+ end
end
return _M;
diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index 018f238d..0f80742d 100644
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -20,13 +20,6 @@ local setmetatable = setmetatable;
-- 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
module "xmppstream"