summaryrefslogtreecommitdiffstats
path: root/net/quic/quic_crypto_server_stream.cc
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-15 21:38:46 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-15 21:38:46 +0000
commitc519295e83ab20eb42e58e40f28493df43d3d1c4 (patch)
tree7552eb2c91d2af49831d1a4550ced17af25985bf /net/quic/quic_crypto_server_stream.cc
parent016af54060c480dd1473e10f86bbf67f1fce85de (diff)
downloadchromium_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/quic/quic_crypto_server_stream.cc')
-rw-r--r--net/quic/quic_crypto_server_stream.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/quic/quic_crypto_server_stream.cc b/net/quic/quic_crypto_server_stream.cc
index 8e07f54..df8f0d8 100644
--- a/net/quic/quic_crypto_server_stream.cc
+++ b/net/quic/quic_crypto_server_stream.cc
@@ -170,7 +170,7 @@ void QuicCryptoServerStream::SendServerConfigUpdate() {
return;
}
- DVLOG(1) << "Server: Sending server config update (SCUP): "
+ DVLOG(1) << "Server: Sending server config update: "
<< server_config_update_message.DebugString();
const QuicData& data = server_config_update_message.GetSerialized();
WriteOrBufferData(string(data.data(), data.length()), false, NULL);