Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Mon, 16 Dec 2013 02:04:16 +0000
changeset 5945 51ead0aa3a02
parent 5941 31f14991070b (current diff)
parent 5944 f3817912e8b2 (diff)
child 5946 04f2138dfa87
child 5950 bd1d1c29a7e7
Merge 0.9->0.10
plugins/muc/mod_muc.lua file | annotate | diff | comparison | revisions
util/jid.lua file | annotate | diff | comparison | revisions 
--- 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
prosody