diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 17:50:41 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 17:50:41 +0000 |
| commit | 2aa021282aa83a7493bc72677ffe83a8e5183892 (patch) | |
| tree | 0768e621b38983580671c7246a818c3e11156149 /net/socket/ssl_client_socket_unittest.cc | |
| parent | 5d73fd829e999f420bdf36701b418004c9551659 (diff) | |
| download | chromium_src-2aa021282aa83a7493bc72677ffe83a8e5183892.zip chromium_src-2aa021282aa83a7493bc72677ffe83a8e5183892.tar.gz chromium_src-2aa021282aa83a7493bc72677ffe83a8e5183892.tar.bz2 | |
Don't resolve IP literals.
For each resolution request this checks to see if this 'host' is a literal ip address. If so, it synthesises a struct addrinfo and returns it without adding it to the cache.
BUG=39830
TEST=unit tests, new and old
Review URL: http://codereview.chromium.org/3023048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_unittest.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index c242db1..1131c0c 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -257,9 +257,6 @@ TEST_F(SSLClientSocketTest, Read) { net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort); int rv = resolver_->Resolve(info, &addr, &callback, NULL, net::BoundNetLog()); - EXPECT_EQ(net::ERR_IO_PENDING, rv); - - rv = callback.WaitForResult(); EXPECT_EQ(net::OK, rv); net::ClientSocket* transport = new net::TCPClientSocket(addr, NULL); @@ -319,9 +316,6 @@ TEST_F(SSLClientSocketTest, Read_FullDuplex) { net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort); int rv = resolver_->Resolve(info, &addr, &callback, NULL, net::BoundNetLog()); - EXPECT_EQ(net::ERR_IO_PENDING, rv); - - rv = callback.WaitForResult(); EXPECT_EQ(net::OK, rv); net::ClientSocket* transport = new net::TCPClientSocket(addr, NULL); |