diff options
| author | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 17:32:12 +0000 |
|---|---|---|
| committer | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 17:32:12 +0000 |
| commit | 085ae9601431b16db2d143ac0acea8dc6d4801e7 (patch) | |
| tree | 10551672cfc61afa6b80b8a0959e85d57320a768 /net/base/host_resolver.cc | |
| parent | ab9279f87987825e5c40c12fef7fc22c4ceb0301 (diff) | |
| download | chromium_src-085ae9601431b16db2d143ac0acea8dc6d4801e7.zip chromium_src-085ae9601431b16db2d143ac0acea8dc6d4801e7.tar.gz chromium_src-085ae9601431b16db2d143ac0acea8dc6d4801e7.tar.bz2 | |
Document that the callback parameter of
HostResolver::Resolve can be null.
In tcp_client_socket_unittest.cc, allow sock.Connect
to succeed synchronously. Break out of the infinite
loop if sock.Read fails.
R=darin
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/host_resolver.cc')
| -rw-r--r-- | net/base/host_resolver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/base/host_resolver.cc b/net/base/host_resolver.cc index 6d79b46..5ba1c5b 100644 --- a/net/base/host_resolver.cc +++ b/net/base/host_resolver.cc @@ -166,7 +166,7 @@ int HostResolver::Resolve(const std::string& hostname, int port, const std::string& port_str = IntToString(port); - // Do a synchronous resolution? + // Do a synchronous resolution. if (!callback) { struct addrinfo* results; int rv = ResolveAddrInfo(hostname, port_str, &results); |