Commit 663bcf9a authored by Nick Harper's avatar Nick Harper Committed by Commit Bot

Roll src/net/third_party/quiche/src/ 5debd13b6..b7ac1042f (10 commits)

https://quiche.googlesource.com/quiche.git/+log/5debd13b6484..b7ac1042fa4b

$ git log 5debd13b6..b7ac1042f --date=short --no-merges --format='%ad %ae %s'
2019-12-06 bnc Add header_list_size_limit_exceeded argument to OnHeadersDecoded().
2019-12-06 fayang gfe-relnote: When new 0RTT key is available, only allow client to write application data as server application data should be written in forward secure. Protected by gfe2_reloadable_flag_quic_use_handshaker_delegate2 which replaces gfe2_reloadable_flag_quic_use_handshaker_delegate.
2019-12-06 wub gfe-relnote: (n/a) Rename QuicRecordTestOutput to QuicRecordTrace. Test only rename, not protected.
2019-12-06 vasilvv Use client-supplied path instead of external configuration to switch between ECHO and DISCARD mode in QuicTransportSimpleServer
2019-12-06 vasilvv Parse the path component of the indication on the server.
2019-12-05 dschinazi Drop support for QUIC T048 and T049
2019-12-05 bnc Fix gcc compilation error.
2019-12-05 nharper gfe-relnote: deprecate gfe2_reloadable_flag_quic_enable_version_50
2019-12-05 renjietang Add stream number in GetSpdyDataStream() messages for better debugging.
2019-12-05 bnc Use IsStreamError() and friends gMock matchers in quic/core/crypto.

Created with:
  roll-dep src/net/third_party/quiche/src src/third_party/quic_trace/src

Change-Id: Id82bf325818a47923ad0aa28740e500097b634fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1956071
Auto-Submit: Nick Harper <nharper@chromium.org>
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Reviewed-by: default avatarRyan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#722705}
parent 983c3ee6
...@@ -307,7 +307,7 @@ vars = { ...@@ -307,7 +307,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
'quiche_revision': '5debd13b64840a93b1cd8a7f64f9e417f96cddbc', 'quiche_revision': 'b7ac1042fa4b8c4e8fb9ab69e3487081be8008ef',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit # the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -480,14 +480,14 @@ TEST_F(NetworkSessionConfiguratorTest, QuicVersionFromFieldTrialParams) { ...@@ -480,14 +480,14 @@ TEST_F(NetworkSessionConfiguratorTest, QuicVersionFromFieldTrialParams) {
TEST_F(NetworkSessionConfiguratorTest, QuicVersionFromFieldTrialParamsAlpn) { TEST_F(NetworkSessionConfiguratorTest, QuicVersionFromFieldTrialParamsAlpn) {
std::map<std::string, std::string> field_trial_params; std::map<std::string, std::string> field_trial_params;
field_trial_params["quic_version"] = "h3-T048"; field_trial_params["quic_version"] = "h3-T050";
variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params); variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params);
base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled"); base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
ParseFieldTrials(); ParseFieldTrials();
quic::ParsedQuicVersionVector supported_versions = { quic::ParsedQuicVersionVector supported_versions = {
{quic::PROTOCOL_TLS1_3, quic::QUIC_VERSION_48}}; {quic::PROTOCOL_TLS1_3, quic::QUIC_VERSION_50}};
EXPECT_EQ(supported_versions, quic_params_.supported_versions); EXPECT_EQ(supported_versions, quic_params_.supported_versions);
} }
...@@ -688,12 +688,12 @@ TEST_F(NetworkSessionConfiguratorTest, QuicVersion) { ...@@ -688,12 +688,12 @@ TEST_F(NetworkSessionConfiguratorTest, QuicVersion) {
TEST_F(NetworkSessionConfiguratorTest, QuicVersionAlpn) { TEST_F(NetworkSessionConfiguratorTest, QuicVersionAlpn) {
base::CommandLine command_line(base::CommandLine::NO_PROGRAM); base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitch(switches::kEnableQuic); command_line.AppendSwitch(switches::kEnableQuic);
command_line.AppendSwitchASCII(switches::kQuicVersion, "h3-T048"); command_line.AppendSwitchASCII(switches::kQuicVersion, "h3-T050");
ParseCommandLineAndFieldTrials(command_line); ParseCommandLineAndFieldTrials(command_line);
quic::ParsedQuicVersionVector supported_versions = { quic::ParsedQuicVersionVector supported_versions = {
{quic::PROTOCOL_TLS1_3, quic::QUIC_VERSION_48}}; {quic::PROTOCOL_TLS1_3, quic::QUIC_VERSION_50}};
EXPECT_EQ(supported_versions, quic_params_.supported_versions); EXPECT_EQ(supported_versions, quic_params_.supported_versions);
} }
......
...@@ -36,8 +36,7 @@ void QuicRecordTestOutputToFile(QuicStringPiece filename, ...@@ -36,8 +36,7 @@ void QuicRecordTestOutputToFile(QuicStringPiece filename,
QUIC_LOG(INFO) << "Recorded test output into " << path; QUIC_LOG(INFO) << "Recorded test output into " << path;
} }
void QuicRecordTestOutputImpl(QuicStringPiece identifier, void QuicRecordTraceImpl(QuicStringPiece identifier, QuicStringPiece data) {
QuicStringPiece data) {
const testing::TestInfo* test_info = const testing::TestInfo* test_info =
testing::UnitTest::GetInstance()->current_test_info(); testing::UnitTest::GetInstance()->current_test_info();
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
namespace quic { namespace quic {
void QuicRecordTestOutputImpl(QuicStringPiece identifier, QuicStringPiece data); void QuicRecordTraceImpl(QuicStringPiece identifier, QuicStringPiece data);
} // namespace quic } // namespace quic
......
...@@ -258,9 +258,6 @@ QUIC_FLAG(bool, ...@@ -258,9 +258,6 @@ QUIC_FLAG(bool,
// If true, support HTTP/3 priority in v99. // If true, support HTTP/3 priority in v99.
QUIC_FLAG(bool, FLAGS_quic_allow_http3_priority, false) QUIC_FLAG(bool, FLAGS_quic_allow_http3_priority, false)
// If true, enable QUIC version 50.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_version_50, true)
// If the bandwidth during ack aggregation is smaller than (estimated // If the bandwidth during ack aggregation is smaller than (estimated
// bandwidth * this flag), consider the current aggregation completed // bandwidth * this flag), consider the current aggregation completed
// and starts a new one. // and starts a new one.
...@@ -358,10 +355,6 @@ QUIC_FLAG(bool, ...@@ -358,10 +355,6 @@ QUIC_FLAG(bool,
FLAGS_quic_reloadable_flag_quic_delete_send_rst_stream_inner, FLAGS_quic_reloadable_flag_quic_delete_send_rst_stream_inner,
false) false)
// If true, QUIC crypto handshaker uses handshaker delegate to notify session
// about handshake events.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_use_handshaker_delegate, false)
// If true, for QUIC BBRv2 flows, exit PROBE_BW_DOWN phase after one round trip // If true, for QUIC BBRv2 flows, exit PROBE_BW_DOWN phase after one round trip
// time. // time.
QUIC_FLAG(bool, QUIC_FLAG(bool,
...@@ -379,3 +372,7 @@ QUIC_FLAG(bool, ...@@ -379,3 +372,7 @@ QUIC_FLAG(bool,
QUIC_FLAG(bool, QUIC_FLAG(bool,
FLAGS_quic_reloadable_flag_quic_send_max_push_id_with_settings, FLAGS_quic_reloadable_flag_quic_send_max_push_id_with_settings,
true) true)
// If true, QUIC crypto handshaker uses handshaker delegate to notify session
// about handshake events.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_use_handshaker_delegate2, false)
...@@ -52,7 +52,6 @@ class QuicTransportSimpleServerSessionHelper ...@@ -52,7 +52,6 @@ class QuicTransportSimpleServerSessionHelper
QuicTransportSimpleServer::QuicTransportSimpleServer( QuicTransportSimpleServer::QuicTransportSimpleServer(
int port, int port,
QuicTransportSimpleServerSession::Mode mode,
std::vector<url::Origin> accepted_origins) std::vector<url::Origin> accepted_origins)
: port_(port), : port_(port),
version_manager_({ParsedQuicVersion{PROTOCOL_TLS1_3, QUIC_VERSION_99}}), version_manager_({ParsedQuicVersion{PROTOCOL_TLS1_3, QUIC_VERSION_99}}),
...@@ -72,7 +71,6 @@ QuicTransportSimpleServer::QuicTransportSimpleServer( ...@@ -72,7 +71,6 @@ QuicTransportSimpleServer::QuicTransportSimpleServer(
base::ThreadTaskRunnerHandle::Get().get(), base::ThreadTaskRunnerHandle::Get().get(),
clock_), clock_),
quic::kQuicDefaultConnectionIdLength, quic::kQuicDefaultConnectionIdLength,
mode,
accepted_origins), accepted_origins),
read_buffer_(base::MakeRefCounted<IOBufferWithSize>(kReadBufferSize)) {} read_buffer_(base::MakeRefCounted<IOBufferWithSize>(kReadBufferSize)) {}
......
...@@ -25,7 +25,6 @@ namespace net { ...@@ -25,7 +25,6 @@ namespace net {
class QuicTransportSimpleServer { class QuicTransportSimpleServer {
public: public:
QuicTransportSimpleServer(int port, QuicTransportSimpleServer(int port,
quic::QuicTransportSimpleServerSession::Mode mode,
std::vector<url::Origin> accepted_origins); std::vector<url::Origin> accepted_origins);
~QuicTransportSimpleServer(); ~QuicTransportSimpleServer();
......
...@@ -10,12 +10,6 @@ ...@@ -10,12 +10,6 @@
DEFINE_QUIC_COMMAND_LINE_FLAG(int, port, 20557, "The port to listen on."); DEFINE_QUIC_COMMAND_LINE_FLAG(int, port, 20557, "The port to listen on.");
DEFINE_QUIC_COMMAND_LINE_FLAG(
std::string,
mode,
"discard",
"The mode used by the SimpleServer. Can be \"echo\" or \"discard\".");
DEFINE_QUIC_COMMAND_LINE_FLAG(std::string, DEFINE_QUIC_COMMAND_LINE_FLAG(std::string,
accepted_origins, accepted_origins,
"", "",
...@@ -31,17 +25,6 @@ int main(int argc, char** argv) { ...@@ -31,17 +25,6 @@ int main(int argc, char** argv) {
return 0; return 0;
} }
std::string mode_text = GetQuicFlag(FLAGS_mode);
quic::QuicTransportSimpleServerSession::Mode mode;
if (mode_text == "discard") {
mode = quic::QuicTransportSimpleServerSession::DISCARD;
} else if (mode_text == "echo") {
mode = quic::QuicTransportSimpleServerSession::ECHO;
} else {
LOG(ERROR) << "Invalid mode specified: " << mode_text;
return 1;
}
std::string accepted_origins_text = GetQuicFlag(FLAGS_accepted_origins); std::string accepted_origins_text = GetQuicFlag(FLAGS_accepted_origins);
std::vector<url::Origin> accepted_origins; std::vector<url::Origin> accepted_origins;
for (const base::StringPiece& origin : for (const base::StringPiece& origin :
...@@ -55,7 +38,7 @@ int main(int argc, char** argv) { ...@@ -55,7 +38,7 @@ int main(int argc, char** argv) {
accepted_origins.push_back(url::Origin::Create(url)); accepted_origins.push_back(url::Origin::Create(url));
} }
net::QuicTransportSimpleServer server(GetQuicFlag(FLAGS_port), mode, net::QuicTransportSimpleServer server(GetQuicFlag(FLAGS_port),
accepted_origins); accepted_origins);
return server.Run(); return server.Run();
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment