net/tools/quic/quic_server_session.cc - Issue 1037643002: Land Recent QUIC Changes until 03/22/2015.

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/tools/quic/quic_server_session.cc

Issue 1037643002: Land Recent QUIC Changes until 03/22/2015. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: deleted duplicated using statements in net/tools/quic/test_tools/quic_test_utils.cc Created 5 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:

Index: net/tools/quic/quic_server_session.cc

diff --git a/net/tools/quic/quic_server_session.cc b/net/tools/quic/quic_server_session.cc

index bfa20bfbc141231f1c98f345ce8da3b34ea9967e..6c1105e6b1bb8f4b553f11e6d9c46355612272df 100644

--- a/net/tools/quic/quic_server_session.cc

+++ b/net/tools/quic/quic_server_session.cc

@@ -48,11 +48,14 @@ void QuicServerSession::OnConfigNegotiated() {

// bandwidth resumption.

const CachedNetworkParameters* cached_network_params =

crypto_stream_->previous_cached_network_params();

- if (FLAGS_quic_enable_bandwidth_resumption_experiment &&

- cached_network_params != nullptr &&

- ContainsQuicTag(config()->ReceivedConnectionOptions(), kBWRE) &&

+ const bool max_bandwidth_resumption =

+ ContainsQuicTag(config()->ReceivedConnectionOptions(), kBWMX);

+ if (cached_network_params != nullptr &&

+ (ContainsQuicTag(config()->ReceivedConnectionOptions(), kBWRE) ||

+ max_bandwidth_resumption) &&

cached_network_params->serving_region() == serving_region_) {

- connection()->ResumeConnectionState(*cached_network_params);

+ connection()->ResumeConnectionState(*cached_network_params,

+ max_bandwidth_resumption);

}

if (FLAGS_enable_quic_fec &&

« no previous file with comments | « net/tools/quic/quic_dispatcher_test.cc ('k') | net/tools/quic/quic_server_session_test.cc » ('j') | no next file with comments »