diff options
author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 15:35:13 +0000 |
---|---|---|
committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 15:35:13 +0000 |
commit | 5ea28dea56c771da6bdf7471c14844332129f718 (patch) | |
tree | b474c2f97f021b431e9fee2a7df094e68c6ee0eb /chrome/test | |
parent | 0dc72bbeb04070039490e39c43f796c69601a796 (diff) | |
download | chromium_src-5ea28dea56c771da6bdf7471c14844332129f718.zip chromium_src-5ea28dea56c771da6bdf7471c14844332129f718.tar.gz chromium_src-5ea28dea56c771da6bdf7471c14844332129f718.tar.bz2 |
HostResolver now adds AI_CANONNAME to the hint flags if a requester needs the information.
Requests which want the canonical name should be treated differently from requests that do not for the same host in both the HostCache as well as in the HostResolver when combining multiple outstanding requests into a job.
The motivation for this is that Kerberos SPN's for a web server are typically generated using the canonical name of the server rather than a DNS alias (both Firefox and IE have this behavior).
(note: I had to revert http://codereview.chromium.org/1566012/show because net_unittests were crashing/hanging on the main buildbot, even though they weren't on the trybots. Trying to figure out why).
BUG=29862
TEST=net_unittests
Review URL: http://codereview.chromium.org/1593015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/unit/chrome_test_suite.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h index 9532579..3529801 100644 --- a/chrome/test/unit/chrome_test_suite.h +++ b/chrome/test/unit/chrome_test_suite.h @@ -59,6 +59,7 @@ class WarningHostResolverProc : public net::HostResolverProc { virtual int Resolve(const std::string& host, net::AddressFamily address_family, + net::HostResolverFlags host_resolver_flags, net::AddressList* addrlist) { const char* kLocalHostNames[] = {"localhost", "127.0.0.1"}; bool local = false; @@ -78,7 +79,8 @@ class WarningHostResolverProc : public net::HostResolverProc { // net::RuleBasedHostResolverProc and its AllowDirectLookup method. EXPECT_TRUE(local) << "Making external DNS lookup of " << host; - return ResolveUsingPrevious(host, address_family, addrlist); + return ResolveUsingPrevious(host, address_family, host_resolver_flags, + addrlist); } }; |