# HG changeset patch # User Matthew Wild # Date 1275564567 -3600 # Node ID c6091977624bacf7537bffbbafd8583afbd728eb # Parent 0005df92d379a2c0b59ed6fe86004e914ed5f676# Parent 6eca858feb04d9b006bc040c530032aff84919dd Merge 0.7->trunk diff -r 0005df92d379 -r c6091977624b core/s2smanager.lua --- 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;