Landing Recent QUIC changes until 12/14/2015 21:22:02 UTC

***********************************************************
Except for:
cl/110183490: Actually use RFC 7539 encrypters and decrypters in QUIC. Protected by --gfe2_reloadable_flag_quic_use_rfc7539.

cl/110165324: Add new RFC 7539 variants of ChaCha20 Poly 1305 encrypters and decrypters to QUIC.

n/a - not currently used

***********************************************************
relnote: Adds a --body_hex flag to quic_client_bin to allow POST message body to be specified as a hex string, converted with a2b_hex before sending.

e.g../quic_client_bin--body_hex="68656c6c6f2c20776f726c6421"

This is helpful for gRPC-over-QUIC testing.

n/a (toy quic client)

Merge internal change: 110185550
https://codereview.chromium.org/1532113002/

relnote: Turn on the trailers support flag in the toy QUIC client.

n/a (quic toy client)

Merge internal change: 110183495
https://codereview.chromium.org/1531783002/

relnote: Set QuicPacketCreator's should_fec_protect_next_packet only within QuicPacketCreator.  No functional change.

Merge internal change: 110177994
https://codereview.chromium.org/1531603002/

relnote: Fix a bug protected by gfe_reloadable_flag_quic_respect_send_alarm where acks would not be sent immediately.

Merge internal change: 110173060
https://codereview.chromium.org/1531543004/

relnote: Make QuicSpdyStream::WriteTrailers virtual for tests. No behavior change.

Merge internal change: 110021608
https://codereview.chromium.org/1529953003/

relnote: Remove QuicPacketGenerator::OnSerializedPacket with functionality in QuicPacketCreator.  No functional change.

Merge internal change: 110015448
https://codereview.chromium.org/1525303003/

relnote: Rename QuicSpdyServerStream to QuicSimpleServerStream. No behavior change.

Merge internal change: 110008813
https://codereview.chromium.org/1521993006/

relnote: Reduce size of body data sent in Trailers test.

n/a (test only)

Merge internal change: 109918216
https://codereview.chromium.org/1526993003/

relnote: Change QuicConnection::ValidateAckFrame's DLOG(ERROR) to LOG(WARNING) in order to understand why the acks are invalid.

Merge internal change: 109916867
https://codereview.chromium.org/1530443004/

relnote: Cleanup: Put QUIC test-only MockRandom class in the gfe_quic::test namespace

n/a (test only)

Merge internal change: 109828260
https://codereview.chromium.org/1523333002/

relnote: Clarify comments in QuicSession related to ownership of streams.

n/a (comment only)

Merge internal change: 109790831
https://codereview.chromium.org/1527013002/

relnote: Remove needs_padding from QuicPacketCreator AddFrame.  Non functional change.

Merge internal change: 109748558
https://codereview.chromium.org/1529843002/

relnote: Deprecate --gfe_reloadable_flag_quic_packet_creator_prefetch.

Merge internal change: 109634576
https://codereview.chromium.org/1526083002/

R=rch@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1536703002

Cr-Commit-Position: refs/heads/master@{#365981}

1 files changed, 3 insertions, 3 deletions

diff --git a/net/tools/quic/quic_server_session.cc b/net/tools/quic/quic_server_session.cc
index 68e228d..2c39919 100644
--- a/net/tools/quic/quic_server_session.cc
+++ b/net/tools/quic/quic_server_session.cc
@@ -10,7 +10,7 @@
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_spdy_session.h"
 #include "net/quic/reliable_quic_stream.h"
-#include "net/tools/quic/quic_spdy_server_stream.h"
+#include "net/tools/quic/quic_simple_server_stream.h"
 
 namespace net {
 namespace tools {
@@ -202,7 +202,7 @@ QuicSpdyStream* QuicServerSession::CreateIncomingDynamicStream(
     return nullptr;
   }
 
-  return new QuicSpdyServerStream(id, this);
+  return new QuicSimpleServerStream(id, this);
 }
 
 bool QuicServerSession::ShouldCreateOutgoingDynamicStream() {
@@ -229,7 +229,7 @@ QuicSpdyStream* QuicServerSession::CreateOutgoingDynamicStream(
   }
 
   QuicSpdyStream* stream =
-      new QuicSpdyServerStream(GetNextOutgoingStreamId(), this);
+      new QuicSimpleServerStream(GetNextOutgoingStreamId(), this);
   stream->SetPriority(priority);
   ActivateStream(stream);
   return stream;