X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/23d35ec15a849ee755f51a99939b0131e8faefa5..b50dfa6b2dd2d459e0c2746ac9367982b96ffac0:/methods/connect.cc diff --git a/methods/connect.cc b/methods/connect.cc index b4cd17ca8..07a730b88 100644 --- 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;