net/http/http_stream_factory_impl.cc - Issue 1878143005: SHP 4: Change AlternativeServiceMap to use SchemeHostPort as the key. No change to Pref data.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_stream_factory_impl.cc

Issue 1878143005: SHP 4: Change AlternativeServiceMap to use SchemeHostPort as the key. No change to Pref data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SHP_3

Patch Set: fix cronet && SpdyNetworkTransactionUnittests 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

« components/cronet/ios/cronet_environment.cc ('K') | « net/http/http_stream_factory.cc ('k') | net/http/http_stream_factory_impl_unittest.cc » ('j') | net/spdy/spdy_network_transaction_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_stream_factory_impl.cc

diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc

index d160c317468afb4e434d2b64dc23791d5402d682..614f65319567173719b444a676391ae5c18526c9 100644

--- a/net/http/http_stream_factory_impl.cc

+++ b/net/http/http_stream_factory_impl.cc

@@ -183,7 +183,7 @@ AlternativeService HttpStreamFactoryImpl::GetAlternativeServiceFor(

if (original_url.SchemeIs("ftp"))

return AlternativeService();

- HostPortPair origin = HostPortPair::FromURL(original_url);

+ url::SchemeHostPort origin(original_url);

HttpServerProperties& http_server_properties =

*session_->http_server_properties();

const AlternativeServiceVector alternative_service_vector =

@@ -226,7 +226,6 @@ AlternativeService HttpStreamFactoryImpl::GetAlternativeServiceFor(

origin.port() < kUnrestrictedPort))

continue;

- origin.set_port(alternative_service.port);

if (alternative_service.protocol >= NPN_SPDY_MINIMUM_VERSION &&

alternative_service.protocol <= NPN_SPDY_MAXIMUM_VERSION) {

if (!HttpStreamFactory::spdy_enabled())

@@ -252,7 +251,8 @@ AlternativeService HttpStreamFactoryImpl::GetAlternativeServiceFor(

continue;

}

- if (session_->quic_stream_factory()->IsQuicDisabled(origin.port()))

+ if (session_->quic_stream_factory()->IsQuicDisabled(

+ alternative_service.port))

continue;

if (!original_url.SchemeIs("https"))