diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 23:23:31 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 23:23:31 +0000 |
| commit | 45965de15b7d03722dc2e9cd81edcb7ad7b8d7f2 (patch) | |
| tree | 9c6cb200b9dab9513885443410fee7021aedb39a /net | |
| parent | 6fc1a12eaad5d59282fc27d091abcb2ba95dea11 (diff) | |
| download | chromium_src-45965de15b7d03722dc2e9cd81edcb7ad7b8d7f2.zip chromium_src-45965de15b7d03722dc2e9cd81edcb7ad7b8d7f2.tar.gz chromium_src-45965de15b7d03722dc2e9cd81edcb7ad7b8d7f2.tar.bz2 | |
SSL: stop network traffic from interfering with NSS.
Patch written by Adam Langley of Google.
Original review URL: http://codereview.chromium.org/661108
R=wtc
BUG=36770
TEST=none
Review URL: http://codereview.chromium.org/660131
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40066 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 2c703d6..311b054 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -773,7 +773,7 @@ void SSLClientSocketNSS::OnHandshakeIOComplete(int result) { void SSLClientSocketNSS::OnSendComplete(int result) { EnterFunction(result); - if (next_handshake_state_ != STATE_NONE) { + if (next_handshake_state_ == STATE_HANDSHAKE) { // In handshake phase. OnHandshakeIOComplete(result); LeaveFunction(""); @@ -805,7 +805,7 @@ void SSLClientSocketNSS::OnSendComplete(int result) { void SSLClientSocketNSS::OnRecvComplete(int result) { EnterFunction(result); - if (next_handshake_state_ != STATE_NONE) { + if (next_handshake_state_ == STATE_HANDSHAKE) { // In handshake phase. OnHandshakeIOComplete(result); LeaveFunction(""); |