diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-03 00:58:40 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-03 00:58:40 +0000 |
| commit | e6be1d9e523521186cfa9e2cc627aaa605285916 (patch) | |
| tree | 29c3a6ff7ef9c43d8a5e899496c272640a8faa79 /net | |
| parent | 09430dca4e068fd606370617f4304d66ac1fffa8 (diff) | |
| download | chromium_src-e6be1d9e523521186cfa9e2cc627aaa605285916.zip chromium_src-e6be1d9e523521186cfa9e2cc627aaa605285916.tar.gz chromium_src-e6be1d9e523521186cfa9e2cc627aaa605285916.tar.bz2 | |
Revert r98279 partially to disable the STATE_LOAD_SSL_HOST_INFO state
by default.
It may have caused the DCHECK failure in
DiskCacheBasedSSLHostInfo::WaitForDataReady() (bug 94937).
R=agl@chromium.org,cbentzel@chromium.org
BUG=84426,94937
TEST=none
Review URL: http://codereview.chromium.org/7824023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 0965cc56..186cc86 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -611,7 +611,7 @@ int SSLClientSocketNSS::Connect(CompletionCallback* callback) { return rv; } - if (ssl_host_info_.get()) { + if (ssl_config_.cached_info_enabled && ssl_host_info_.get()) { GotoState(STATE_LOAD_SSL_HOST_INFO); } else { GotoState(STATE_HANDSHAKE); @@ -1396,7 +1396,7 @@ int SSLClientSocketNSS::DoLoadSSLHostInfo() { GotoState(STATE_HANDSHAKE); if (rv == OK) { - if (ssl_config_.cached_info_enabled && !LoadSSLHostInfo()) + if (!LoadSSLHostInfo()) LOG(WARNING) << "LoadSSLHostInfo failed: " << host_and_port_.ToString(); } else { DCHECK_EQ(ERR_IO_PENDING, rv); |