aboutsummaryrefslogtreecommitdiffstats
path: root/util/jid.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-16 02:04:43 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-16 02:04:43 +0000
commit1f0a67c0df2212951c8ab693e4ab9b1088cfb11c (patch)
tree0342a9d6cca7783cc788e35fcdb464b904cde942 /util/jid.lua
parentc680f0d75a09ea19ca159d14ffb68e40ada91c90 (diff)
parent077a959dbc316d125f047c28f6a5eb89569dcf07 (diff)
downloadprosody-1f0a67c0df2212951c8ab693e4ab9b1088cfb11c.tar.gz
prosody-1f0a67c0df2212951c8ab693e4ab9b1088cfb11c.zip
Merge 0.10->trunk
Diffstat (limited to 'util/jid.lua')
-rw-r--r--util/jid.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/util/jid.lua b/util/jid.lua
index 0d9a864f..08e63335 100644
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -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 @@ end
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