Merge with 0.6

This commit is contained in:
Matthew Wild 2010-02-25 18:03:15 +00:00
commit 52d66e5267
2 changed files with 7 additions and 5 deletions

View file

@ -48,7 +48,9 @@ local incoming_s2s = incoming_s2s;
module "s2smanager"
local function compare_srv_priorities(a,b) return a.priority < b.priority or a.weight < b.weight; end
function compare_srv_priorities(a,b)
return a.priority < b.priority or (a.priority == b.priority and a.weight > b.weight);
end
local function bounce_sendq(session, reason)
local sendq = session.sendq;