diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 21:28:19 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 21:28:19 +0000 |
| commit | 411895b89fd17f6d1812a060ced9a710a2059beb (patch) | |
| tree | 2a91b5f17bcdd5dbd647f2a4dd5004daa8e5fd08 | |
| parent | d6171a2cf601985cfea1448d79d6b487fdb727c4 (diff) | |
| download | chromium_src-411895b89fd17f6d1812a060ced9a710a2059beb.zip chromium_src-411895b89fd17f6d1812a060ced9a710a2059beb.tar.gz chromium_src-411895b89fd17f6d1812a060ced9a710a2059beb.tar.bz2 | |
Revert 284806 "Disable two recent Channel ID-related CLs to inve..."
The cause of the secure QUIC performance degradation has been
identified and fixed in r286400.
> Disable two recent Channel ID-related CLs to investigate a secure QUIC performance degradation.
>
> The change to quic_stream_factory.cc disables
> https://codereview.chromium.org/346323002/
>
> The change to quic_crypto_client_stream.cc disables
> https://codereview.chromium.org/355293003/
>
> R=rch@chromium.org
> BUG=396185
>
> Review URL: https://codereview.chromium.org/414523004
R=rch@chromium.org
BUG=396185
Review URL: https://codereview.chromium.org/444123003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287860 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/quic/quic_crypto_client_stream.cc | 4 | ||||
| -rw-r--r-- | net/quic/quic_stream_factory.cc | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/net/quic/quic_crypto_client_stream.cc b/net/quic/quic_crypto_client_stream.cc index 385df1a..d28860a 100644 --- a/net/quic/quic_crypto_client_stream.cc +++ b/net/quic/quic_crypto_client_stream.cc @@ -245,9 +245,7 @@ void QuicCryptoClientStream::DoHandshakeLoop( CloseConnectionWithDetails(error, error_details); return; } - // TODO(wtc): a temporary change to measure the performance penalty of - // pooling connections less often if channel ID is used. - // channel_id_sent_ = (channel_id_key_.get() != NULL); + channel_id_sent_ = (channel_id_key_.get() != NULL); if (cached->proof_verify_details()) { client_session()->OnProofVerifyDetailsAvailable( *cached->proof_verify_details()); diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc index 0b46e9c..ea30b2e 100644 --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc @@ -487,12 +487,8 @@ QuicStreamFactory::QuicStreamFactory( crypto_config_.AddCanonicalSuffix(".googlevideo.com"); crypto_config_.SetProofVerifier( new ProofVerifierChromium(cert_verifier, transport_security_state)); - // TODO(wtc): a temporary change to investigate the performance degradation - // caused by Channel ID lookup. -#if 0 crypto_config_.SetChannelIDSource( new ChannelIDSourceChromium(channel_id_service)); -#endif base::CPU cpu; if (cpu.has_aesni() && cpu.has_avx()) crypto_config_.PreferAesGcm(); |