From 69e6633595327cfc99037eedec0f64821cafc569 Mon Sep 17 00:00:00 2001 From: "cbentzel@chromium.org" Date: Wed, 7 Apr 2010 14:41:40 +0000 Subject: Revert 43826 - 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). BUG=29862 TEST=net_unittests Review URL: http://codereview.chromium.org/1566012 TBR=cbentzel@chromium.org Review URL: http://codereview.chromium.org/1629005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43833 0039d316-1c4b-4281-b951-d872f2087c98 --- net/socket/socket_test_util.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'net/socket/socket_test_util.cc') diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index 587693f..4a8311c 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -52,7 +52,6 @@ bool MockClientSocket::IsConnectedAndIdle() const { int MockClientSocket::GetPeerAddress(AddressList* address) const { return net::SystemHostResolverProc("localhost", ADDRESS_FAMILY_UNSPECIFIED, - 0, address); } -- cgit v1.1