summaryrefslogtreecommitdiffstats
path: root/net/tools/flip_server
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 07:02:12 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 07:02:12 +0000
commite6ccc1a6314548b5cd74fc97513850e375bbcf92 (patch)
tree964fda3a01d4a583e172bc56f12769b8078408cb /net/tools/flip_server
parentf79da8da073d7ee29619ac3d0e6f76ec0dc9c624 (diff)
downloadchromium_src-e6ccc1a6314548b5cd74fc97513850e375bbcf92.zip
chromium_src-e6ccc1a6314548b5cd74fc97513850e375bbcf92.tar.gz
chromium_src-e6ccc1a6314548b5cd74fc97513850e375bbcf92.tar.bz2
Land Recent QUIC Changes.
QUIC refactor to move the receive algorithm from QuicCongestionManager into the ReceivedPacketManager. Part of a larger congestion control refactor. Merge internal change: 57325085 https://codereview.chromium.org/92593003/ Fix bug in cl/57315483 in which TerminateFromPeer(true) was turned into CloseReadSide(). This looks correct, except that QuicSpdyServerStream overrides this method so it wasn't being called. Merge internal change: 57324551 https://codereview.chromium.org/93083002/ Rename QuicStreamSequencer::IsHalfClosed -> IsClosed. The sequencer only has one path so it doesn't make much sense for it to be "half" closed. Rename ReliableQuicStream::IsHalfClosed -> IsDoneReading because the semantics are such that "IsHalfClosed" returned true when the fin had been read, but before the read side had actually been closed, which is confusing. Rename two QUIC methods, no behavior change. Merge internal change: 57315483 https://codereview.chromium.org/93073002/ The QuicAckNotifier should only be attached to a stream frame if the stream frame contains data. If we didn't consume any data (e.g. it is a FIN only frame), then attaching it to the frame results in use-after-delete. Fix use-after-delete in QuicAckNotifier. Merge internal change: 57311555 https://codereview.chromium.org/92813003/ Removed the unused compressed parameter from CreateSynStream, CreateSynReply and CreateHeaders methods. Code cleanup, no behavioural change. Merge internal change: 57308486 https://codereview.chromium.org/92793004/ Removing unnecessary received_truncated_ack_ local variable now that acks have an explicit truncation flag. Merge internal change: 57297471 https://codereview.chromium.org/92833003/ Change the Beta value used to reduce the TCP cubic congestion window in QUIC to 1/12, the same as SPDY. Merge internal change: 57269049 https://codereview.chromium.org/93033002/ R=rch@chromium.org Review URL: https://codereview.chromium.org/93523002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/flip_server')
-rw-r--r--net/tools/flip_server/spdy_interface.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tools/flip_server/spdy_interface.cc b/net/tools/flip_server/spdy_interface.cc
index a842437..e533c48 100644
--- a/net/tools/flip_server/spdy_interface.cc
+++ b/net/tools/flip_server/spdy_interface.cc
@@ -428,7 +428,7 @@ size_t SpdySM::SendSynStreamImpl(uint32 stream_id,
CopyHeaders(block, headers);
SpdyFrame* fsrcf = buffered_spdy_framer_->CreateSynStream(
- stream_id, 0, 0, 0, CONTROL_FLAG_NONE, true, &block);
+ stream_id, 0, 0, 0, CONTROL_FLAG_NONE, &block);
size_t df_size = fsrcf->size();
EnqueueDataFrame(new SpdyFrameDataFrame(fsrcf));
@@ -445,7 +445,7 @@ size_t SpdySM::SendSynReplyImpl(uint32 stream_id, const BalsaHeaders& headers) {
block["version"] = headers.response_version().as_string();
SpdyFrame* fsrcf = buffered_spdy_framer_->CreateSynReply(
- stream_id, CONTROL_FLAG_NONE, true, &block);
+ stream_id, CONTROL_FLAG_NONE, &block);
size_t df_size = fsrcf->size();
EnqueueDataFrame(new SpdyFrameDataFrame(fsrcf));