diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-06-03 12:29:27 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-06-03 12:29:27 +0100 |
| commit | 1486d4fdae138f0e45df3e8b6c3213978b27b46d (patch) | |
| tree | cdbd7d0165c8fd0c3be97c2fa3ced6e09048c1cc | |
| parent | 27ecf036809bda70b9d279b2bd94a2e7e40dd9c0 (diff) | |
| parent | ef6c6f531d1c2c9c16989ecf4d975009395536a1 (diff) | |
| download | prosody-1486d4fdae138f0e45df3e8b6c3213978b27b46d.tar.gz prosody-1486d4fdae138f0e45df3e8b6c3213978b27b46d.zip | |
Merge 0.7->trunk
| -rw-r--r-- | core/s2smanager.lua | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 7d39240f..ced367a3 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -256,7 +256,6 @@ function attempt_connection(host_session, err) 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; |