diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-26 17:59:51 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-26 17:59:51 +0000 |
| commit | 0c7798459922d970a2eb43039a2a5733bb94ae2e (patch) | |
| tree | 648b15f61e1d7135f12fb648195e0806b8193dd2 /net/base/host_resolver_impl.cc | |
| parent | c248be0e84cda8fb1870db68a3127b2e9fae057c (diff) | |
| download | chromium_src-0c7798459922d970a2eb43039a2a5733bb94ae2e.zip chromium_src-0c7798459922d970a2eb43039a2a5733bb94ae2e.tar.gz chromium_src-0c7798459922d970a2eb43039a2a5733bb94ae2e.tar.bz2 | |
Refactor: Change the interface from HostResolver::DisableIPv6() to HostResolver::SetDefaultAddressFamily(), to make it more general.
This came up in a codereview comment, but was after I had checked in.
Review URL: http://codereview.chromium.org/303026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/host_resolver_impl.cc')
| -rw-r--r-- | net/base/host_resolver_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc index 6b5a20f..47b2aa3 100644 --- a/net/base/host_resolver_impl.cc +++ b/net/base/host_resolver_impl.cc @@ -293,7 +293,7 @@ HostResolverImpl::HostResolverImpl(HostResolverProc* resolver_proc, : cache_(max_cache_entries, cache_duration_ms), next_request_id_(0), resolver_proc_(resolver_proc), - disable_ipv6_(false), + default_address_family_(ADDRESS_FAMILY_UNSPECIFIED), shutdown_(false) { #if defined(OS_WIN) EnsureWinsockInit(); @@ -330,8 +330,8 @@ int HostResolverImpl::Resolve(const RequestInfo& info, // Build a key that identifies the request in the cache and in the // outstanding jobs map. Key key(info.hostname(), info.address_family()); - if (disable_ipv6_) - key.address_family = ADDRESS_FAMILY_IPV4; + if (key.address_family == ADDRESS_FAMILY_UNSPECIFIED) + key.address_family = default_address_family_; // If we have an unexpired cache entry, use it. if (info.allow_cached_response()) { |