diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 17:04:39 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 17:04:39 +0000 |
| commit | 38656ede631c0a2b6ff50164b272a29ff749b5bd (patch) | |
| tree | a7a4fa4afb0248ce8a67d981bc933f67b4a48e73 /net | |
| parent | cceb39bf4a939b70a563527a1df73e8d515605ad (diff) | |
| download | chromium_src-38656ede631c0a2b6ff50164b272a29ff749b5bd.zip chromium_src-38656ede631c0a2b6ff50164b272a29ff749b5bd.tar.gz chromium_src-38656ede631c0a2b6ff50164b272a29ff749b5bd.tar.bz2 | |
Set encryption_established_ to true in QuicCryptoClientStream before calling OnCryptoHandshakeEvent of the session.
Merge internal change: 46625931
Review URL: https://chromiumcodereview.appspot.com/15021018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/quic/quic_crypto_client_stream.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/quic/quic_crypto_client_stream.cc b/net/quic/quic_crypto_client_stream.cc index 75f5fd3..e6322a8 100644 --- a/net/quic/quic_crypto_client_stream.cc +++ b/net/quic/quic_crypto_client_stream.cc @@ -125,9 +125,9 @@ void QuicCryptoClientStream::DoHandshakeLoop( // the packets dropped when the client hello is dropped cause the // congestion control to be too conservative and the server times // out. + // encryption_established_ = true; // session()->OnCryptoHandshakeEvent( // QuicSession::ENCRYPTION_FIRST_ESTABLISHED); - // encryption_established_ = true; } else { session()->OnCryptoHandshakeEvent( QuicSession::ENCRYPTION_REESTABLISHED); @@ -229,9 +229,9 @@ void QuicCryptoClientStream::DoHandshakeLoop( // TODO(agl): this code shouldn't be here. See the TODO further up // about it. + encryption_established_ = true; session()->OnCryptoHandshakeEvent( QuicSession::ENCRYPTION_FIRST_ESTABLISHED); - encryption_established_ = true; handshake_confirmed_ = true; session()->OnCryptoHandshakeEvent(QuicSession::HANDSHAKE_CONFIRMED); |