Software / code / prosody
Changeset
5945:51ead0aa3a02
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 16 Dec 2013 02:04:16 +0000 |
| parents | 5941:31f14991070b (current diff) 5944:f3817912e8b2 (diff) |
| children | 5946:04f2138dfa87 5950:bd1d1c29a7e7 |
| files | plugins/muc/mod_muc.lua util/jid.lua |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/util/jid.lua Sat Dec 14 17:25:17 2013 +0100 +++ b/util/jid.lua Mon Dec 16 02:04:16 2013 +0000 @@ -8,7 +8,7 @@ -local match = string.match; +local match, sub = string.match, string.sub; local nodeprep = require "util.encodings".stringprep.nodeprep; local nameprep = require "util.encodings".stringprep.nameprep; local resourceprep = require "util.encodings".stringprep.resourceprep; @@ -47,6 +47,9 @@ local function _prepped_split(jid) local node, host, resource = _split(jid); if host then + if sub(host, -1, -1) == "." then -- Strip empty root label + host = sub(host, 1, -2); + end host = nameprep(host); if not host then return; end if node then
