diff options
| author | agayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 21:34:47 +0000 |
|---|---|---|
| committer | agayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 21:34:47 +0000 |
| commit | 6e78dfb46a07e5ee38225e0cd32fa8b70ed41558 (patch) | |
| tree | c00c45283a8b8f86eb079395ee4ba56c9954c215 /net/base/host_resolver.h | |
| parent | a13cc36d904c699cd37f80a1c5200f21a7a54671 (diff) | |
| download | chromium_src-6e78dfb46a07e5ee38225e0cd32fa8b70ed41558.zip chromium_src-6e78dfb46a07e5ee38225e0cd32fa8b70ed41558.tar.gz chromium_src-6e78dfb46a07e5ee38225e0cd32fa8b70ed41558.tar.bz2 | |
HostResolverImpl: don't interpret NULL callback argument as a request to do synchronous resolution.
BUG=90547,60149
TEST=net_unittests
Review URL: http://codereview.chromium.org/7520026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94552 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/host_resolver.h')
| -rw-r--r-- | net/base/host_resolver.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/base/host_resolver.h b/net/base/host_resolver.h index 77977c1..53a86da 100644 --- a/net/base/host_resolver.h +++ b/net/base/host_resolver.h @@ -148,13 +148,16 @@ class NET_API HostResolver { // the sin(6)_port field of the sockaddr_in{6} struct. Returns OK if // successful or an error code upon failure. // - // When callback is null, the operation completes synchronously. - // - // When callback is non-null, the operation may be performed asynchronously. // If the operation cannnot be completed synchronously, ERR_IO_PENDING will // be returned and the real result code will be passed to the completion // callback. Otherwise the result code is returned immediately from this // call. + // + // When |callback| is null, there are two possibilities: either an IP + // address literal is being resolved or lookup should be performed from + // cache only, meaning info.only_use_cached_response() should be true; in + // both cases operation should complete synchronously. + // // If |out_req| is non-NULL, then |*out_req| will be filled with a handle to // the async request. This handle is not valid after the request has // completed. |