From f0cd412842b1f7ba7ed7355ee0d82548d47877d0 Mon Sep 17 00:00:00 2001
From: Florian Zeitz <florob@babelmonkeys.de>
Date: Sat, 22 Oct 2011 17:51:53 +0200
Subject: util.ip: New module containing IP related functions

---
 util/ip.lua | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 util/ip.lua

(limited to 'util')

diff --git a/util/ip.lua b/util/ip.lua
new file mode 100644
index 00000000..5e2f46bb
--- /dev/null
+++ b/util/ip.lua
@@ -0,0 +1,176 @@
+-- Prosody IM
+-- Copyright (C) 2008-2011 Florian Zeitz
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+local ip_methods = {};
+local ip_mt = { __index = function (ip, key) return (ip_methods[key])(ip); end,
+		__tostring = function (ip) return ip.addr; end,
+		__eq = function (ipA, ipB) return ipA.addr == ipB.addr; end};
+local hex2bits = { ["0"] = "0000", ["1"] = "0001", ["2"] = "0010", ["3"] = "0011", ["4"] = "0100", ["5"] = "0101", ["6"] = "0110", ["7"] = "0111", ["8"] = "1000", ["9"] = "1001", ["A"] = "1010", ["B"] = "1011", ["C"] = "1100", ["D"] = "1101", ["E"] = "1110", ["F"] = "1111" };
+
+local function new_ip(ipStr, proto)
+	if proto ~= "IPv4" and proto ~= "IPv6" then
+		return nil, "invalid protocol";
+	end
+
+	return setmetatable({ addr = ipStr, proto = proto }, ip_mt);
+end
+
+local function toBits(ip)
+	local result = "";
+	local fields = {};
+	if ip.proto == "IPv4" then
+		ip = ip.toV4mapped;
+	end
+	ip = (ip.addr):upper();
+	ip:gsub("([^:]*):?", function (c) fields[#fields + 1] = c end);
+	if not ip:match(":$") then fields[#fields] = nil; end
+	for i, field in ipairs(fields) do
+		if field:len() == 0 and i ~= 1 and i ~= #fields then
+			for i = 1, 16 * (9 - #fields) do
+				result = result .. "0";
+			end
+		else
+			for i = 1, 4 - field:len() do
+				result = result .. "0000";
+			end
+			for i = 1, field:len() do
+				result = result .. hex2bits[field:sub(i,i)];
+			end
+		end
+	end
+	return result;
+end
+
+local function commonPrefixLength(ipA, ipB)
+	ipA, ipB = toBits(ipA), toBits(ipB);
+	for i = 1, 128 do
+		if ipA:sub(i,i) ~= ipB:sub(i,i) then
+			return i-1;
+		end
+	end
+	return 128;
+end
+
+local function v4scope(ip)
+	local fields = {};
+	ip:gsub("([^.]*).?", function (c) fields[#fields + 1] = tonumber(c) end);
+	-- Loopback:
+	if fields[1] == 127 then
+		return 0x2;
+	-- Link-local unicast:
+	elseif fields[1] == 169 and fields[2] == 254 then
+		return 0x2;
+	-- Site-local unicast:
+	elseif (fields[1] == 10) or (fields[1] == 192 and fields[2] == 168) or (fields[1] == 172 and fields[2] > 16) then
+		return 0x5;
+	-- Global unicast:
+	else
+		return 0xE;
+	end
+end
+
+local function v6scope(ip)
+	-- Loopback:
+	if ip:match("^[0:]*1$") then
+		return 0x2;
+	-- Link-local unicast:
+	elseif ip:match("^[Ff][Ee][89ABab]") then 
+		return 0x2;
+	-- Site-local unicast:
+	elseif ip:match("^[Ff][Ee][CcDdEeFf]") then
+		return 0x5;
+	-- Multicast:
+	elseif ip:match("^[Ff][Ff]") then
+		return tonumber("0x"..ip:sub(4,4));
+	-- Global unicast:
+	else
+		return 0xE;
+	end
+end
+
+local function label(ip)
+	if commonPrefixLength(ip, new_ip("::1", "IPv6")) == 128 then
+		return 0;
+	elseif commonPrefixLength(ip, new_ip("2002::", "IPv6")) >= 16 then
+		return 2;
+	elseif commonPrefixLength(ip, new_ip("::", "IPv6")) >= 96 then
+		return 3;
+	elseif commonPrefixLength(ip, new_ip("::ffff:0:0", "IPv6")) >= 96 then
+		return 4;
+	else
+		return 1;
+	end
+end
+
+local function precedence(ip)
+	if commonPrefixLength(ip, new_ip("::1", "IPv6")) == 128 then
+		return 50;
+	elseif commonPrefixLength(ip, new_ip("2002::", "IPv6")) >= 16 then
+		return 30;
+	elseif commonPrefixLength(ip, new_ip("::", "IPv6")) >= 96 then
+		return 20;
+	elseif commonPrefixLength(ip, new_ip("::ffff:0:0", "IPv6")) >= 96 then
+		return 10;
+	else
+		return 40;
+	end
+end
+
+local function toV4mapped(ip)
+	local fields = {};
+	local ret = "::ffff:";
+	ip:gsub("([^.]*).?", function (c) fields[#fields + 1] = tonumber(c) end);
+	ret = ret .. ("%02x"):format(fields[1]);
+	ret = ret .. ("%02x"):format(fields[2]);
+	ret = ret .. ":"
+	ret = ret .. ("%02x"):format(fields[3]);
+	ret = ret .. ("%02x"):format(fields[4]);
+	return new_ip(ret, "IPv6");
+end
+
+function ip_methods:toV4mapped()
+	if self.proto ~= "IPv4" then return nil, "No IPv4 address" end
+	local value = toV4mapped(self.addr);
+	self.toV4mapped = value;
+	return value;
+end
+
+function ip_methods:label()
+	local value;
+	if self.proto == "IPv4" then
+		value = label(self.toV4mapped);
+	else
+		value = label(self);
+	end
+	self.label = value;
+	return value;
+end
+
+function ip_methods:precedence()
+	local value;
+	if self.proto == "IPv4" then
+		value = precedence(self.toV4mapped);
+	else
+		value = precedence(self);
+	end
+	self.precedence = value;
+	return value;
+end
+
+function ip_methods:scope()
+	local value;
+	if self.proto == "IPv4" then
+		value = v4scope(self.addr);
+	else
+		value = v6scope(self.addr);
+	end
+	self.scope = value;
+	return value;
+end
+
+return {new_ip = new_ip,
+	commonPrefixLength = commonPrefixLength};
-- 
cgit v1.2.3


From 78ccb156e89bfce17932052ece3f580d9b2ca8f5 Mon Sep 17 00:00:00 2001
From: Florian Zeitz <florob@babelmonkeys.de>
Date: Sat, 22 Oct 2011 17:59:33 +0200
Subject: util.rfc3484: New util implementing RFC3484 sorting

---
 util/rfc3484.lua | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 util/rfc3484.lua

(limited to 'util')

diff --git a/util/rfc3484.lua b/util/rfc3484.lua
new file mode 100644
index 00000000..373d3c33
--- /dev/null
+++ b/util/rfc3484.lua
@@ -0,0 +1,124 @@
+-- Prosody IM
+-- Copyright (C) 2008-2011 Florian Zeitz
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+local t_sort = table.sort;
+local commonPrefixLength = require"util.ip".commonPrefixLength
+local new_ip = require"util.ip".new_ip;
+
+function source(dest, candidates)
+	local function comp(ipA, ipB)
+		-- Rule 1: Prefer same address
+		if dest == ipA then
+			return true;
+		elseif dest == ipB then
+			return false;
+		end
+
+		-- Rule 2: Prefer appropriate scope
+		if ipA.scope < ipB.scope then
+			if ipA.scope < dest.scope then
+				return false;
+			else
+				return true;
+			end
+		elseif ipA.scope > ipB.scope then
+			if ipB.scope < dest.scope then
+				return true;
+			else
+				return false;
+			end
+		end
+
+		-- Rule 3: Avoid deprecated addresses
+		-- XXX: No way to determine this
+		-- Rule 4: Prefer home addresses
+		-- XXX: Mobility Address related, no way to determine this
+		-- Rule 5: Prefer outgoing interface
+		-- XXX: Interface to address relation. No way to determine this
+		-- Rule 6: Prefer matching label
+		if ipA.label == dest.label and ipB.label ~= dest.label then
+			return true;
+		elseif ipB.label == dest.label and ipA.label ~= dest.label then
+			return false;
+		end
+
+		-- Rule 7: Prefer public addresses (over temporary ones)
+		-- XXX: No way to determine this
+		-- Rule 8: Use longest matching prefix
+		if commonPrefixLength(ipA, dest) > commonPrefixLength(ipB, dest) then
+			return true;
+		else
+			return false;
+		end
+	end
+
+	t_sort(candidates, comp);
+	return candidates[1];
+end
+
+function destination(candidates, sources)
+	local t_sort = table.sort;
+	local sourceAddrs = {};
+	local function comp(ipA, ipB)
+		local ipAsource = sourceAddrs[ipA];
+		local ipBsource = sourceAddrs[ipB];
+		-- Rule 1: Avoid unusable destinations
+		-- XXX: No such information
+		-- Rule 2: Prefer matching scope
+		if ipA.scope == ipAsource.scope and ipB.scope ~= ipBsource.scope then
+			return true;
+		elseif ipA.scope ~= ipAsource.scope and ipB.scope == ipBsource.scope then
+			return false;
+		end
+
+		-- Rule 3: Avoid deprecated addresses
+		-- XXX: No way to determine this
+		-- Rule 4: Prefer home addresses
+		-- XXX: Mobility Address related, no way to determine this
+		-- Rule 5: Prefer matching label
+		if ipAsource.label == ipA.label and ipBsource.label ~= ipB.label then
+			return true;
+		elseif ipBsource.label == ipB.label and ipAsource.label ~= ipA.label then
+			return false;
+		end
+
+		-- Rule 6: Prefer higher precedence
+		if ipA.precedence > ipB.precedence then
+			return true;
+		elseif ipA.precedence < ipB.precedence then
+			return false;
+		end
+
+		-- Rule 7: Prefer native transport
+		-- XXX: No way to determine this
+		-- Rule 8: Prefer smaller scope
+		if ipA.scope < ipB.scope then
+			return true;
+		elseif ipA.scope > ipB.scope then
+			return false;
+		end
+
+		-- Rule 9: Use longest matching prefix
+		if commonPrefixLength(ipA, ipAsource) > commonPrefixLength(ipB, ipBsource) then
+			return true;
+		elseif commonPrefixLength(ipA, ipAsource) < commonPrefixLength(ipB, ipBsource) then
+			return false;
+		end
+
+		-- Rule 10: Otherwise, leave order unchanged
+		return true;
+	end
+	for _, ip in ipairs(candidates) do
+		sourceAddrs[ip] = source(ip, sources);
+	end
+
+	t_sort(candidates, comp);
+	return candidates;
+end
+
+return {source = source,
+	destination = destination};
-- 
cgit v1.2.3


From 400449ed020462fe86f61d30b5ea7d79e76accca Mon Sep 17 00:00:00 2001
From: Florian Zeitz <florob@babelmonkeys.de>
Date: Sun, 6 Nov 2011 18:23:16 +0100
Subject: util.rfc3484: Use a stable sorting algorithm

---
 util/rfc3484.lua | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'util')

diff --git a/util/rfc3484.lua b/util/rfc3484.lua
index 373d3c33..dd855a84 100644
--- a/util/rfc3484.lua
+++ b/util/rfc3484.lua
@@ -5,10 +5,20 @@
 -- COPYING file in the source package for more information.
 --
 
-local t_sort = table.sort;
 local commonPrefixLength = require"util.ip".commonPrefixLength
 local new_ip = require"util.ip".new_ip;
 
+local function t_sort(t, comp)
+	for i = 1, (#t - 1) do
+		for j = (i + 1), #t do
+			local a, b = t[i], t[j];
+			if not comp(a,b) then
+				t[i], t[j] = b, a;
+			end
+		end
+	end
+end
+
 function source(dest, candidates)
 	local function comp(ipA, ipB)
 		-- Rule 1: Prefer same address
@@ -61,7 +71,6 @@ function source(dest, candidates)
 end
 
 function destination(candidates, sources)
-	local t_sort = table.sort;
 	local sourceAddrs = {};
 	local function comp(ipA, ipB)
 		local ipAsource = sourceAddrs[ipA];
-- 
cgit v1.2.3


From c789df45269398259083eb72b80c4ee04e8b2822 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Tue, 22 Nov 2011 01:44:28 +0500
Subject: util.xmppstream: A little cleanup.

---
 util/xmppstream.lua | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'util')

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 };
-- 
cgit v1.2.3


From 766d32e20c0e11395142dd950721845ed7a9e2da Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Tue, 22 Nov 2011 02:13:42 +0500
Subject: util.dependencies, util.xmppstream: Move LuaExpat version checking to
 util.dependencies.

---
 util/dependencies.lua | 8 ++++++++
 util/xmppstream.lua   | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'util')

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"
 
-- 
cgit v1.2.3


From 65ffc174876fadcd779692dafd642386b2b9a635 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 30 Nov 2011 17:20:16 +0000
Subject: util.ip: Fix in IP range calculation for 172.16.0.0/12

---
 util/ip.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/ip.lua b/util/ip.lua
index 5e2f46bb..5b866b04 100644
--- a/util/ip.lua
+++ b/util/ip.lua
@@ -65,7 +65,7 @@ local function v4scope(ip)
 	elseif fields[1] == 169 and fields[2] == 254 then
 		return 0x2;
 	-- Site-local unicast:
-	elseif (fields[1] == 10) or (fields[1] == 192 and fields[2] == 168) or (fields[1] == 172 and fields[2] > 16) then
+	elseif (fields[1] == 10) or (fields[1] == 192 and fields[2] == 168) or (fields[1] == 172 and (fields[2] >= 16 and fields[2] < 32) then
 		return 0x5;
 	-- Global unicast:
 	else
-- 
cgit v1.2.3


From d531e402d09d48774806fead2b497d34ea8d79c1 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 30 Nov 2011 19:37:13 +0000
Subject: util.ip: Fix syntax error (while I search for my pre-commit hooks)

---
 util/ip.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/ip.lua b/util/ip.lua
index 5b866b04..2f09c034 100644
--- a/util/ip.lua
+++ b/util/ip.lua
@@ -65,7 +65,7 @@ local function v4scope(ip)
 	elseif fields[1] == 169 and fields[2] == 254 then
 		return 0x2;
 	-- Site-local unicast:
-	elseif (fields[1] == 10) or (fields[1] == 192 and fields[2] == 168) or (fields[1] == 172 and (fields[2] >= 16 and fields[2] < 32) then
+	elseif (fields[1] == 10) or (fields[1] == 192 and fields[2] == 168) or (fields[1] == 172 and (fields[2] >= 16 and fields[2] < 32)) then
 		return 0x5;
 	-- Global unicast:
 	else
-- 
cgit v1.2.3


From 6033bbbd91b4c925b78cc05c873c4f249177c555 Mon Sep 17 00:00:00 2001
From: Florian Zeitz <florob@babelmonkeys.de>
Date: Fri, 2 Dec 2011 19:24:54 +0100
Subject: util.dataforms: Fix form verification

---
 util/dataforms.lua | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'util')

diff --git a/util/dataforms.lua b/util/dataforms.lua
index e4d24cf6..b69df819 100644
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -120,12 +120,18 @@ function form_t.data(layout, stanza)
 			end
 		end
 
-		local reader = field_readers[field.type];
-		local verifier = field.verifier or field_verifiers[field.type];
-		if reader then
-			data[field.name] = reader(tag);
-			if verifier then
-				errors[field.name] = verifier(data[field.name], tag, field.required);
+		if not tag then
+			if field.required then
+				errors[field.name] = "Required value missing";
+			end
+		else
+			local reader = field_readers[field.type];
+			local verifier = field.verifier or field_verifiers[field.type];
+			if reader then
+				data[field.name] = reader(tag);
+				if verifier then
+					errors[field.name] = verifier(data[field.name], tag, field.required);
+				end
 			end
 		end
 	end
@@ -161,7 +167,7 @@ field_readers["jid-single"] =
 
 field_verifiers["jid-single"] =
 	function (data, field_tag, required)
-		if #data == 0 and required then
+		if ((not data) or (#data == 0)) and required then
 			return "Required value missing";
 		end
 		if not jid_prep(data) then
-- 
cgit v1.2.3


From ea0a2a6ecb4b696189f04e4b8f3eaf5e0969699f Mon Sep 17 00:00:00 2001
From: Florian Zeitz <florob@babelmonkeys.de>
Date: Sat, 3 Dec 2011 17:10:48 +0100
Subject: util.dataforms: Fix verfication for booleans

---
 util/dataforms.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/dataforms.lua b/util/dataforms.lua
index b69df819..d4a1865c 100644
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -252,7 +252,7 @@ field_readers["boolean"] =
 field_verifiers["boolean"] =
 	function (data, field_tag, required)
 		data = field_readers["text-single"](field_tag);
-		if #data == 0 and required then
+		if ((not data) or (#data == 0)) and required then
 			return "Required value missing";
 		end
 		if data ~= "1" and data ~= "true" and data ~= "0" and data ~= "false" then
-- 
cgit v1.2.3


From 0572f1ef240e909b4e16feda8964e56cfb1aa982 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 7 Dec 2011 05:04:55 +0000
Subject: util.array: Add pluck() method to pick a given property from each
 item

---
 util/array.lua | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'util')

diff --git a/util/array.lua b/util/array.lua
index 5dbd3037..cf586214 100644
--- a/util/array.lua
+++ b/util/array.lua
@@ -60,6 +60,13 @@ function array_base.sort(outa, ina, ...)
 	return outa;
 end
 
+function array_base.pluck(outa, ina, key)
+	for i=1,#ina do
+		outa[i] = ina[i][key];
+	end
+	return outa;
+end
+
 --- These methods only mutate
 function array_methods:random()
 	return self[math.random(1,#self)];
-- 
cgit v1.2.3


From 6c51171c432a9068270a580edd1ddd4753fde62c Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 7 Dec 2011 05:14:58 +0000
Subject: util.array: Expand some of the more basic methods to act more
 sensibly than their names suggested

---
 util/array.lua | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'util')

diff --git a/util/array.lua b/util/array.lua
index cf586214..cbb051d3 100644
--- a/util/array.lua
+++ b/util/array.lua
@@ -25,6 +25,15 @@ end
 
 setmetatable(array, { __call = new_array });
 
+-- Read-only methods
+function array_methods:random()
+	return self[math.random(1,#self)];
+end
+
+-- These methods can be called two ways:
+--   array.method(existing_array, [params [, ...]]) -- Create new array for result
+--   existing_array:method([params, ...]) -- Transform existing array into result
+--
 function array_base.map(outa, ina, func)
 	for k,v in ipairs(ina) do
 		outa[k] = func(v);
@@ -67,11 +76,7 @@ function array_base.pluck(outa, ina, key)
 	return outa;
 end
 
---- These methods only mutate
-function array_methods:random()
-	return self[math.random(1,#self)];
-end
-
+--- These methods only mutate the array
 function array_methods:shuffle(outa, ina)
 	local len = #self;
 	for i=1,#self do
@@ -98,10 +103,23 @@ function array_methods:append(array)
 	return self;
 end
 
-array_methods.push = table.insert;
-array_methods.pop = table.remove;
-array_methods.concat = table.concat;
-array_methods.length = function (t) return #t; end
+function array_methods:push(x)
+	table.insert(self, x);
+end
+
+function array_methods:pop(x)
+	local v = self[x];
+	table.remove(self, x);
+	return v;
+end
+
+function array_methods:concat(sep)
+	return table.concat(array.map(self, tostring), sep);
+end
+
+function array_methods:length()
+	return #self;
+end
 
 --- These methods always create a new array
 function array.collect(f, s, var)
-- 
cgit v1.2.3


From ab71edddf05e451599a138ee7ebd4cd97f69fa46 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 7 Dec 2011 05:17:39 +0000
Subject: util.iterators: it2table: Fix variable name

---
 util/iterators.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/iterators.lua b/util/iterators.lua
index 2a87e97a..aa0b172b 100644
--- a/util/iterators.lua
+++ b/util/iterators.lua
@@ -140,7 +140,7 @@ end
 -- Treat the return of an iterator as key,value pairs,
 -- and build a table
 function it2table(f, s, var)
-	local t, var = {};
+	local t, var2 = {};
 	while true do
 		var, var2 = f(s, var);
 	        if var == nil then break; end
-- 
cgit v1.2.3


From c4e0cdb9f5320543e2decfab0241114d7987b984 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Fri, 9 Dec 2011 11:57:14 +0500
Subject: util.array: Make array:push() chainable.

---
 util/array.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'util')

diff --git a/util/array.lua b/util/array.lua
index cbb051d3..fdf3c9a3 100644
--- a/util/array.lua
+++ b/util/array.lua
@@ -105,6 +105,7 @@ end
 
 function array_methods:push(x)
 	table.insert(self, x);
+	return self;
 end
 
 function array_methods:pop(x)
-- 
cgit v1.2.3


From a2f97afa0c57587b77bff3819d04aa694bc60db3 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Fri, 9 Dec 2011 12:02:21 +0500
Subject: util.array: Avoid globals.

---
 util/array.lua | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'util')

diff --git a/util/array.lua b/util/array.lua
index fdf3c9a3..5dc604ba 100644
--- a/util/array.lua
+++ b/util/array.lua
@@ -9,6 +9,11 @@
 local t_insert, t_sort, t_remove, t_concat
     = table.insert, table.sort, table.remove, table.concat;
 
+local setmetatable = setmetatable;
+local math_random = math.random;
+local pairs, ipairs = pairs, ipairs;
+local tostring = tostring;
+
 local array = {};
 local array_base = {};
 local array_methods = {};
@@ -27,7 +32,7 @@ setmetatable(array, { __call = new_array });
 
 -- Read-only methods
 function array_methods:random()
-	return self[math.random(1,#self)];
+	return self[math_random(1,#self)];
 end
 
 -- These methods can be called two ways:
@@ -80,7 +85,7 @@ end
 function array_methods:shuffle(outa, ina)
 	local len = #self;
 	for i=1,#self do
-		local r = math.random(i,len);
+		local r = math_random(i,len);
 		self[i], self[r] = self[r], self[i];
 	end
 	return self;
@@ -104,18 +109,18 @@ function array_methods:append(array)
 end
 
 function array_methods:push(x)
-	table.insert(self, x);
+	t_insert(self, x);
 	return self;
 end
 
 function array_methods:pop(x)
 	local v = self[x];
-	table.remove(self, x);
+	t_remove(self, x);
 	return v;
 end
 
 function array_methods:concat(sep)
-	return table.concat(array.map(self, tostring), sep);
+	return t_concat(array.map(self, tostring), sep);
 end
 
 function array_methods:length()
@@ -128,7 +133,7 @@ function array.collect(f, s, var)
 	while true do
 		var = f(s, var);
 	        if var == nil then break; end
-		table.insert(t, var);
+		t_insert(t, var);
 	end
 	return setmetatable(t, array_mt);
 end
-- 
cgit v1.2.3


From b66913bf3b9097832eced4ddb6b94dd34df0b06b Mon Sep 17 00:00:00 2001
From: James Callahan <james@chatid.com>
Date: Mon, 12 Dec 2011 17:08:48 +1100
Subject: util/datamanager: Use package.config to figure out directory
 seperator

---
 util/datamanager.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'util')

diff --git a/util/datamanager.lua b/util/datamanager.lua
index d5e9c88c..a5d676cc 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -20,7 +20,7 @@ local error = error;
 local next = next;
 local t_insert = table.insert;
 local append = require "util.serialization".append;
-local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end
+local path_separator = assert ( package.config:match ( "^([^\n]+)" ) , "package.config not in standard form" ) -- Extract directory seperator from package.config (an undocumented string that comes with lua)
 local lfs = require "lfs";
 local prosody = prosody;
 local raw_mkdir;
@@ -72,7 +72,7 @@ local function callback(username, host, datastore, data)
 		username, host, datastore, data = f(username, host, datastore, data);
 		if username == false then break; end
 	end
-	
+
 	return username, host, datastore, data;
 end
 function add_callback(func)
-- 
cgit v1.2.3


From a60732b6660b4318caa847ecc17b9f106006f9ba Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 21 Dec 2011 07:58:22 +0000
Subject: util.stanza: Remove unused __add metamethod

---
 util/stanza.lua | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'util')

diff --git a/util/stanza.lua b/util/stanza.lua
index de83977f..600212a4 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -258,11 +258,6 @@ function stanza_mt.get_error(stanza)
 	return type, condition or "undefined-condition", text;
 end
 
-function stanza_mt.__add(s1, s2)
-	return s1:add_direct_child(s2);
-end
-
-
 do
 	local id = 0;
 	function new_id()
-- 
cgit v1.2.3


From 8eba0e5ebdb9a49deaa9ce2768f07a89854a46d7 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 13 Jan 2012 15:46:36 +0000
Subject: util.debug: Adjust level within get_locals_table() to account for the
 additional depth of this function itself

---
 util/debug.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 22d02bf2..2170a6d1 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -9,6 +9,7 @@ local censored_names = {
 };
 
 local function get_locals_table(level)
+	level = level + 1; -- Skip this function itself
 	local locals = {};
 	for local_num = 1, math.huge do
 		local name, value = debug.getlocal(level, local_num);
-- 
cgit v1.2.3


From ca964ddb88627847099e3dc18c29cdf263a8b8e5 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 13 Jan 2012 23:30:00 +0000
Subject: util.throttle: Import setmetatable

---
 util/throttle.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'util')

diff --git a/util/throttle.lua b/util/throttle.lua
index 8b62e797..82b0a67b 100644
--- a/util/throttle.lua
+++ b/util/throttle.lua
@@ -1,5 +1,6 @@
 
 local gettime = require "socket".gettime;
+local setmetatable = setmetatable;
 
 module "throttle"
 
-- 
cgit v1.2.3


From d39558af1788626626d13e66f5b13cbd1228efa0 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 13 Jan 2012 23:30:32 +0000
Subject: util.throttle: Fix 'outstanding' return value

---
 util/throttle.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/throttle.lua b/util/throttle.lua
index 82b0a67b..2e901158 100644
--- a/util/throttle.lua
+++ b/util/throttle.lua
@@ -34,7 +34,7 @@ function throttle:poll(cost, split)
 		if split then
 			self.balance = 0;
 		end
-		return false, balance, (cost-self.balance);
+		return false, balance, (cost-balance);
 	end
 end
 
-- 
cgit v1.2.3


From c65490db56caf69caaa6ae061e544d97a7ed4910 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Wed, 18 Jan 2012 08:54:26 +0500
Subject: util.json: Added function encode_ordered(object).

---
 util/json.lua | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

(limited to 'util')

diff --git a/util/json.lua b/util/json.lua
index 5d0b0876..efc602f0 100644
--- a/util/json.lua
+++ b/util/json.lua
@@ -1,6 +1,6 @@
 
 local type = type;
-local t_insert, t_concat, t_remove = table.insert, table.concat, table.remove;
+local t_insert, t_concat, t_remove, t_sort = table.insert, table.concat, table.remove, table.sort;
 local s_char = string.char;
 local tostring, tonumber = tostring, tonumber;
 local pairs, ipairs = pairs, ipairs;
@@ -79,11 +79,25 @@ function tablesave(o, buffer)
 	if next(__hash) ~= nil or next(hash) ~= nil or next(__array) == nil then
 		t_insert(buffer, "{");
 		local mark = #buffer;
-		for k,v in pairs(hash) do
-			stringsave(k, buffer);
-			t_insert(buffer, ":");
-			simplesave(v, buffer);
-			t_insert(buffer, ",");
+		if buffer.ordered then
+			local keys = {};
+			for k in pairs(hash) do
+				t_insert(keys, k);
+			end
+			t_sort(keys);
+			for _,k in ipairs(keys) do
+				stringsave(k, buffer);
+				t_insert(buffer, ":");
+				simplesave(hash[k], buffer);
+				t_insert(buffer, ",");
+			end
+		else
+			for k,v in pairs(hash) do
+				stringsave(k, buffer);
+				t_insert(buffer, ":");
+				simplesave(v, buffer);
+				t_insert(buffer, ",");
+			end
 		end
 		if next(__hash) ~= nil then
 			t_insert(buffer, "\"__hash\":[");
@@ -129,6 +143,11 @@ function json.encode(obj)
 	simplesave(obj, t);
 	return t_concat(t);
 end
+function json.encode_ordered(obj)
+	local t = { ordered = true };
+	simplesave(obj, t);
+	return t_concat(t);
+end
 
 -----------------------------------
 
-- 
cgit v1.2.3


From 72fcc7b12d296135eb828ed3f8b151171d9d5f1e Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 20 Jan 2012 21:58:04 +0100
Subject: util.prosodyctl: Add getline() and show_prompt()

---
 util/prosodyctl.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index d0045abc..8c58f2cd 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -16,6 +16,7 @@ local signal = require "util.signal";
 local set = require "util.set";
 local lfs = require "lfs";
 local pcall = pcall;
+local type = type;
 
 local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep;
 
@@ -63,6 +64,13 @@ function getchar(n)
 	end
 end
 
+function getline()
+	local ok, line = pcall(io.read, "*l");
+	if ok then
+		return line;
+	end
+end
+
 function getpass()
 	local stty_ret = os.execute("stty -echo 2>/dev/null");
 	if stty_ret ~= 0 then
@@ -112,6 +120,13 @@ function read_password()
 	return password;
 end
 
+function show_prompt(prompt)
+	io.write(prompt, " ");
+	local line = getline();
+	line = line and line:gsub("\n$","");
+	return (line and #line > 0) and line or nil;
+end
+
 -- Server control
 function adduser(params)
 	local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
-- 
cgit v1.2.3


From 3c51125734a2352f7d80efd97963ad91063b0a59 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 20 Jan 2012 21:59:13 +0100
Subject: user.x509: Add some utility functions for generating OpenSSL configs

---
 util/x509.lua | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)

(limited to 'util')

diff --git a/util/x509.lua b/util/x509.lua
index d3c55bb4..f106e6fa 100644
--- a/util/x509.lua
+++ b/util/x509.lua
@@ -21,6 +21,10 @@
 local nameprep = require "util.encodings".stringprep.nameprep;
 local idna_to_ascii = require "util.encodings".idna.to_ascii;
 local log = require "util.logger".init("x509");
+local pairs, ipairs = pairs, ipairs;
+local s_format = string.format;
+local t_insert = table.insert;
+local t_concat = table.concat;
 
 module "x509"
 
@@ -208,4 +212,109 @@ function verify_identity(host, service, cert)
 	return false
 end
 
+-- TODO Rename? Split out subroutines?
+-- Also, this is probably openssl specific, what TODO about that?
+function genx509san(hosts, config, certhosts, raw) -- recive config through that or some better way?
+	local function utf8string(s)
+		-- This is how we tell openssl not to encode UTF-8 strings as Latin1
+		return s_format("FORMAT:UTF8,UTF8:%s", s);
+	end
+
+	local function ia5string(s)
+		return s_format("IA5STRING:%s", s);
+	end
+
+	local function dnsname(t, host)
+		t_insert(t.DNS, idna_to_ascii(host));
+	end
+
+	local function srvname(t, host, service)
+		t_insert(t.otherName, s_format("%s;%s", oid_dnssrv, ia5string("_" .. service .."." .. idna_to_ascii(host))));
+	end
+
+	local function xmppAddr(t, host)
+		t_insert(t.otherName, s_format("%s;%s", oid_xmppaddr, utf8string(host)));
+	end
+
+	-----------------------------
+
+	local san = {
+		DNS = {};
+		otherName = {};
+	};
+
+	local sslsanconf = { };
+
+	for i = 1,#certhosts do
+		local certhost = certhosts[i];
+		for name, host in pairs(hosts) do
+			if name == certhost or name:sub(-1-#certhost) == "."..certhost then
+				dnsname(san, name);
+				--print(name .. "#component_module: " .. (config.get(name, "core", "component_module") or "nil"));
+				if config.get(name, "core", "component_module") == nil then
+					srvname(san, name, "xmpp-client");
+				end
+				--print(name .. "#anonymous_login: " .. tostring(config.get(name, "core", "anonymous_login")));
+				if not (config.get(name, "core", "anonymous_login") or
+						config.get(name, "core", "authentication") == "anonymous") then
+					srvname(san, name, "xmpp-server");
+				end
+				xmppAddr(san, name);
+			end
+		end
+	end
+
+	for t, n in pairs(san) do
+		for i = 1,#n do
+			t_insert(sslsanconf, s_format("%s.%d = %s", t, i -1, n[i]));
+		end
+	end
+
+	return raw and sslsanconf or t_concat(sslsanconf, "\n");
+end
+
+function baseconf()
+	return {
+		req = {
+			distinguished_name = "distinguished_name",
+			req_extensions = "v3_extensions",
+			x509_extensions = "v3_extensions",
+			prompt = "no",
+		},
+		distinguished_name = {
+			commonName = "example.com",
+			countryName = "GB",
+			localityName = "The Internet",
+			organizationName = "Your Organisation",
+			organizationalUnitName = "XMPP Department",
+			emailAddress = "xmpp@example.com",
+		},
+		v3_extensions = {
+			basicConstraints = "CA:FALSE",
+			keyUsage = "digitalSignature,keyEncipherment",
+			extendedKeyUsage = "serverAuth,clientAuth",
+			subjectAltName = "@subject_alternative_name",
+		},
+		subject_alternative_name = { },
+	}
+end
+
+function serialize_conf(conf)
+	local s = "";
+	for k, t in pairs(conf) do
+		s = s .. ("[%s]\n"):format(k);
+		if t[1] then
+			for i, v in ipairs(t) do
+				s = s .. ("%s\n"):format(v);
+			end
+		else
+			for k, v in pairs(t) do
+				s = s .. ("%s = %s\n"):format(k, v);
+			end
+		end
+		s = s .. "\n";
+	end
+	return s;
+end
+
 return _M;
-- 
cgit v1.2.3


From 89adfeefbfb954272bd53a172c07e3633186198e Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 22 Jan 2012 19:10:13 +0000
Subject: util.helpers: After nearly 'fixing' this code, I conclude it instead
 only deserves a bigger smile

---
 util/helpers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/helpers.lua b/util/helpers.lua
index 11356176..a8c8c612 100644
--- a/util/helpers.lua
+++ b/util/helpers.lua
@@ -28,7 +28,7 @@ function log_events(events, name, logger)
 end
 
 function revert_log_events(events)
-	events.fire_event, events[events.fire_event] = events[events.fire_event], nil; -- :)
+	events.fire_event, events[events.fire_event] = events[events.fire_event], nil; -- :))
 end
 
 function get_upvalue(f, get_name)
-- 
cgit v1.2.3


From 72f03580e8be39593ed6a37c8630e572807f0864 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 22 Jan 2012 23:59:19 +0000
Subject: util.set: Accept nil to add_list()

---
 util/set.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'util')

diff --git a/util/set.lua b/util/set.lua
index e4cc2dff..050446ec 100644
--- a/util/set.lua
+++ b/util/set.lua
@@ -82,8 +82,10 @@ function new(list)
 	end
 	
 	function set:add_list(list)
-		for _, item in ipairs(list) do
-			items[item] = true;
+		if list then
+			for _, item in ipairs(list) do
+				items[item] = true;
+			end
 		end
 	end
 	
-- 
cgit v1.2.3


From a37f067c905d472aba0d70130718660f1470163e Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 23 Jan 2012 00:00:10 +0000
Subject: util.iterators: Make a standard library (no longer injects into
 global namespace)

---
 util/iterators.lua | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'util')

diff --git a/util/iterators.lua b/util/iterators.lua
index aa0b172b..fb89f4a5 100644
--- a/util/iterators.lua
+++ b/util/iterators.lua
@@ -8,8 +8,10 @@
 
 --[[ Iterators ]]--
 
+local it = {};
+
 -- Reverse an iterator
-function reverse(f, s, var)
+function it.reverse(f, s, var)
 	local results = {};
 
 	-- First call the normal iterator
@@ -34,12 +36,12 @@ end
 local function _keys_it(t, key)
 	return (next(t, key));
 end
-function keys(t)
+function it.keys(t)
 	return _keys_it, t;
 end
 
 -- Iterate only over values in a table
-function values(t)
+function it.values(t)
 	local key, val;
 	return function (t)
 		key, val = next(t, key);
@@ -48,7 +50,7 @@ function values(t)
 end
 
 -- Given an iterator, iterate only over unique items
-function unique(f, s, var)
+function it.unique(f, s, var)
 	local set = {};
 	
 	return function ()
@@ -65,7 +67,7 @@ function unique(f, s, var)
 end
 
 --[[ Return the number of items an iterator returns ]]--
-function count(f, s, var)
+function it.count(f, s, var)
 	local x = 0;
 	
 	while true do
@@ -79,7 +81,7 @@ function count(f, s, var)
 end
 
 -- Return the first n items an iterator returns
-function head(n, f, s, var)
+function it.head(n, f, s, var)
 	local c = 0;
 	return function (s, var)
 		if c >= n then
@@ -91,7 +93,7 @@ function head(n, f, s, var)
 end
 
 -- Skip the first n items an iterator returns
-function skip(n, f, s, var)
+function it.skip(n, f, s, var)
 	for i=1,n do
 		var = f(s, var);
 	end
@@ -99,7 +101,7 @@ function skip(n, f, s, var)
 end
 
 -- Return the last n items an iterator returns
-function tail(n, f, s, var)
+function it.tail(n, f, s, var)
 	local results, count = {}, 0;
 	while true do
 		local ret = { f(s, var) };
@@ -121,13 +123,13 @@ function tail(n, f, s, var)
 end
 
 local function _range_iter(max, curr) if curr < max then return curr + 1; end end
-function range(x, y)
+function it.range(x, y)
 	if not y then x, y = 1, x; end -- Default to 1..x if y not given
 	return _range_iter, y, x-1;
 end
 
 -- Convert the values returned by an iterator to an array
-function it2array(f, s, var)
+function it.to_array(f, s, var)
 	local t, var = {};
 	while true do
 		var = f(s, var);
@@ -139,7 +141,7 @@ end
 
 -- Treat the return of an iterator as key,value pairs,
 -- and build a table
-function it2table(f, s, var)
+function it.to_table(f, s, var)
 	local t, var2 = {};
 	while true do
 		var, var2 = f(s, var);
@@ -149,3 +151,4 @@ function it2table(f, s, var)
 	return t;
 end
 
+return it;
-- 
cgit v1.2.3


From 3a34c326b306321454bdae018b93bf3cf0d4875a Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Wed, 25 Jan 2012 11:47:51 +0500
Subject: util.xmppstream: Remove some unnecessary code.

---
 util/xmppstream.lua | 2 --
 1 file changed, 2 deletions(-)

(limited to 'util')

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index 0f80742d..adf4a359 100644
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -151,8 +151,6 @@ function new_sax_handlers(session, stream_callbacks)
 				end
 				cb_error(session, "parse-error", "unexpected-element-close", name);
 			end
-			stanza, chardata = nil, {};
-			stack = {};
 		end
 	end
 
-- 
cgit v1.2.3


From ea7586b3634a22191995ff589a72b32eddc32e3b Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Wed, 25 Jan 2012 11:49:27 +0500
Subject: util.xmppstream: Have faith in the XML parser matching start and end
 tags.

---
 util/xmppstream.lua | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'util')

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index adf4a359..09198f21 100644
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -140,16 +140,8 @@ function new_sax_handlers(session, stream_callbacks)
 				stanza = t_remove(stack);
 			end
 		else
-			if tagname == stream_tag then
-				if cb_streamclosed then
-					cb_streamclosed(session);
-				end
-			else
-				local curr_ns,name = tagname:match(ns_pattern);
-				if name == "" then
-					curr_ns, name = "", curr_ns;
-				end
-				cb_error(session, "parse-error", "unexpected-element-close", name);
+			if cb_streamclosed then
+				cb_streamclosed(session);
 			end
 		end
 	end
-- 
cgit v1.2.3


From 90e3f561fa6e02b26382d747155765753763a634 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Wed, 25 Jan 2012 11:54:12 +0500
Subject: util.xmppstream: Optimize attribute processing.

---
 util/xmppstream.lua | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'util')

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index 09198f21..f1793b4f 100644
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -25,8 +25,11 @@ module "xmppstream"
 
 local new_parser = lxp.new;
 
-local ns_prefixes = {
-	["http://www.w3.org/XML/1998/namespace"] = "xml";
+local xml_namespace = {
+	["http://www.w3.org/XML/1998/namespace\1lang"] = "xml:lang";
+	["http://www.w3.org/XML/1998/namespace\1space"] = "xml:space";
+	["http://www.w3.org/XML/1998/namespace\1base"] = "xml:base";
+	["http://www.w3.org/XML/1998/namespace\1id"] = "xml:id";
 };
 
 local xmlns_streams = "http://etherx.jabber.org/streams";
@@ -73,17 +76,13 @@ function new_sax_handlers(session, stream_callbacks)
 			non_streamns_depth = non_streamns_depth + 1;
 		end
 		
-		-- FIXME !!!!!
 		for i=1,#attr do
 			local k = attr[i];
 			attr[i] = nil;
-			local ns, nm = k:match(ns_pattern);
-			if nm ~= "" then
-				ns = ns_prefixes[ns];
-				if ns then
-					attr[ns..":"..nm] = attr[k];
-					attr[k] = nil;
-				end
+			local xmlk = xml_namespace[k];
+			if xmlk then
+				attr[xmlk] = attr[k];
+				attr[k] = nil;
 			end
 		end
 		
-- 
cgit v1.2.3


From cccbf349e4040d88501188515f0c4557795edd53 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sun, 5 Feb 2012 00:06:20 +0500
Subject: util.template: Refactoring to make the string->stanza conversion code
 more generic.

---
 util/template.lua | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/template.lua b/util/template.lua
index ebd8be14..5e9b479e 100644
--- a/util/template.lua
+++ b/util/template.lua
@@ -7,6 +7,7 @@ local ipairs = ipairs;
 local error = error;
 local loadstring = loadstring;
 local debug = debug;
+local t_remove = table.remove;
 
 module("template")
 
@@ -42,7 +43,6 @@ local parse_xml = (function()
 			stanza:tag(name, attr);
 		end
 		function handler:CharacterData(data)
-			data = data:gsub("^%s*", ""):gsub("%s*$", "");
 			stanza:text(data);
 		end
 		function handler:EndElement(tagname)
@@ -60,6 +60,19 @@ local parse_xml = (function()
 	end;
 end)();
 
+local function trim_xml(stanza)
+	for i=#stanza,1,-1 do
+		local child = stanza[i];
+		if child.name then
+			trim_xml(child);
+		else
+			child = child:gsub("^%s*", ""):gsub("%s*$", "");
+			stanza[i] = child;
+			if child == "" then t_remove(stanza, i); end
+		end
+	end
+end
+
 local function create_string_string(str)
 	str = ("%q"):format(str);
 	str = str:gsub("{([^}]*)}", function(s)
@@ -118,6 +131,7 @@ local template_mt = { __tostring = function(t) return t.name end };
 local function create_template(templates, text)
 	local stanza, err = parse_xml(text);
 	if not stanza then error(err); end
+	trim_xml(stanza);
 
 	local info = debug.getinfo(3, "Sl");
 	info = info and ("template(%s:%d)"):format(info.short_src:match("[^\\/]*$"), info.currentline) or "template(unknown)";
-- 
cgit v1.2.3


From 7f64044ee8292c9a548446fbdf9ea1416ed5ecc5 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 15 Mar 2012 19:09:24 +0000
Subject: loggingmanager, util.logger: Remove name sinks and the ability to
 filter logs by source name (lots of code, hardly used if at all, and possibly
 broken)

---
 util/logger.lua | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'util')

diff --git a/util/logger.lua b/util/logger.lua
index c3bf3992..4fadb4b9 100644
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -13,8 +13,7 @@ local ipairs, pairs, setmetatable = ipairs, pairs, setmetatable;
 
 module "logger"
 
-local name_sinks, level_sinks = {}, {};
-local name_patterns = {};
+local level_sinks = {};
 
 local make_logger;
 
@@ -46,17 +45,7 @@ function make_logger(source_name, level)
 		level_sinks[level] = level_handlers;
 	end
 
-	local source_handlers = name_sinks[source_name];
-	
 	local logger = function (message, ...)
-		if source_handlers then
-			for i = 1,#source_handlers do
-				if source_handlers[i](source_name, level, message, ...) == false then
-					return;
-				end
-			end
-		end
-		
 		for i = 1,#level_handlers do
 			level_handlers[i](source_name, level, message, ...);
 		end
@@ -66,14 +55,12 @@ function make_logger(source_name, level)
 end
 
 function reset()
-	for k in pairs(name_sinks) do name_sinks[k] = nil; end
 	for level, handler_list in pairs(level_sinks) do
 		-- Clear all handlers for this level
 		for i = 1, #handler_list do
 			handler_list[i] = nil;
 		end
 	end
-	for k in pairs(name_patterns) do name_patterns[k] = nil; end
 end
 
 function add_level_sink(level, sink_function)
@@ -84,22 +71,6 @@ function add_level_sink(level, sink_function)
 	end
 end
 
-function add_name_sink(name, sink_function, exclusive)
-	if not name_sinks[name] then
-		name_sinks[name] = { sink_function };
-	else
-		name_sinks[name][#name_sinks[name] + 1] = sink_function;
-	end
-end
-
-function add_name_pattern_sink(name_pattern, sink_function, exclusive)
-	if not name_patterns[name_pattern] then
-		name_patterns[name_pattern] = { sink_function };
-	else
-		name_patterns[name_pattern][#name_patterns[name_pattern] + 1] = sink_function;
-	end
-end
-
 _M.new = make_logger;
 
 return _M;
-- 
cgit v1.2.3


From 451abcc73f8315134c31478450b53494f1bfd455 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 22 Mar 2012 15:07:27 +0000
Subject: util.debug: Attempt to get debug.traceback() parameter handling
 correct (again)

---
 util/debug.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 2170a6d1..f70e20dd 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -95,7 +95,11 @@ function debug.traceback(thread, message, level)
 	if level and type(message) ~= "string" then
 		return nil, "invalid message";
 	elseif not level then
-		level = message or 2;
+		if type(message) == "number" then
+			level, message = message, nil;
+		else
+			level = 2;
+		end
 	end
 	
 	message = message and (message.."\n") or "";
-- 
cgit v1.2.3


From 553666c3f2d7da937658e5f695ca4d29a4c1851d Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 22 Mar 2012 15:08:21 +0000
Subject: util.debug: Add catch for an "error in error handling"

---
 util/debug.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index f70e20dd..9fd0f9dd 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -88,7 +88,15 @@ function get_traceback_table(thread, start_level)
 	return levels;
 end
 
-function debug.traceback(thread, message, level)
+function debug.traceback(...)
+	local ok, ret = pcall(debug._traceback, ...);
+	if not ok then
+		return "Error in error handling: "..ret;
+	end
+	return ret;
+end
+
+function debug._traceback(thread, message, level)
 	if type(thread) ~= "thread" then
 		thread, message, level = coroutine.running(), thread, message;
 	end
-- 
cgit v1.2.3


From 4c94b7dbf1148040551c000f0fa5cf31713f1fc2 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 22 Mar 2012 15:09:37 +0000
Subject: util.debug: Add markers in the output when crossing source file
 boundaries

---
 util/debug.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 9fd0f9dd..6df249c0 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -114,11 +114,14 @@ function debug._traceback(thread, message, level)
 	
 	local levels = get_traceback_table(thread, level+2);
 	
+	local last_source_desc;
+	
 	local lines = {};
 	for nlevel, level in ipairs(levels) do
 		local info = level.info;
 		local line = "...";
 		local func_type = info.namewhat.." ";
+		local source_desc = (info.short_src == "[C]" and "C code") or info.short_src or "Unknown";
 		if func_type == " " then func_type = ""; end;
 		if info.short_src == "[C]" then
 			line = "[ C ] "..func_type.."C function "..(info.name and ("%q"):format(info.name) or "(unknown name)")
@@ -134,6 +137,13 @@ function debug._traceback(thread, message, level)
 			end
 			line = "[Lua] "..info.short_src.." line "..info.currentline.." in "..func_type..name.." defined on line "..info.linedefined;
 		end
+		if source_desc ~= last_source_desc then -- Venturing into a new source, add marker for previous
+			if last_source_desc then
+				local padding = string.rep("-", math.floor(((65 - 6) - #last_source_desc)/2));
+				table.insert(lines, "\t ^"..padding.." "..last_source_desc.." "..padding..(#last_source_desc%2==0 and "-^" or "^ "));
+			end
+			last_source_desc = source_desc;
+		end
 		nlevel = nlevel-1;
 		table.insert(lines, "\t"..(nlevel==0 and ">" or " ").."("..nlevel..") "..line);
 		local npadding = (" "):rep(#tostring(nlevel));
@@ -146,5 +156,9 @@ function debug._traceback(thread, message, level)
 			table.insert(lines, "\t    "..npadding.."Upvals: "..upvalues_str);
 		end
 	end
+
+	local padding = string.rep("-", math.floor(((65 - 6) - #last_source_desc) / 2));
+	table.insert(lines, "\t ^"..padding.." "..last_source_desc.." "..padding..(#last_source_desc%2==0 and "-^" or "^ "));
+
 	return message.."stack traceback:\n"..table.concat(lines, "\n");
 end
-- 
cgit v1.2.3


From 059b6456a7e5dab6cacb002b6ddddb2338f79438 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 22 Mar 2012 15:10:38 +0000
Subject: util.debug: Move optimal line length (default 65) into a variable

---
 util/debug.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 6df249c0..9b1c4853 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -7,6 +7,8 @@ local censored_names = {
 	pass = true;
 	pwd = true;
 };
+local optimal_line_length = 65;
+
 
 local function get_locals_table(level)
 	level = level + 1; -- Skip this function itself
@@ -139,7 +141,7 @@ function debug._traceback(thread, message, level)
 		end
 		if source_desc ~= last_source_desc then -- Venturing into a new source, add marker for previous
 			if last_source_desc then
-				local padding = string.rep("-", math.floor(((65 - 6) - #last_source_desc)/2));
+				local padding = string.rep("-", math.floor(((optimal_line_length - 6) - #last_source_desc)/2));
 				table.insert(lines, "\t ^"..padding.." "..last_source_desc.." "..padding..(#last_source_desc%2==0 and "-^" or "^ "));
 			end
 			last_source_desc = source_desc;
@@ -147,17 +149,17 @@ function debug._traceback(thread, message, level)
 		nlevel = nlevel-1;
 		table.insert(lines, "\t"..(nlevel==0 and ">" or " ").."("..nlevel..") "..line);
 		local npadding = (" "):rep(#tostring(nlevel));
-		local locals_str = string_from_var_table(level.locals, 65, "\t            "..npadding);
+		local locals_str = string_from_var_table(level.locals, optimal_line_length, "\t            "..npadding);
 		if locals_str then
 			table.insert(lines, "\t    "..npadding.."Locals: "..locals_str);
 		end
-		local upvalues_str = string_from_var_table(level.upvalues, 65, "\t            "..npadding);
+		local upvalues_str = string_from_var_table(level.upvalues, optimal_line_length, "\t            "..npadding);
 		if upvalues_str then
 			table.insert(lines, "\t    "..npadding.."Upvals: "..upvalues_str);
 		end
 	end
 
-	local padding = string.rep("-", math.floor(((65 - 6) - #last_source_desc) / 2));
+	local padding = string.rep("-", math.floor(((optimal_line_length - 6) - #last_source_desc) / 2));
 	table.insert(lines, "\t ^"..padding.." "..last_source_desc.." "..padding..(#last_source_desc%2==0 and "-^" or "^ "));
 
 	return message.."stack traceback:\n"..table.concat(lines, "\n");
-- 
cgit v1.2.3


From 5cb235a17d4886a1853e368dafe5557fe1df522f Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 22 Mar 2012 16:07:57 +0000
Subject: util.debug: Add a bit of colour

---
 util/debug.lua | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 9b1c4853..9d76c795 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -9,6 +9,18 @@ local censored_names = {
 };
 local optimal_line_length = 65;
 
+local termcolours = require "util.termcolours";
+local getstring = termcolours.getstring;
+local styles;
+do
+	_ = termcolours.getstyle;
+	styles = {
+		boundary_padding = _("bright", "white");
+		filename         = _("bright", "blue");
+		level_num        = _("green");
+		funcname         = _("yellow");
+	};
+end
 
 local function get_locals_table(level)
 	level = level + 1; -- Skip this function itself
@@ -98,6 +110,11 @@ function debug.traceback(...)
 	return ret;
 end
 
+local function build_source_boundary_marker(last_source_desc)
+	local padding = string.rep("-", math.floor(((optimal_line_length - 6) - #last_source_desc)/2));
+	return getstring(styles.boundary_padding, "^"..padding).." "..getstring(styles.filename, last_source_desc).." "..getstring(styles.boundary_padding, padding..(#last_source_desc%2==0 and "-^" or "^ "));
+end
+
 function debug._traceback(thread, message, level)
 	if type(thread) ~= "thread" then
 		thread, message, level = coroutine.running(), thread, message;
@@ -137,17 +154,16 @@ function debug._traceback(thread, message, level)
 			if func_type == "global " or func_type == "local " then
 				func_type = func_type.."function ";
 			end
-			line = "[Lua] "..info.short_src.." line "..info.currentline.." in "..func_type..name.." defined on line "..info.linedefined;
+			line = "[Lua] "..info.short_src.." line "..info.currentline.." in "..func_type..getstring(styles.funcname, name).." defined on line "..info.linedefined;
 		end
 		if source_desc ~= last_source_desc then -- Venturing into a new source, add marker for previous
 			if last_source_desc then
-				local padding = string.rep("-", math.floor(((optimal_line_length - 6) - #last_source_desc)/2));
-				table.insert(lines, "\t ^"..padding.." "..last_source_desc.." "..padding..(#last_source_desc%2==0 and "-^" or "^ "));
+				table.insert(lines, "\t "..build_source_boundary_marker(last_source_desc));
 			end
 			last_source_desc = source_desc;
 		end
 		nlevel = nlevel-1;
-		table.insert(lines, "\t"..(nlevel==0 and ">" or " ").."("..nlevel..") "..line);
+		table.insert(lines, "\t"..(nlevel==0 and ">" or " ")..getstring(styles.level_num, "("..nlevel..") ")..line);
 		local npadding = (" "):rep(#tostring(nlevel));
 		local locals_str = string_from_var_table(level.locals, optimal_line_length, "\t            "..npadding);
 		if locals_str then
@@ -159,8 +175,7 @@ function debug._traceback(thread, message, level)
 		end
 	end
 
-	local padding = string.rep("-", math.floor(((optimal_line_length - 6) - #last_source_desc) / 2));
-	table.insert(lines, "\t ^"..padding.." "..last_source_desc.." "..padding..(#last_source_desc%2==0 and "-^" or "^ "));
+	table.insert(lines, "\t "..build_source_boundary_marker(last_source_desc));
 
 	return message.."stack traceback:\n"..table.concat(lines, "\n");
 end
-- 
cgit v1.2.3


From 9794c49ceae42113b1b80e53b57745c19ffc66bf Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 22 Mar 2012 16:39:28 +0000
Subject: util.debug: Add a touch of colour to source locations

---
 util/debug.lua | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 9d76c795..d63dce1b 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -19,6 +19,7 @@ do
 		filename         = _("bright", "blue");
 		level_num        = _("green");
 		funcname         = _("yellow");
+		location         = _("yellow");
 	};
 end
 
@@ -143,9 +144,9 @@ function debug._traceback(thread, message, level)
 		local source_desc = (info.short_src == "[C]" and "C code") or info.short_src or "Unknown";
 		if func_type == " " then func_type = ""; end;
 		if info.short_src == "[C]" then
-			line = "[ C ] "..func_type.."C function "..(info.name and ("%q"):format(info.name) or "(unknown name)")
+			line = "[ C ] "..func_type.."C function "..getstring(styles.location, (info.name and ("%q"):format(info.name) or "(unknown name)"));
 		elseif info.what == "main" then
-			line = "[Lua] "..info.short_src.." line "..info.currentline;
+			line = "[Lua] "..getstring(styles.location, info.short_src.." line "..info.currentline);
 		else
 			local name = info.name or " ";
 			if name ~= " " then
@@ -154,7 +155,7 @@ function debug._traceback(thread, message, level)
 			if func_type == "global " or func_type == "local " then
 				func_type = func_type.."function ";
 			end
-			line = "[Lua] "..info.short_src.." line "..info.currentline.." in "..func_type..getstring(styles.funcname, name).." defined on line "..info.linedefined;
+			line = "[Lua] "..getstring(styles.location, info.short_src.." line "..info.currentline).." in "..func_type..getstring(styles.funcname, name).." (defined on line "..info.linedefined..")";
 		end
 		if source_desc ~= last_source_desc then -- Venturing into a new source, add marker for previous
 			if last_source_desc then
-- 
cgit v1.2.3


From a1b3f76c8c2d381950fc51b1ee89dd059898766f Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 22 Mar 2012 16:51:39 +0000
Subject: util.debug: Move boundary markers to top of relevant sections of the
 stack trace (easier to follow)

---
 util/debug.lua | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index d63dce1b..3736dd34 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -113,7 +113,7 @@ end
 
 local function build_source_boundary_marker(last_source_desc)
 	local padding = string.rep("-", math.floor(((optimal_line_length - 6) - #last_source_desc)/2));
-	return getstring(styles.boundary_padding, "^"..padding).." "..getstring(styles.filename, last_source_desc).." "..getstring(styles.boundary_padding, padding..(#last_source_desc%2==0 and "-^" or "^ "));
+	return getstring(styles.boundary_padding, "v"..padding).." "..getstring(styles.filename, last_source_desc).." "..getstring(styles.boundary_padding, padding..(#last_source_desc%2==0 and "-v" or "v "));
 end
 
 function debug._traceback(thread, message, level)
@@ -158,10 +158,8 @@ function debug._traceback(thread, message, level)
 			line = "[Lua] "..getstring(styles.location, info.short_src.." line "..info.currentline).." in "..func_type..getstring(styles.funcname, name).." (defined on line "..info.linedefined..")";
 		end
 		if source_desc ~= last_source_desc then -- Venturing into a new source, add marker for previous
-			if last_source_desc then
-				table.insert(lines, "\t "..build_source_boundary_marker(last_source_desc));
-			end
 			last_source_desc = source_desc;
+			table.insert(lines, "\t "..build_source_boundary_marker(last_source_desc));
 		end
 		nlevel = nlevel-1;
 		table.insert(lines, "\t"..(nlevel==0 and ">" or " ")..getstring(styles.level_num, "("..nlevel..") ")..line);
@@ -176,7 +174,7 @@ function debug._traceback(thread, message, level)
 		end
 	end
 
-	table.insert(lines, "\t "..build_source_boundary_marker(last_source_desc));
+--	table.insert(lines, "\t "..build_source_boundary_marker(last_source_desc));
 
 	return message.."stack traceback:\n"..table.concat(lines, "\n");
 end
-- 
cgit v1.2.3


From e6f0711e573d82e4a84cf0711f1320df16836949 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 24 Apr 2012 18:53:50 +0100
Subject: util.debug: Turn into a real-ish module ('debugx'), and require you
 call use() to override debug.traceback()

---
 util/debug.lua | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 2170a6d1..aeb710d7 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -8,7 +8,9 @@ local censored_names = {
 	pwd = true;
 };
 
-local function get_locals_table(level)
+module("debugx", package.seeall);
+
+function get_locals_table(level)
 	level = level + 1; -- Skip this function itself
 	local locals = {};
 	for local_num = 1, math.huge do
@@ -19,7 +21,7 @@ local function get_locals_table(level)
 	return locals;
 end
 
-local function get_upvalues_table(func)
+function get_upvalues_table(func)
 	local upvalues = {};
 	if func then
 		for upvalue_num = 1, math.huge do
@@ -31,7 +33,7 @@ local function get_upvalues_table(func)
 	return upvalues;
 end
 
-local function string_from_var_table(var_table, max_line_len, indent_str)
+function string_from_var_table(var_table, max_line_len, indent_str)
 	local var_string = {};
 	local col_pos = 0;
 	max_line_len = max_line_len or math.huge;
@@ -88,7 +90,7 @@ function get_traceback_table(thread, start_level)
 	return levels;
 end
 
-function debug.traceback(thread, message, level)
+function traceback(thread, message, level)
 	if type(thread) ~= "thread" then
 		thread, message, level = coroutine.running(), thread, message;
 	end
@@ -136,3 +138,9 @@ function debug.traceback(thread, message, level)
 	end
 	return message.."stack traceback:\n"..table.concat(lines, "\n");
 end
+
+function use()
+	debug.traceback = traceback;
+end
+
+return _M;
-- 
cgit v1.2.3


From de1fd4aaf27ca216bcbfeeeb197845078311aa13 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 24 Apr 2012 18:54:34 +0100
Subject: util.helpers: Add show_events(), to show the events and handlers in a
 util.events object

---
 util/helpers.lua | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'util')

diff --git a/util/helpers.lua b/util/helpers.lua
index a8c8c612..ad23dd79 100644
--- a/util/helpers.lua
+++ b/util/helpers.lua
@@ -6,6 +6,8 @@
 -- COPYING file in the source package for more information.
 --
 
+local debug = require "util.debug";
+
 module("helpers", package.seeall);
 
 -- Helper functions for debugging
@@ -31,6 +33,33 @@ function revert_log_events(events)
 	events.fire_event, events[events.fire_event] = events[events.fire_event], nil; -- :))
 end
 
+function show_events(events)
+	local event_handlers = events._handlers;
+	local events_array = {};
+	local event_handler_arrays = {};
+	for event in pairs(events._event_map) do
+		local handlers = event_handlers[event];
+		table.insert(events_array, event);
+		local handler_strings = {};
+		for i, handler in ipairs(handlers) do
+			local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler));
+			handler_strings[i] = "  "..i..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
+		end
+		event_handler_arrays[event] = handler_strings;
+	end
+	table.sort(events_array);
+	local i = 1;
+	repeat
+		local handlers = event_handler_arrays[events_array[i]];
+		for j=#handlers, 1, -1 do
+			table.insert(events_array, i+1, handlers[j]);
+		end
+		if i > 1 then events_array[i] = "\n"..events_array[i]; end
+		i = i + #handlers + 1
+	until i == #events_array;
+	return table.concat(events_array, "\n");
+end
+
 function get_upvalue(f, get_name)
 	local i, name, value = 0;
 	repeat
-- 
cgit v1.2.3


From 169deb9ca6cd622b09f2b186cc605be034a8a44a Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 25 Apr 2012 23:16:37 +0100
Subject: util.debug: Some more magic constant fiddling. Don't ask me.

---
 util/debug.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 7caf21ce..16773cd1 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -88,9 +88,9 @@ function get_traceback_table(thread, start_level)
 	for level = start_level, math.huge do
 		local info;
 		if thread then
-			info = debug.getinfo(thread, level);
+			info = debug.getinfo(thread, level+1);
 		else
-			info = debug.getinfo(level);
+			info = debug.getinfo(level+1);
 		end
 		if not info then break; end
 		
@@ -128,13 +128,13 @@ function _traceback(thread, message, level)
 		if type(message) == "number" then
 			level, message = message, nil;
 		else
-			level = 2;
+			level = 1;
 		end
 	end
 	
 	message = message and (message.."\n") or "";
 	
-	local levels = get_traceback_table(thread, level+2);
+	local levels = get_traceback_table(thread, level+3);
 	
 	local last_source_desc;
 	
-- 
cgit v1.2.3


From a0e480bef3460df549c48c6cbbc61fdaa083c3d2 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 26 Apr 2012 05:57:44 +0100
Subject: util.termcolours: tohtml() for converting output to HTML. I don't
 know.

---
 util/termcolours.lua | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'util')

diff --git a/util/termcolours.lua b/util/termcolours.lua
index df204688..6ef3b689 100644
--- a/util/termcolours.lua
+++ b/util/termcolours.lua
@@ -9,6 +9,7 @@
 
 local t_concat, t_insert = table.concat, table.insert;
 local char, format = string.char, string.format;
+local tonumber = tonumber;
 local ipairs = ipairs;
 local io_write = io.write;
 
@@ -34,6 +35,15 @@ local winstylemap = {
 	["1;31"] = 4+8 -- bold red
 }
 
+local cssmap = {
+	[1] = "font-weight: bold", [2] = "opacity: 0.5", [4] = "text-decoration: underline", [8] = "visibility: hidden",
+	[30] = "color:black", [31] = "color:red", [32]="color:green", [33]="color:#FFD700",
+	[34] = "color:blue", [35] = "color: magenta", [36] = "color:cyan", [37] = "color: white",
+	[40] = "background-color:black", [41] = "background-color:red", [42]="background-color:green",
+	[43]="background-color:yellow",	[44] = "background-color:blue", [45] = "background-color: magenta",
+	[46] = "background-color:cyan", [47] = "background-color: white";
+};
+
 local fmt_string = char(0x1B).."[%sm%s"..char(0x1B).."[0m";
 function getstring(style, text)
 	if style then
@@ -76,4 +86,17 @@ if windows then
 	end
 end
 
+local function ansi2css(ansi_codes)
+	if ansi_codes == "0" then return "</span>"; end
+	local css = {};
+	for code in ansi_codes:gmatch("[^;]+") do
+		t_insert(css, cssmap[tonumber(code)]);
+	end
+	return "</span><span style='"..t_concat(css, ";").."'>";
+end
+
+function tohtml(input)
+	return input:gsub("\027%[(.-)m", ansi2css);
+end
+
 return _M;
-- 
cgit v1.2.3


From 2444af151cabc8fdbfae9c3ed2b66eb10adde8ee Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 26 Apr 2012 05:58:39 +0100
Subject: util.debug: Remove 'white' from boundary style (leave at default
 colour)

---
 util/debug.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 16773cd1..1d3b5648 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -15,7 +15,7 @@ local styles;
 do
 	_ = termcolours.getstyle;
 	styles = {
-		boundary_padding = _("bright", "white");
+		boundary_padding = _("bright");
 		filename         = _("bright", "blue");
 		level_num        = _("green");
 		funcname         = _("yellow");
-- 
cgit v1.2.3


From ffb91300cca8ad4deff5b4f443f7d26933f90bee Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 26 Apr 2012 06:58:21 +0100
Subject: util.helpers: show_events(): Make more robust, and allow filtering
 results to a specific event

---
 util/helpers.lua | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'util')

diff --git a/util/helpers.lua b/util/helpers.lua
index ad23dd79..6103a319 100644
--- a/util/helpers.lua
+++ b/util/helpers.lua
@@ -33,30 +33,32 @@ function revert_log_events(events)
 	events.fire_event, events[events.fire_event] = events[events.fire_event], nil; -- :))
 end
 
-function show_events(events)
+function show_events(events, specific_event)
 	local event_handlers = events._handlers;
 	local events_array = {};
 	local event_handler_arrays = {};
 	for event in pairs(events._event_map) do
 		local handlers = event_handlers[event];
-		table.insert(events_array, event);
-		local handler_strings = {};
-		for i, handler in ipairs(handlers) do
-			local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler));
-			handler_strings[i] = "  "..i..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
+		if handlers and (event == specific_event or not specific_event) then
+			table.insert(events_array, event);
+			local handler_strings = {};
+			for i, handler in ipairs(handlers) do
+				local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler));
+				handler_strings[i] = "  "..i..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
+			end
+			event_handler_arrays[event] = handler_strings;
 		end
-		event_handler_arrays[event] = handler_strings;
 	end
 	table.sort(events_array);
 	local i = 1;
-	repeat
+	while i <= #events_array do
 		local handlers = event_handler_arrays[events_array[i]];
 		for j=#handlers, 1, -1 do
 			table.insert(events_array, i+1, handlers[j]);
 		end
 		if i > 1 then events_array[i] = "\n"..events_array[i]; end
 		i = i + #handlers + 1
-	until i == #events_array;
+	end
 	return table.concat(events_array, "\n");
 end
 
-- 
cgit v1.2.3


From 428aa05eb56db31b67a6c835525530b4f648735b Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 28 Apr 2012 02:38:56 +0100
Subject: util.stanza: Remove unused function imports

---
 util/stanza.lua | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'util')

diff --git a/util/stanza.lua b/util/stanza.lua
index 600212a4..1449f707 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -8,22 +8,16 @@
 
 
 local t_insert      =  table.insert;
-local t_concat      =  table.concat;
 local t_remove      =  table.remove;
 local t_concat      =  table.concat;
 local s_format      = string.format;
 local s_match       =  string.match;
 local tostring      =      tostring;
 local setmetatable  =  setmetatable;
-local getmetatable  =  getmetatable;
 local pairs         =         pairs;
 local ipairs        =        ipairs;
 local type          =          type;
-local next          =          next;
-local print         =         print;
-local unpack        =        unpack;
 local s_gsub        =   string.gsub;
-local s_char        =   string.char;
 local s_find        =   string.find;
 local os            =            os;
 
-- 
cgit v1.2.3


From ce25b6cbe15e1f10339956c9c3cc6a091f5ec585 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 28 Apr 2012 02:41:53 +0100
Subject: util.timer: Remove unused function imports

---
 util/timer.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'util')

diff --git a/util/timer.lua b/util/timer.lua
index d5b66473..d36fb8c4 100644
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -15,8 +15,7 @@ local math_min = math.min
 local math_huge = math.huge
 local get_time = require "socket".gettime;
 local t_insert = table.insert;
-local t_remove = table.remove;
-local ipairs, pairs = ipairs, pairs;
+local pairs = pairs;
 local type = type;
 
 local data = {};
-- 
cgit v1.2.3


From 3359d1e028dcc5f22a25d2117fcd1fa108923194 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 28 Apr 2012 14:31:02 +0100
Subject: util.httpstream: Remove COMPAT properties from request

---
 util/httpstream.lua | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'util')

diff --git a/util/httpstream.lua b/util/httpstream.lua
index bdc3fce7..190b3ed6 100644
--- a/util/httpstream.lua
+++ b/util/httpstream.lua
@@ -107,9 +107,6 @@ local function parser(success_cb, parser_type, options_cb)
 				httpversion = httpversion;
 				headers = headers;
 				body = body;
-				-- COMPAT the properties below are deprecated
-				responseversion = httpversion;
-				responseheaders = headers;
 			});
 		end
 	else coroutine.yield("unknown-parser-type"); end
-- 
cgit v1.2.3


From 0dd908250dfd49f0e2e483040744630e60e3fc9d Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 28 Apr 2012 16:20:26 +0100
Subject: util.debug: Re-fix parameter handling (I think it matches
 debug.traceback() more accurately now) and document level fudge

---
 util/debug.lua | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 1d3b5648..321b3267 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -119,21 +119,26 @@ end
 
 function _traceback(thread, message, level)
 
-	if type(thread) ~= "thread" then
+	-- Lua manual says: debug.traceback ([thread,] [message [, level]])
+	-- I fathom this to mean one of:
+	-- ()
+	-- (thread)
+	-- (message, level)
+	-- (thread, message, level)
+
+	if thread == nil then -- Defaults
+		thread, message, level = coroutine.running(), message, level;
+	elseif type(thread) == "string" then
 		thread, message, level = coroutine.running(), thread, message;
+	elseif type(thread) ~= "thread" then
+		return nil; -- debug.traceback() does this
 	end
-	if level and type(message) ~= "string" then
-		return nil, "invalid message";
-	elseif not level then
-		if type(message) == "number" then
-			level, message = message, nil;
-		else
-			level = 1;
-		end
-	end
-	
+
+	level = level or 1;
+
 	message = message and (message.."\n") or "";
 	
+	-- +3 counts for this function, and the pcall() and wrapper above us
 	local levels = get_traceback_table(thread, level+3);
 	
 	local last_source_desc;
-- 
cgit v1.2.3


From 4a8ac583de5767b4352cc19489e83037268d4c58 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 28 Apr 2012 16:21:19 +0100
Subject: util.debug: Add +1 to level when getting locals table, to account for
 current function

---
 util/debug.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/debug.lua b/util/debug.lua
index 321b3267..bff0e347 100644
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -97,7 +97,7 @@ function get_traceback_table(thread, start_level)
 		levels[(level-start_level)+1] = {
 			level = level;
 			info = info;
-			locals = get_locals_table(level);
+			locals = get_locals_table(level+1);
 			upvalues = get_upvalues_table(info.func);
 		};
 	end	
-- 
cgit v1.2.3