Comparison

plugins/mod_dialback.lua @ 4841:ce793cea9f10

Merge with backout
author Matthew Wild <mwild1@gmail.com>
date Fri, 11 May 2012 01:32:46 +0100
parent 4837:9f1fb34cd7f8
parent 4840:82679fad3a36
child 4843:d91dda67647a
comparison
equal deleted inserted replaced
4839:4905aed00382 4841:ce793cea9f10
77 dialback_requests[attr.from.."/"..origin.streamid] = origin; 77 dialback_requests[attr.from.."/"..origin.streamid] = origin;
78 78
79 local compat_check; 79 local compat_check;
80 if not origin.from_host then 80 if not origin.from_host then
81 -- Just used for friendlier logging 81 -- Just used for friendlier logging
82 origin.from_host = nameprep(attr.from); 82 origin.from_host = attr.from;
83 -- COMPAT: Fix server's chopness by not including from
84 compat_check = true;
85 end 83 end
86 if not origin.to_host then 84 if not origin.to_host then
87 -- Just used for friendlier logging 85 -- Just used for friendlier logging
88 origin.to_host = nameprep(attr.to); 86 origin.to_host = nameprep(attr.to);
89 -- COMPAT: Fix server's chopness by not including to 87 -- COMPAT: Fix server's chopness by not including to