commit 14dfb2c8125689bc127bf9c313fa32f08c15076f
author ianswett <ianswett@google.com> Sat Aug 24 14:03:28 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Aug 26 14:41:05 2019 -0700
tree 8c7f9f1f95e69e46ecd5e086b8eaf1d31b838a14
parent 3de7170b31c5a4a47498ead0e30271e4d00454b2

gfe-relnote: Do not enable version 99 unless gfe2_reloadable_flag_quic_use_parse_public_header is also enabled.

PiperOrigin-RevId: 265258233
Change-Id: Ib9a57ffd288da81d4d4d199bcc1dda02fbd463d1

quic/core/quic_version_manager_test.cc

diff --git a/quic/core/quic_version_manager_test.cc b/quic/core/quic_version_manager_test.cc
index 50b0229..7afd55d 100644
--- a/quic/core/quic_version_manager_test.cc
+++ b/quic/core/quic_version_manager_test.cc
@@ -47,6 +47,7 @@
             manager.GetSupportedTransportVersions());
 
   SetQuicReloadableFlag(quic_enable_version_99, true);
+  SetQuicReloadableFlag(quic_use_parse_public_header, true);
   EXPECT_EQ(QuicTransportVersionVector({QUIC_VERSION_99, QUIC_VERSION_48,
                                         QUIC_VERSION_47, QUIC_VERSION_46,
                                         QUIC_VERSION_43, QUIC_VERSION_39}),

quic/core/quic_versions.cc

diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc
index eb16862..3808e95 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc
@@ -258,7 +258,8 @@
       continue;
     }
     if (version.transport_version == QUIC_VERSION_99) {
-      if (GetQuicReloadableFlag(quic_enable_version_99)) {
+      if (GetQuicReloadableFlag(quic_enable_version_99) &&
+          GetQuicReloadableFlag(quic_use_parse_public_header)) {
         filtered_versions.push_back(version);
       }
     } else if (version.transport_version == QUIC_VERSION_48) {

quic/core/quic_versions_test.cc

diff --git a/quic/core/quic_versions_test.cc b/quic/core/quic_versions_test.cc
index d4e8065..09d6a3e 100644
--- a/quic/core/quic_versions_test.cc
+++ b/quic/core/quic_versions_test.cc
@@ -297,6 +297,7 @@
   SetQuicReloadableFlag(quic_enable_version_47, true);
   SetQuicReloadableFlag(quic_enable_version_48_2, true);
   SetQuicReloadableFlag(quic_enable_version_99, true);
+  SetQuicReloadableFlag(quic_use_parse_public_header, true);
   ParsedQuicVersionVector parsed_versions;
   for (QuicTransportVersion version : all_versions) {
     parsed_versions.push_back(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, version));