commit a0bc36825d3ab9fde00ed6e24d534bacc9d622d1
author fayang <fayang@google.com> Mon Mar 07 08:41:18 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Mar 07 08:42:01 2022 -0800
tree af16e592d84a49ac79d0bdff35195ea6620b44ed
parent 0770879ca6546c8af35a98ef75417931248853ad

Deprecate gfe2_reloadable_flag_quic_accept_empty_crypto_frame.

PiperOrigin-RevId: 432953956

quic/core/quic_crypto_stream_test.cc

diff --git a/quic/core/quic_crypto_stream_test.cc b/quic/core/quic_crypto_stream_test.cc
index 2c9ec0d..f8828be 100644
--- a/quic/core/quic_crypto_stream_test.cc
+++ b/quic/core/quic_crypto_stream_test.cc
@@ -709,12 +709,7 @@
   if (!QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     return;
   }
-  if (GetQuicReloadableFlag(quic_accept_empty_crypto_frame)) {
-    EXPECT_CALL(*connection_, CloseConnection(_, _, _)).Times(0);
-  } else {
-    EXPECT_CALL(*connection_,
-                CloseConnection(QUIC_EMPTY_STREAM_FRAME_NO_FIN, _, _));
-  }
+  EXPECT_CALL(*connection_, CloseConnection(_, _, _)).Times(0);
   QuicCryptoFrame empty_crypto_frame(ENCRYPTION_INITIAL, 0, nullptr, 0);
   stream_->OnCryptoFrame(empty_crypto_frame);
 }

quic/core/quic_flags_list.h

diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 938877f..90cd7c4 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -35,8 +35,6 @@
 QUIC_FLAG(FLAGS_quic_restart_flag_quic_tls_server_support_client_cert, true)
 // If true, abort async QPACK header decompression in QuicSpdyStream::Reset() and in QuicSpdyStream::OnStreamReset().
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_abort_qpack_on_stream_reset, true)
-// If true, accept empty crypto frame.
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_accept_empty_crypto_frame, true)
 // If true, ack frequency frame can be sent from server to client.
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_can_send_ack_frequency, true)
 // If true, allow client to enable BBRv2 on server via connection option \'B2ON\'.

quic/core/quic_stream_sequencer.cc

diff --git a/quic/core/quic_stream_sequencer.cc b/quic/core/quic_stream_sequencer.cc
index 8059334..72211c7 100644
--- a/quic/core/quic_stream_sequencer.cc
+++ b/quic/core/quic_stream_sequencer.cc
@@ -66,12 +66,9 @@
 
 void QuicStreamSequencer::OnCryptoFrame(const QuicCryptoFrame& frame) {
   ++num_frames_received_;
-  if (GetQuicReloadableFlag(quic_accept_empty_crypto_frame)) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_accept_empty_crypto_frame);
-    if (frame.data_length == 0) {
-      // Ignore empty crypto frame.
-      return;
-    }
+  if (frame.data_length == 0) {
+    // Ignore empty crypto frame.
+    return;
   }
   OnFrameData(frame.offset, frame.data_length, frame.data_buffer);
 }