Skip to content

GitLab

T
tangled
Commit 52dfbfe8 authored by Victor Vasiliev's avatar Victor Vasiliev Committed by Commit Bot
Browse files
Options

Roll src/net/third_party/quiche/src/ a5a2ca9cc..c0dc4ceb3 (6 commits) 

https://quiche.googlesource.com/quiche.git/+log/a5a2ca9cc20b..c0dc4ceb325c

$ git log a5a2ca9cc..c0dc4ceb3 --date=short --no-merges --format='%ad %ae %s'
2020-06-16 renjietang Handle error as specified in https://tools.ietf.org/html/draft-ietf-quic-http-29#section-7.2.4.2 : If a server accepts 0-RTT but then sends a SETTINGS frame that omits a setting value that the client understands (apart from reserved setting identifiers) that was previously specified to have a non-default value, this MUST be treated as a connection error of type H3_SETTINGS_ERROR.
2020-06-16 renjietang Turn on ZeroRttResumption test.
2020-06-16 wub For loss detection tuning, if user agent is available, save it into quicsession. protected by --gfe2_reloadable_flag_quic_save_user_agent_in_quic_session.
2020-06-16 fayang In quic, use transport params to announce the support of handshake_done frame. protected by gfe2_reloadable_flag_quic_support_handshake_done_in_t050.
2020-06-16 dschinazi Replace enable flags for draft-25 and draft-27 with disable flags
2020-06-15 haoyuewang Deprecate gfe2_reloadable_flag_quic_bw_sampler_app_limited_starting_value

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

Change-Id: I9f388e2ddcd1cc7cfe0c7d95776ae8a28c08e66c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2249105
Commit-Queue: Victor Vasiliev <vasilvv@chromium.org>
Reviewed-by: default avatarDavid Schinazi <dschinazi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779647}
parent 5f02ead4
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 26 deletions
DEPS
View file @ 52dfbfe8
......@@ -309,7 +309,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'quiche_revision': 'a5a2ca9cc20b5d9a971aa3dbd4f866136a09e965',
'quiche_revision': 'c0dc4ceb325c0b2f8ec95ca936faa463b9827541',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other.
......
components/cronet/url_request_context_config_unittest.cc
View file @ 52dfbfe8
......@@ -70,8 +70,8 @@ TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) {
{"QUIC", "set_quic_flags"},
base::Value(
"FLAGS_quic_max_aggressive_retransmittable_on_wire_ping_count=5,"
"FLAGS_quic_reloadable_flag_quic_enable_version_draft_28=true,"
"FLAGS_quic_reloadable_flag_quic_enable_version_draft_27=true"));
"FLAGS_quic_reloadable_flag_quic_enable_version_draft_29=true,"
"FLAGS_quic_reloadable_flag_quic_disable_version_draft_27=true"));
options.SetPath({"AsyncDNS", "enable"}, base::Value(true));
options.SetPath({"NetworkErrorLogging", "enable"}, base::Value(true));
options.SetPath({"NetworkErrorLogging", "preloaded_report_to_headers"},
......@@ -144,8 +144,8 @@ TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) {
// Initialize QUIC flags set by the config.
FLAGS_quic_max_aggressive_retransmittable_on_wire_ping_count = 0;
FLAGS_quic_reloadable_flag_quic_enable_version_draft_28 = false;
FLAGS_quic_reloadable_flag_quic_enable_version_draft_27 = false;
FLAGS_quic_reloadable_flag_quic_enable_version_draft_29 = false;
FLAGS_quic_reloadable_flag_quic_disable_version_draft_27 = false;
URLRequestContextConfig config(
// Enable QUIC.
......@@ -197,8 +197,8 @@ TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) {
EXPECT_EQ(quic_connection_options, quic_params->connection_options);
EXPECT_EQ(FLAGS_quic_max_aggressive_retransmittable_on_wire_ping_count, 5);
EXPECT_TRUE(FLAGS_quic_reloadable_flag_quic_enable_version_draft_28);
EXPECT_TRUE(FLAGS_quic_reloadable_flag_quic_enable_version_draft_27);
EXPECT_TRUE(FLAGS_quic_reloadable_flag_quic_enable_version_draft_29);
EXPECT_TRUE(FLAGS_quic_reloadable_flag_quic_disable_version_draft_27);
// Check Custom QUIC User Agent Id.
EXPECT_EQ("Custom QUIC UAID", quic_params->user_agent_id);
......
components/domain_reliability/quic_error_mapping.cc
View file @ 52dfbfe8
......@@ -373,6 +373,8 @@ const struct QuicErrorMapping {
"quic.zero_rtt_rejection_limit_reduced"},
{quic::QUIC_ZERO_RTT_RESUMPTION_LIMIT_REDUCED,
"quic.zero_rtt_resumption_limit_reduced"},
{quic::QUIC_HTTP_ZERO_RTT_SETTINGS_MISMATCH,
"quic.http_zero_rtt_settings_mismatch"},
// QUIC_INVALID_APPLICATION_CLOSE_DATA was code 101. The code has been
// deprecated, but to keep the assert below happy, there needs to be
......
components/network_session_configurator/browser/network_session_configurator_unittest.cc
View file @ 52dfbfe8
......@@ -597,19 +597,19 @@ TEST_F(NetworkSessionConfiguratorTest, QuicHostAllowlistEmpty) {
}
TEST_F(NetworkSessionConfiguratorTest, QuicFlags) {
FLAGS_quic_reloadable_flag_quic_enable_version_draft_28 = false;
FLAGS_quic_reloadable_flag_quic_enable_version_draft_27 = false;
FLAGS_quic_reloadable_flag_quic_enable_version_draft_29 = false;
FLAGS_quic_reloadable_flag_quic_disable_version_draft_27 = false;
std::map<std::string, std::string> field_trial_params;
field_trial_params["set_quic_flags"] =
"FLAGS_quic_reloadable_flag_quic_enable_version_draft_28=true,"
"FLAGS_quic_reloadable_flag_quic_enable_version_draft_27=true";
"FLAGS_quic_reloadable_flag_quic_enable_version_draft_29=true,"
"FLAGS_quic_reloadable_flag_quic_disable_version_draft_27=true";
variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params);
base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
ParseFieldTrials();
EXPECT_TRUE(FLAGS_quic_reloadable_flag_quic_enable_version_draft_28);
EXPECT_TRUE(FLAGS_quic_reloadable_flag_quic_enable_version_draft_27);
EXPECT_TRUE(FLAGS_quic_reloadable_flag_quic_enable_version_draft_29);
EXPECT_TRUE(FLAGS_quic_reloadable_flag_quic_disable_version_draft_27);
}
TEST_F(NetworkSessionConfiguratorTest, Http2SettingsFromFieldTrialParams) {
......
net/quic/quic_flags_list.h
View file @ 52dfbfe8
......@@ -260,13 +260,11 @@ QUIC_FLAG(bool,
// If true, use predictable grease settings identifiers and values.
QUIC_FLAG(bool, FLAGS_quic_enable_http3_grease_randomness, true)
// If true, enable QUIC version h3-25.
QUIC_FLAG(bool,
FLAGS_quic_reloadable_flag_quic_enable_version_draft_25_v3,
true)
// If true, disable QUIC version h3-25.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_disable_version_draft_25, false)
// If true, enable QUIC version h3-27.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_version_draft_27, true)
// If true, disable QUIC version h3-27.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_disable_version_draft_27, false)
// If true, QUIC BBRv2 to take ack height into account when calculating
// queuing_threshold in PROBE_UP.
......@@ -275,11 +273,6 @@ QUIC_FLAG(
FLAGS_quic_reloadable_flag_quic_bbr2_add_ack_height_to_queueing_threshold,
true)
// If true, quic::BandwidthSampler will start in application limited phase.
QUIC_FLAG(bool,
FLAGS_quic_reloadable_flag_quic_bw_sampler_app_limited_starting_value,
true)
// If true, use idle network detector to detect handshake timeout and idle
// network timeout.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_use_idle_network_detector, true)
......@@ -430,3 +423,13 @@ QUIC_FLAG(bool,
// If true, enable QUIC version h3-29.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_version_draft_29, true)
// If true, support HANDSHAKE_DONE frame in T050
QUIC_FLAG(bool,
FLAGS_quic_reloadable_flag_quic_support_handshake_done_in_t050,
true)
// If true, save user agent into in QuicSession.
QUIC_FLAG(bool,
FLAGS_quic_reloadable_flag_quic_save_user_agent_in_quic_session,
false)
net/quic/quic_transport_end_to_end_test.cc
View file @ 52dfbfe8
......@@ -266,7 +266,7 @@ TEST_F(QuicTransportEndToEndTest, CertificateFingerprintMismatch) {
TEST_F(QuicTransportEndToEndTest, OldVersion) {
SetQuicReloadableFlag(quic_enable_version_draft_29, false);
SetQuicReloadableFlag(quic_enable_version_draft_27, true);
SetQuicReloadableFlag(quic_disable_version_draft_27, false);
StartServer();
client_ = std::make_unique<QuicTransportClient>(
......@@ -281,7 +281,7 @@ TEST_F(QuicTransportEndToEndTest, OldVersion) {
TEST_F(QuicTransportEndToEndTest, NoCommonVersion) {
SetQuicReloadableFlag(quic_enable_version_draft_29, false);
SetQuicReloadableFlag(quic_enable_version_draft_27, false);
SetQuicReloadableFlag(quic_disable_version_draft_27, true);
StartServer();
client_ = std::make_unique<QuicTransportClient>(
......
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