Software / code / prosody
Changeset
3152:c6091977624b
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 03 Jun 2010 12:29:27 +0100 |
| parents | 3150:0005df92d379 (current diff) 3151:6eca858feb04 (diff) |
| children | 3153:fd435cab928f 3159:b01a699ddf64 |
| files | core/s2smanager.lua |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/s2smanager.lua Wed Jun 02 21:34:16 2010 +0100 +++ b/core/s2smanager.lua Thu Jun 03 12:29:27 2010 +0100 @@ -256,7 +256,6 @@ end end); - log("debug", "DNS lookup for %s sent, waiting for response before we can connect", to_host); return true; -- Attempt in progress elseif host_session.srv_hosts and #host_session.srv_hosts > host_session.srv_choice then -- Not our first attempt, and we also have SRV host_session.srv_choice = host_session.srv_choice + 1;
