diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 21:38:46 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 21:38:46 +0000 |
| commit | c519295e83ab20eb42e58e40f28493df43d3d1c4 (patch) | |
| tree | 7552eb2c91d2af49831d1a4550ced17af25985bf /net/http | |
| parent | 016af54060c480dd1473e10f86bbf67f1fce85de (diff) | |
| download | chromium_src-c519295e83ab20eb42e58e40f28493df43d3d1c4.zip chromium_src-c519295e83ab20eb42e58e40f28493df43d3d1c4.tar.gz chromium_src-c519295e83ab20eb42e58e40f28493df43d3d1c4.tar.bz2 | |
Landing Recent QUIC Changes.
Change how QUIC negotiates pacing from congestion feedback to QUIC
connection option.
Merge internal change: 73061068
https://codereview.chromium.org/471613002/
Add max_bandwidth and max_bandwidth_timestamp to QUIC source address
token.
Merge internal change: 73055131
https://codereview.chromium.org/463093003/
Don't print (SCUP) in log message, the DebugString that follows contains
this already.
Merge internal change: 73054570
https://codereview.chromium.org/464893003/
Do not support Quic timestamp feedback type in the framer.
Merge internal change: 72905602
https://codereview.chromium.org/467893002/
Change QUIC's delayed ack timer from 100ms to 25ms.
Rationale: This delay kicks in when the receiver is waiting for a second
data packet before sending an ack, and 100ms seems inordinately long for
this wait. The timer fires per-packet in low-bandwidth network paths
(BW < ~384 kbps), where more frequent acks helps with (i) ack clocking,
and (ii) better bw estimation for BBR.
Merge internal change: 72788368
https://codereview.chromium.org/461183002/
QUIC - clean up changes to keep in sync with internal source tree.
https://codereview.chromium.org/454263002/
R=rch@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/471293002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_session.cc | 5 | ||||
| -rw-r--r-- | net/http/http_network_session.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc index b48d660..cebbb1d 100644 --- a/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc @@ -20,6 +20,7 @@ #include "net/quic/crypto/quic_random.h" #include "net/quic/quic_clock.h" #include "net/quic/quic_crypto_client_stream_factory.h" +#include "net/quic/quic_protocol.h" #include "net/quic/quic_stream_factory.h" #include "net/socket/client_socket_factory.h" #include "net/socket/client_socket_pool_manager_impl.h" @@ -87,7 +88,6 @@ HttpNetworkSession::Params::Params() enable_websocket_over_spdy(false), enable_quic(false), enable_quic_port_selection(true), - enable_quic_pacing(false), enable_quic_time_based_loss_detection(false), quic_clock(NULL), quic_random(NULL), @@ -129,7 +129,6 @@ HttpNetworkSession::HttpNetworkSession(const Params& params) params.quic_user_agent_id, params.quic_supported_versions, params.enable_quic_port_selection, - params.enable_quic_pacing, params.enable_quic_time_based_loss_detection, params.quic_connection_options), spdy_session_pool_(params.host_resolver, @@ -252,7 +251,7 @@ base::Value* HttpNetworkSession::QuicInfoToValue() const { dict->SetBoolean("enable_quic_port_selection", params_.enable_quic_port_selection); dict->SetBoolean("enable_quic_pacing", - params_.enable_quic_pacing); + ContainsQuicTag(params_.quic_connection_options, kPACE)); dict->SetBoolean("enable_quic_time_based_loss_detection", params_.enable_quic_time_based_loss_detection); dict->SetString("origin_to_force_quic_on", diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h index 21a692d..f62232a 100644 --- a/net/http/http_network_session.h +++ b/net/http/http_network_session.h @@ -110,7 +110,6 @@ class NET_EXPORT HttpNetworkSession bool enable_quic; bool enable_quic_port_selection; - bool enable_quic_pacing; bool enable_quic_time_based_loss_detection; HostPortPair origin_to_force_quic_on; QuicClock* quic_clock; // Will be owned by QuicStreamFactory. |