aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-25 18:08:59 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-25 18:08:59 +0000
commite224080a1416a55366b82243eb1fa92052f096fc (patch)
tree694651bed0dd85190842359c60cb71eb006723ef /core
parent2113d0d2552f174a2f86789323ac0c10d3d1e210 (diff)
parent52d66e52676c48d453fa286be2c5587dce80afb4 (diff)
downloadprosody-e224080a1416a55366b82243eb1fa92052f096fc.tar.gz
prosody-e224080a1416a55366b82243eb1fa92052f096fc.zip
Merge with 0.7
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 875a6bdc..16ede7b6 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -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;