diff options
| author | Selim Gurun <sgurun@google.com> | 2014-08-06 16:36:51 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2014-08-19 11:01:57 -0700 |
| commit | 5dab2e1b1e11ac6d66c770a614bef53339977e74 (patch) | |
| tree | 563ce3740a5c9ce1931c448ade697dce7442e59e | |
| parent | 76d11724fbe26af7926f134538aa2b6b92360de8 (diff) | |
| download | chromium_org-kitkat-mr2-release.tar.gz | |
Disable SPDY poolingandroid-4.4.4_r2.0.1android-4.4.4_r1.0.1android-4.4.3_r1.1.0.1android-4.4.3_r1.0.1kitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-release
Bug: 16799113
The original patch is
https://codereview.chromium.org/417013005
We only take the SPDY part since Quic is not enabled.
Change-Id: Ie25ab23b1984d1e87e6019df0224fe8d7f388828
| -rw-r--r-- | net/spdy/spdy_session.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 9508f0e6af..0129368e8c 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -549,6 +549,10 @@ bool SpdySession::VerifyDomainAuthentication(const std::string& domain) { if (!GetSSLInfo(&ssl_info, &was_npn_negotiated, &protocol_negotiated)) return true; // This is not a secure session, so all domains are okay. + // Disable pooling for secure sessions. + // TODO(rch): re-enable this. + return false; +#if 0 bool unused = false; return !ssl_info.client_cert_sent && @@ -556,6 +560,7 @@ bool SpdySession::VerifyDomainAuthentication(const std::string& domain) { (ServerBoundCertService::GetDomainForHost(domain) == ServerBoundCertService::GetDomainForHost(host_port_pair().host()))) && ssl_info.cert->VerifyNameMatch(domain, &unused); +#endif } int SpdySession::GetPushStream( |