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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 1860343002: SHP 1: Change SupportsSpdy dict to use SchemeHostPort as the key. No change to Pref data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use proxy server scheme, remove hardcode Created 4 years, 8 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
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 8da356fdac32a21056e9bc20aaf7651d19f81f94..6382e825c4d58179cfab1797997351245f2bef75 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -257,7 +257,7 @@ int HttpStreamFactoryImpl::Job::Preconnect(int num_streams) {
session_->http_server_properties();
if (http_server_properties &&
http_server_properties->SupportsRequestPriority(
- HostPortPair::FromURL(request_info_.url))) {
+ url::SchemeHostPort(request_info_.url))) {
num_streams_ = 1;
} else {
num_streams_ = num_streams;
@@ -1424,11 +1424,16 @@ int HttpStreamFactoryImpl::Job::DoCreateStream() {
new_spdy_session_ = spdy_session;
spdy_session_direct_ = direct;
- const HostPortPair& host_port_pair = spdy_session_key.host_port_pair();
+ const HostPortPair host_port_pair = spdy_session_key.host_port_pair();
+ bool is_https = spdy_session_key.proxy_server().is_https();
Ryan Hamilton 2016/04/07 18:27:40 This doesn't seem right since you're checking the
Zhongyi Shi 2016/04/07 21:19:34 Sorry for miss that. Using SSL info on the session
+ url::SchemeHostPort scheme_host_port(is_https ? "https" : "http",
+ host_port_pair.host(),
+ host_port_pair.port());
+
base::WeakPtr<HttpServerProperties> http_server_properties =
session_->http_server_properties();
if (http_server_properties)
- http_server_properties->SetSupportsSpdy(host_port_pair, true);
+ http_server_properties->SetSupportsSpdy(scheme_host_port, true);
// Create a SpdyHttpStream or a BidirectionalStreamImpl attached to the
// session; OnNewSpdySessionReadyCallback is not called until an event loop

Powered by Google App Engine
This is Rietveld 408576698