Deprecate gfe2_reloadable_flag_quic_accept_empty_stream_frame_with_no_fin.
PiperOrigin-RevId: 373368465
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc
index 7d4debb..c7a7bd6 100644
--- a/quic/core/http/quic_spdy_session_test.cc
+++ b/quic/core/http/quic_spdy_session_test.cc
@@ -557,7 +557,6 @@
}
void ReceiveWebTransportSession(WebTransportSessionId session_id) {
- SetQuicReloadableFlag(quic_accept_empty_stream_frame_with_no_fin, true);
QuicStreamFrame frame(session_id, /*fin=*/false, /*offset=*/0,
absl::string_view());
session_.OnStreamFrame(frame);
@@ -1916,12 +1915,6 @@
GetNthServerInitiatedUnidirectionalStreamId(transport_version(), 0);
// A bad stream frame with no data and no fin.
QuicStreamFrame data1(stream_id1, false, 0, 0);
- if (!GetQuicReloadableFlag(quic_accept_empty_stream_frame_with_no_fin)) {
- EXPECT_CALL(*connection_, CloseConnection(_, _, _))
- .WillOnce(
- Invoke(connection_, &MockQuicConnection::ReallyCloseConnection));
- EXPECT_CALL(*connection_, SendConnectionClosePacket(_, _, _));
- }
session_.OnStreamFrame(data1);
}
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 42d3360..f658240 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -6,7 +6,6 @@
#ifdef QUIC_FLAG
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_abort_qpack_on_stream_reset, true)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_accept_empty_stream_frame_with_no_fin, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_add_packet_flusher_on_async_op_done, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_allocate_stream_sequencer_buffer_blocks_on_demand, false)
diff --git a/quic/core/quic_stream_sequencer.cc b/quic/core/quic_stream_sequencer.cc
index cf7340b..88a51bd 100644
--- a/quic/core/quic_stream_sequencer.cc
+++ b/quic/core/quic_stream_sequencer.cc
@@ -56,13 +56,10 @@
(!CloseStreamAtOffset(frame.offset + data_len) || data_len == 0)) {
return;
}
- if (GetQuicReloadableFlag(quic_accept_empty_stream_frame_with_no_fin)) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_accept_empty_stream_frame_with_no_fin);
- if (stream_->version().HasIetfQuicFrames() && data_len == 0) {
- QUICHE_DCHECK(!frame.fin);
- // Ignore empty frame with no fin.
- return;
- }
+ if (stream_->version().HasIetfQuicFrames() && data_len == 0) {
+ QUICHE_DCHECK(!frame.fin);
+ // Ignore empty frame with no fin.
+ return;
}
OnFrameData(byte_offset, data_len, frame.data_buffer);
}
diff --git a/quic/core/quic_stream_sequencer_test.cc b/quic/core/quic_stream_sequencer_test.cc
index e8fe6f3..b097bc5 100644
--- a/quic/core/quic_stream_sequencer_test.cc
+++ b/quic/core/quic_stream_sequencer_test.cc
@@ -252,8 +252,7 @@
}
TEST_F(QuicStreamSequencerTest, EmptyFrame) {
- if (!GetQuicReloadableFlag(quic_accept_empty_stream_frame_with_no_fin) ||
- !stream_.version().HasIetfQuicFrames()) {
+ if (!stream_.version().HasIetfQuicFrames()) {
EXPECT_CALL(stream_,
OnUnrecoverableError(QUIC_EMPTY_STREAM_FRAME_NO_FIN, _));
}
diff --git a/quic/core/quic_stream_test.cc b/quic/core/quic_stream_test.cc
index 739113a..2d3298b 100644
--- a/quic/core/quic_stream_test.cc
+++ b/quic/core/quic_stream_test.cc
@@ -1634,8 +1634,7 @@
TEST_P(QuicStreamTest, EmptyStreamFrameWithNoFin) {
Initialize();
QuicStreamFrame empty_stream_frame(stream_->id(), false, 0, "");
- if (GetQuicReloadableFlag(quic_accept_empty_stream_frame_with_no_fin) &&
- stream_->version().HasIetfQuicFrames()) {
+ if (stream_->version().HasIetfQuicFrames()) {
EXPECT_CALL(*connection_,
CloseConnection(QUIC_EMPTY_STREAM_FRAME_NO_FIN, _, _))
.Times(0);
