diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-01 20:01:24 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-01 20:01:24 +0000 |
commit | 4c3fe4ae337c8661c6370099bea9a5bcf5faf270 (patch) | |
tree | f9c7bc1c8eb0d775bef8b9bd3f0f3e3b74d196e8 /net/third_party/nss/ssl/sslsecur.c | |
parent | f8ba0bdf8fcf7dd46d3dd987685d727b3149467a (diff) | |
download | chromium_src-4c3fe4ae337c8661c6370099bea9a5bcf5faf270.zip chromium_src-4c3fe4ae337c8661c6370099bea9a5bcf5faf270.tar.gz chromium_src-4c3fe4ae337c8661c6370099bea9a5bcf5faf270.tar.bz2 |
Revert "Fix the case where the browser livelocks if we cannot open a file."
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/ssl/sslsecur.c')
-rw-r--r-- | net/third_party/nss/ssl/sslsecur.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/third_party/nss/ssl/sslsecur.c b/net/third_party/nss/ssl/sslsecur.c index a8184478..80c2ba6 100644 --- a/net/third_party/nss/ssl/sslsecur.c +++ b/net/third_party/nss/ssl/sslsecur.c @@ -148,12 +148,6 @@ ssl_Do1stHandshake(sslSocket *ss) ss->gs.readOffset = 0; break; } - if (ss->version >= SSL_LIBRARY_VERSION_3_0 && - (ss->ssl3.hs.ws == wait_change_cipher || - ss->ssl3.hs.ws == wait_new_session_ticket) && - ssl3_CanFalseStart(ss)) { - break; - } rv = (*ss->handshake)(ss); ++loopCount; /* This code must continue to loop on SECWouldBlock, |