# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1227920479 0
# Node ID 6ac173c88834e6989f1bdd490cefd88d8ae9c8a7
# Parent  ac17926c3282df32f836e155b4efeab1c8474ad1# Parent  2eeae9c314b094d2e291d707a7956046eb90e835
Automated merge with http://waqas.ath.cx/

diff -r 2eeae9c314b0 -r 6ac173c88834 util/datamanager.lua
--- a/util/datamanager.lua	Sat Nov 29 01:00:04 2008 +0000
+++ b/util/datamanager.lua	Sat Nov 29 01:01:19 2008 +0000
@@ -3,7 +3,7 @@
 local pairs, ipairs = pairs, ipairs;
 local char = string.char;
 local loadfile, setfenv, pcall = loadfile, setfenv, pcall;
-local log = log;
+local log = require "util.logger".init("datamanager");
 local io_open = io.open;
 local os_remove = os.remove;
 local tostring, tonumber = tostring, tonumber;
@@ -25,8 +25,6 @@
 ---- utils -----
 local encode, decode;
 
-local log = function (type, msg) return log(type, "datamanager", msg); end
-
 do 
 	local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
 
diff -r 2eeae9c314b0 -r 6ac173c88834 util/sasl.lua
--- a/util/sasl.lua	Sat Nov 29 01:00:04 2008 +0000
+++ b/util/sasl.lua	Sat Nov 29 01:01:19 2008 +0000
@@ -66,7 +66,7 @@
 	
 	local function parse(data)
 		message = {}
-		for k, v in gmatch(data, [[([%w%-]+)="?([%w%-%/%.%+=]+)"?,?]]) do
+		for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
 			message[k] = v
 		end
 		return message