prosody
2eeae9c314b0%3A6ac173c88834
Software / code / prosody
Changeset
459:6ac173c88834
Automated merge with http://waqas.ath.cx/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 29 Nov 2008 01:01:19 +0000 |
| parents | 458:ac17926c3282 (diff) 455:2eeae9c314b0 (current diff) |
| children | 460:95d2001d0aab |
| files | main.lua |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 });
--- 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
