diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 03:44:18 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 03:44:18 +0000 |
| commit | 86a782ce247e94a7b4da42f79603ba372870cbfc (patch) | |
| tree | 9773ae2e6b57df3e3c5536e7a52fc45211461de8 /chromeos/network | |
| parent | a14c261b32f0915842c305dfbc958c49af6905da (diff) | |
| download | chromium_src-86a782ce247e94a7b4da42f79603ba372870cbfc.zip chromium_src-86a782ce247e94a7b4da42f79603ba372870cbfc.tar.gz chromium_src-86a782ce247e94a7b4da42f79603ba372870cbfc.tar.bz2 | |
Flag myIpAddress requests for chromeos
This is a follow-up to https://codereview.chromium.org/238433003
We need to differentiate between myIpAddress requests and other
localhost requests so that local web servers and tests work correctly.
BUG=387109
Review URL: https://codereview.chromium.org/355953002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network')
| -rw-r--r-- | chromeos/network/host_resolver_impl_chromeos.cc | 2 | ||||
| -rw-r--r-- | chromeos/network/host_resolver_impl_chromeos_unittest.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chromeos/network/host_resolver_impl_chromeos.cc b/chromeos/network/host_resolver_impl_chromeos.cc index ad946e5..ebeb27aa 100644 --- a/chromeos/network/host_resolver_impl_chromeos.cc +++ b/chromeos/network/host_resolver_impl_chromeos.cc @@ -162,7 +162,7 @@ bool HostResolverImplChromeOS::ResolveLocalIPAddress( const RequestInfo& info, net::AddressList* addresses) { DCHECK(thread_checker_.CalledOnValidThread()); - if (info.hostname() != net::GetHostName() || ipv4_address_.empty()) + if (!info.is_my_ip_address() || ipv4_address_.empty()) return false; // Use IPConfig data for localhost address lookup. diff --git a/chromeos/network/host_resolver_impl_chromeos_unittest.cc b/chromeos/network/host_resolver_impl_chromeos_unittest.cc index 535eec9..e27175ed 100644 --- a/chromeos/network/host_resolver_impl_chromeos_unittest.cc +++ b/chromeos/network/host_resolver_impl_chromeos_unittest.cc @@ -156,6 +156,7 @@ TEST_F(HostResolverImplChromeOSTest, Resolve) { net::HostResolver::RequestInfo info( net::HostPortPair(net::GetHostName(), 80)); info.set_address_family(net::ADDRESS_FAMILY_IPV4); + info.set_is_my_ip_address(true); EXPECT_EQ(net::OK, CallResolve(info)); ASSERT_EQ(1u, addresses_.size()); std::string expected = base::StringPrintf("%s:%d", kTestIPv4Address, 0); |