Backport r16212 and r16695 from the trunk to the 172...

net/base/host_resolver.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/host_resolver.h"
 
 #if defined(OS_WIN)
 #include <ws2tcpip.h>
 #include <wspiapi.h>  // Needed for Win2k compat.
 #elif defined(OS_POSIX)
@@ skipping 22 matching lines @@
 }
 
 HostMapper* SetHostMapper(HostMapper* value) {
   std::swap(host_mapper, value);
   return value;
 }
 
 static int HostResolverProc(
     const std::string& host, const std::string& port, struct addrinfo** out) {
   struct addrinfo hints = {0};
-  hints.ai_family = PF_UNSPEC;
+  hints.ai_family = AF_UNSPEC;
+
+#if defined(OS_WIN)
+  // DO NOT USE AI_ADDRCONFIG ON WINDOWS.
+  //
+  // The following comment in <winsock2.h> is the best documentation I found
+  // on AI_ADDRCONFIG for Windows:
+  //   Flags used in "hints" argument to getaddrinfo()
+  //       - AI_ADDRCONFIG is supported starting with Vista
+  //       - default is AI_ADDRCONFIG ON whether the flag is set or not
+  //         because the performance penalty in not having ADDRCONFIG in
+  //         the multi-protocol stack environment is severe;
+  //         this defaulting may be disabled by specifying the AI_ALL flag,
+  //         in that case AI_ADDRCONFIG must be EXPLICITLY specified to
+  //         enable ADDRCONFIG behavior
+  //
+  // Not only is AI_ADDRCONFIG unnecessary, but it can be harmful.  If the
+  // computer is not connected to a network, AI_ADDRCONFIG causes getaddrinfo
+  // to fail with WSANO_DATA (11004) for "localhost", probably because of the
+  // following note on AI_ADDRCONFIG in the MSDN getaddrinfo page:
+  //   The IPv4 or IPv6 loopback address is not considered a valid global
+  //   address.
+  // See http://crbug.com/5234.
+  hints.ai_flags = 0;
+#else
   hints.ai_flags = AI_ADDRCONFIG;
+#endif
 
   // Restrict result set to only this socket type to avoid duplicates.
   hints.ai_socktype = SOCK_STREAM;
 
   int err = getaddrinfo(host.c_str(), port.c_str(), &hints, out);
   return err ? ERR_NAME_NOT_RESOLVED : OK;
 }
 
 static int ResolveAddrInfo(HostMapper* mapper, const std::string& host,
                            const std::string& port, struct addrinfo** out) {
@@ skipping 144 matching lines @@
           NewRunnableMethod(request_.get(), &Request::DoLookup), true)) {
     NOTREACHED();
     request_ = NULL;
     return ERR_FAILED;
   }
 
   return ERR_IO_PENDING;
 }
 
 }  // namespace net