net/http/http_stream_factory_impl_job.cc - Issue 1540463003: Change the interface of GetAlternativeServicesFor, always return the best Alt-Svc entry.

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_job.cc

Issue 1540463003: Change the interface of GetAlternativeServicesFor, always return the best Alt-Svc entry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add a new testcase: use first exisiting quic session when multiple are available Created 5 years 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_stream_factory_impl_job.h ('k') | net/http/http_stream_factory_impl_request_unittest.cc » ('j') | net/quic/quic_network_transaction_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 eabbed0bba902d2475b00a21b1aff6706dadd966..89cfea45e8971e495ef82afa52f62365f5f01ed1 100644

--- a/net/http/http_stream_factory_impl_job.cc

+++ b/net/http/http_stream_factory_impl_job.cc

@@ -90,6 +90,8 @@ HttpStreamFactoryImpl::Job::Job(HttpStreamFactoryImpl* stream_factory,

RequestPriority priority,

const SSLConfig& server_ssl_config,

const SSLConfig& proxy_ssl_config,

+ HostPortPair server,

+ GURL origin_url,

NetLog* net_log)

: Job(stream_factory,

session,

@@ -97,9 +99,10 @@ HttpStreamFactoryImpl::Job::Job(HttpStreamFactoryImpl* stream_factory,

priority,

server_ssl_config,

proxy_ssl_config,

+ server,

+ origin_url,

AlternativeService(),

- net_log) {

+ net_log) {}

HttpStreamFactoryImpl::Job::Job(HttpStreamFactoryImpl* stream_factory,

HttpNetworkSession* session,

@@ -107,6 +110,8 @@ HttpStreamFactoryImpl::Job::Job(HttpStreamFactoryImpl* stream_factory,

RequestPriority priority,

const SSLConfig& server_ssl_config,

const SSLConfig& proxy_ssl_config,

+ HostPortPair server,

+ GURL origin_url,

AlternativeService alternative_service,

NetLog* net_log)

: request_(NULL),

@@ -121,6 +126,8 @@ HttpStreamFactoryImpl::Job::Job(HttpStreamFactoryImpl* stream_factory,

stream_factory_(stream_factory),

next_state_(STATE_NONE),

pac_request_(NULL),

+ server_(server),

+ origin_url_(origin_url),

alternative_service_(alternative_service),

blocking_job_(NULL),

waiting_job_(NULL),

@@ -660,13 +667,6 @@ int HttpStreamFactoryImpl::Job::StartInternal() {

}

int HttpStreamFactoryImpl::Job::DoStart() {

- if (IsSpdyAlternative() || IsQuicAlternative()) {

- server_ = alternative_service_.host_port_pair();

- } else {

- server_ = HostPortPair::FromURL(request_info_.url);

- }

- origin_url_ =

- stream_factory_->ApplyHostMappingRules(request_info_.url, &server_);

valid_spdy_session_pool_.reset(new ValidSpdySessionPool(

session_->spdy_session_pool(), origin_url_, IsSpdyAlternative()));