Roll src/net/third_party/quiche/src/ 7498c8c59..82875de9a5 (14 commits)
https://quiche.googlesource.com/quiche.git/+log/7498c8c59b8a..82875de9a5
2019-07-09 dschinazi Rollback of 257189926
2019-07-09 wub Implement BBRv2 for QUIC
2019-07-09 bnc QuicSpdySession header size limit related cleanup.
2019-07-09 bnc Blocked decoding part 3: QpackDecodedHeadersAccumulator and QuicSpdyStream.
2019-07-09 bnc Close connection on incorrect order of HEADERS and DATA frames.
2019-07-09 bnc Blocked decoding part 2: QpackProgressiveDecoder.
2019-07-08 ianswett gfe-relnote: Print out a SPDY_BUG and exit early rather than crash when Http2FrameDecoderAdapter is nullptr. Not flag protected.
2019-07-08 bnc Blocked decoding part 1: QpackHeaderTable::Observer.
2019-07-08 bnc QuicSpdySessionPeer::SetMaxInboundHeaderListSize()
2019-07-08 renjietang gfe-relnote: deprecate gfe2_reloadable_flag_quic_eliminate_static_stream_map_3.
2019-07-08 vasilvv Add operator<< support to QuicSocketAddress.
2019-07-08 nharper Fix check in proto_to_packet_translator to make sure packets are long enough
2019-07-08 fayang gfe-relnote: Deprecate gfe2_reloadable_flag_quic_simplify_stop_waiting.
2019-07-03 renjietang Remove unused pending stream constructors.
2019-07-03 danzh gfe-relnote: n/a(refactor only) Split out utility functions needed on quic client side from SpdyUtils.
2019-07-02 nharper gfe-relnote: Move QUIC crypto frames to be gated behind new flag gfe2_reloadable_flag_quic_enable_version_48
Created with:
roll-dep src/net/third_party/quiche/src src/third_party/quic_trace/src
Change-Id: Ia695aa51737a27161038ca17ed491d240221ea9d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1695645
Commit-Queue: David Schinazi <[email protected]>
Reviewed-by: Nick Harper <[email protected]>
Cr-Commit-Position: refs/heads/master@{#676700}
diff --git a/net/quic/quic_proxy_client_socket_unittest.cc b/net/quic/quic_proxy_client_socket_unittest.cc
index cd44890..9ec53ec 100644
--- a/net/quic/quic_proxy_client_socket_unittest.cc
+++ b/net/quic/quic_proxy_client_socket_unittest.cc
@@ -152,6 +152,9 @@
IPAddress ip(192, 0, 2, 33);
peer_addr_ = IPEndPoint(ip, 443);
clock_.AdvanceTime(quic::QuicTime::Delta::FromMilliseconds(20));
+ if (version_.handshake_protocol == quic::PROTOCOL_TLS1_3) {
+ SetQuicFlag(FLAGS_quic_supports_tls_handshake, true);
+ }
}
void SetUp() override {}
@@ -532,6 +535,7 @@
return std::string(buffer.get(), header_length);
}
+ QuicFlagSaver saver_;
const quic::ParsedQuicVersion version_;
const quic::QuicStreamId client_data_stream_id1_;
const bool client_headers_include_h2_stream_dependency_;
@@ -878,7 +882,8 @@
std::string data(numDataPackets * quic::kDefaultMaxPacketSize, 'x');
quic::QuicStreamOffset offset = kLen1 + header.length();
- if (version_.transport_version == quic::QUIC_VERSION_99) {
+ if (version_.transport_version == quic::QUIC_VERSION_99 ||
+ version_.handshake_protocol == quic::PROTOCOL_TLS1_3) {
numDataPackets++;
}
size_t total_data_length = 0;
@@ -896,12 +901,32 @@
{header2, std::string(data.c_str(),
max_packet_data_length - 7)}));
offset += max_packet_data_length - header2.length() - 1;
+ } else if (version_.handshake_protocol == quic::PROTOCOL_TLS1_3 && i == 0) {
+ mock_quic_data_.AddWrite(
+ SYNCHRONOUS,
+ ConstructDataPacket(
+ write_packet_index++,
+ std::string(data.c_str(), max_packet_data_length - 4)));
+ offset += max_packet_data_length - 4;
} else if (version_.transport_version == quic::QUIC_VERSION_99 &&
i == numDataPackets - 1) {
mock_quic_data_.AddWrite(
SYNCHRONOUS, ConstructDataPacket(write_packet_index++,
std::string(data.c_str(), 7)));
offset += 7;
+ } else if (version_.handshake_protocol == quic::PROTOCOL_TLS1_3 &&
+ i == numDataPackets - 1) {
+ mock_quic_data_.AddWrite(
+ SYNCHRONOUS, ConstructDataPacket(write_packet_index++,
+ std::string(data.c_str(), 12)));
+ offset += 12;
+ } else if (version_.handshake_protocol == quic::PROTOCOL_TLS1_3) {
+ mock_quic_data_.AddWrite(
+ SYNCHRONOUS,
+ ConstructDataPacket(
+ write_packet_index++,
+ std::string(data.c_str(), max_packet_data_length - 4)));
+ offset += max_packet_data_length - 4;
} else {
mock_quic_data_.AddWrite(
SYNCHRONOUS, ConstructDataPacket(
