Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 2756503002: Allow SpdySessionPool to find/create SpdySession with IP pooling disabled. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_proxy_client_socket_wrapper.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index c837f75a0780e9131920c6860c0f6f47fa1d500a..d50d24fe13707a6db60bb9cf4537ce6273b2a6aa 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -541,8 +541,9 @@ int HttpStreamFactoryImpl::Job::OnHostResolution(
// It is OK to dereference spdy_session_pool, because the
// ClientSocketPoolManager will be destroyed in the same callback that
// destroys the SpdySessionPool.
- return spdy_session_pool->FindAvailableSession(spdy_session_key, origin_url,
- net_log)
+ return spdy_session_pool->FindAvailableSession(
+ spdy_session_key, origin_url, /* enable_ip_based_pooling = */ true,
+ net_log)
? ERR_SPDY_SESSION_ALREADY_EXISTS
: OK;
}
@@ -952,7 +953,8 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionImpl() {
if (CanUseExistingSpdySession()) {
base::WeakPtr<SpdySession> spdy_session =
session_->spdy_session_pool()->FindAvailableSession(
- spdy_session_key, origin_url_, net_log_);
+ spdy_session_key, origin_url_, /* enable_ip_based_pooling = */ true,
+ net_log_);
if (spdy_session) {
// If we're preconnecting, but we already have a SpdySession, we don't
// actually need to preconnect any sockets, so we're done.
@@ -1034,7 +1036,8 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionComplete(int result) {
SpdySessionKey spdy_session_key = GetSpdySessionKey();
existing_spdy_session_ =
session_->spdy_session_pool()->FindAvailableSession(
- spdy_session_key, origin_url_, net_log_);
+ spdy_session_key, origin_url_,
+ /* enable_ip_based_pooling = */ true, net_log_);
if (existing_spdy_session_) {
using_spdy_ = true;
next_state_ = STATE_CREATE_STREAM;
@@ -1246,7 +1249,8 @@ int HttpStreamFactoryImpl::Job::DoCreateStream() {
if (!existing_spdy_session_) {
existing_spdy_session_ =
session_->spdy_session_pool()->FindAvailableSession(
- spdy_session_key, origin_url_, net_log_);
+ spdy_session_key, origin_url_,
+ /* enable_ip_based_pooling = */ true, net_log_);
}
bool direct = !IsHttpsProxyAndHttpUrl();
if (existing_spdy_session_.get()) {
« no previous file with comments | « net/http/http_proxy_client_socket_wrapper.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698