diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 20:12:28 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 20:12:28 +0000 |
| commit | 0dc88b379e74db1f8240062e8f9fc64a5753b3cd (patch) | |
| tree | a0804fb95a36489da03b685a07ab7fec8e471dab /net/socket/ssl_client_socket_nss.cc | |
| parent | 5f95e5312410f2f26254ec17d2adbe2c75395152 (diff) | |
| download | chromium_src-0dc88b379e74db1f8240062e8f9fc64a5753b3cd.zip chromium_src-0dc88b379e74db1f8240062e8f9fc64a5753b3cd.tar.gz chromium_src-0dc88b379e74db1f8240062e8f9fc64a5753b3cd.tar.bz2 | |
Use sockets with unread data if they've never been used before.
This fixes preconnects to SPDY-capable origins. StreamSocket's semantics
change slightly. WasEverUsed() for layered sockets is now whether the top-level
socket has read or written user data, rather than whether the underlying
transport socket was used.
Change SSL and SOCKS socket implementations to use the new WasEverUsed()
semantics. This doesn't affect SOCKS much except that preconnect misses now
time out more aggressively. For SSL, it fixes the SPDY issue.
Add tests for SSL socket and socket pool implementations.
BUG=334467
Review URL: https://codereview.chromium.org/169643006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index ca5a689..2d3f669 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -636,9 +636,10 @@ class SSLClientSocketNSS::Core : public base::RefCountedThreadSafe<Core> { int Write(IOBuffer* buf, int buf_len, const CompletionCallback& callback); // Called on the network task runner. - bool IsConnected(); - bool HasPendingAsyncOperation(); - bool HasUnhandledReceivedData(); + bool IsConnected() const; + bool HasPendingAsyncOperation() const; + bool HasUnhandledReceivedData() const; + bool WasEverUsed() const; // Called on the network task runner. // Causes the associated SSL/TLS session ID to be added to NSS's session @@ -841,6 +842,10 @@ class SSLClientSocketNSS::Core : public base::RefCountedThreadSafe<Core> { bool nss_waiting_write_; bool nss_is_closed_; + // Set when Read() or Write() successfully reads or writes data to or from the + // network. + bool was_ever_used_; + //////////////////////////////////////////////////////////////////////////// // Members that are ONLY accessed on the NSS task runner: //////////////////////////////////////////////////////////////////////////// @@ -936,6 +941,7 @@ SSLClientSocketNSS::Core::Core( nss_waiting_read_(false), nss_waiting_write_(false), nss_is_closed_(false), + was_ever_used_(false), host_and_port_(host_and_port), ssl_config_(ssl_config), nss_fd_(NULL), @@ -1148,8 +1154,11 @@ int SSLClientSocketNSS::Core::Read(IOBuffer* buf, int buf_len, return ERR_IO_PENDING; } else { DCHECK(!nss_waiting_read_); - if (rv <= 0) + if (rv <= 0) { nss_is_closed_ = true; + } else { + was_ever_used_ = true; + } } } @@ -1202,29 +1211,37 @@ int SSLClientSocketNSS::Core::Write(IOBuffer* buf, int buf_len, return ERR_IO_PENDING; } else { DCHECK(!nss_waiting_write_); - if (rv < 0) + if (rv < 0) { nss_is_closed_ = true; + } else if (rv > 0) { + was_ever_used_ = true; + } } } return rv; } -bool SSLClientSocketNSS::Core::IsConnected() { +bool SSLClientSocketNSS::Core::IsConnected() const { DCHECK(OnNetworkTaskRunner()); return !nss_is_closed_; } -bool SSLClientSocketNSS::Core::HasPendingAsyncOperation() { +bool SSLClientSocketNSS::Core::HasPendingAsyncOperation() const { DCHECK(OnNetworkTaskRunner()); return nss_waiting_read_ || nss_waiting_write_; } -bool SSLClientSocketNSS::Core::HasUnhandledReceivedData() { +bool SSLClientSocketNSS::Core::HasUnhandledReceivedData() const { DCHECK(OnNetworkTaskRunner()); return unhandled_buffer_size_ != 0; } +bool SSLClientSocketNSS::Core::WasEverUsed() const { + DCHECK(OnNetworkTaskRunner()); + return was_ever_used_; +} + void SSLClientSocketNSS::Core::CacheSessionIfNecessary() { // TODO(rsleevi): This should occur on the NSS task runner, due to the use of // nss_fd_. However, it happens on the network task runner in order to match @@ -2656,16 +2673,22 @@ void SSLClientSocketNSS::Core::DidNSSRead(int result) { DCHECK(OnNetworkTaskRunner()); DCHECK(nss_waiting_read_); nss_waiting_read_ = false; - if (result <= 0) + if (result <= 0) { nss_is_closed_ = true; + } else { + was_ever_used_ = true; + } } void SSLClientSocketNSS::Core::DidNSSWrite(int result) { DCHECK(OnNetworkTaskRunner()); DCHECK(nss_waiting_write_); nss_waiting_write_ = false; - if (result < 0) + if (result < 0) { nss_is_closed_ = true; + } else if (result > 0) { + was_ever_used_ = true; + } } void SSLClientSocketNSS::Core::BufferSendComplete(int result) { @@ -3025,11 +3048,9 @@ void SSLClientSocketNSS::SetOmniboxSpeculation() { } bool SSLClientSocketNSS::WasEverUsed() const { - if (transport_.get() && transport_->socket()) { - return transport_->socket()->WasEverUsed(); - } - NOTREACHED(); - return false; + DCHECK(core_.get()); + + return core_->WasEverUsed(); } bool SSLClientSocketNSS::UsingTCPFastOpen() const { |