respect user pinning in M-A:same version (un)screwing

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index b4cd17ca867a7725a9a0c27e9268c5926ee72a7c..07a730b887bdfa17f61b91537cd8a4774fb98590 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -165,6 +165,8 @@ static bool ConnectToHostname(std::string const &Host, int const Port,
       memset(&Hints,0,sizeof(Hints));
       Hints.ai_socktype = SOCK_STREAM;
       Hints.ai_flags = 0;
+      if (_config->FindB("Acquire::Connect::IDN", true) == true)
+        Hints.ai_flags |= AI_IDN;
       // see getaddrinfo(3): only return address if system has such a address configured
       // useful if system is ipv4 only, to not get ipv6, but that fails if the system has
       // no address configured: e.g. offline and trying to connect to localhost.
@@ -286,12 +288,10 @@ bool Connect(std::string Host,int Port,const char *Service,
    // try to connect in the priority order of the srv records
    while(SrvRecords.size() > 0)
    {
+      // PopFromSrvRecs will also remove the server
       Host = PopFromSrvRecs(SrvRecords).target;
       if(ConnectToHostname(Host, Port, Service, DefPort, Fd, TimeOut, Owner))
          return true;
-
-      // we couldn't connect to this one, use the next
-      SrvRecords.erase(SrvRecords.begin());
    }
 
    return false;