gfe-relnote: Deprecate gfe2_reloadable_flag_quic_fix_termination_packets.
PiperOrigin-RevId: 248178442
Change-Id: I91a948b3cf5f91d0e98c6b4abb10ff67db3d08fc
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index 85ae602..f301428 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -3753,7 +3753,6 @@
TEST_P(EndToEndTest, ForwardSecureConnectionClose) {
// This test ensures ZERO_RTT_PROTECTED connection close is sent to a client
// which has ZERO_RTT_PROTECTED encryption level.
- SetQuicReloadableFlag(quic_fix_termination_packets, true);
connect_to_server_on_initialize_ =
negotiated_version_.transport_version <= QUIC_VERSION_43;
ASSERT_TRUE(Initialize());
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 6798f63..b30c5f0 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -346,8 +346,6 @@
supports_release_time_(false),
release_time_into_future_(QuicTime::Delta::Zero()),
no_version_negotiation_(supported_versions.size() == 1),
- fix_termination_packets_(
- GetQuicReloadableFlag(quic_fix_termination_packets)),
send_ack_when_on_can_write_(false),
retry_has_been_parsed_(false),
validate_packet_number_post_decryption_(
@@ -3085,10 +3083,7 @@
void QuicConnection::SendConnectionClosePacket(QuicErrorCode error,
const std::string& details) {
QUIC_DLOG(INFO) << ENDPOINT << "Sending connection close packet.";
- if (fix_termination_packets_) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_fix_termination_packets);
- SetDefaultEncryptionLevel(GetConnectionCloseEncryptionLevel());
- }
+ SetDefaultEncryptionLevel(GetConnectionCloseEncryptionLevel());
ClearQueuedPackets();
// If there was a packet write error, write the smallest close possible.
AckBundling ack_mode = (error == QUIC_PACKET_WRITE_ERROR) ? NO_ACK : SEND_ACK;
@@ -4008,7 +4003,6 @@
}
EncryptionLevel QuicConnection::GetConnectionCloseEncryptionLevel() const {
- DCHECK(fix_termination_packets_);
if (perspective_ == Perspective::IS_CLIENT) {
return encryption_level_;
}
diff --git a/quic/core/quic_connection.h b/quic/core/quic_connection.h
index 47816de..413a582 100644
--- a/quic/core/quic_connection.h
+++ b/quic/core/quic_connection.h
@@ -1503,9 +1503,6 @@
// vector to improve performance since it is expected to be very small.
std::vector<QuicConnectionId> incoming_connection_ids_;
- // Latched value of quic_fix_termination_packets.
- const bool fix_termination_packets_;
-
// Indicates whether an ACK needs to be sent in OnCanWrite(). Only used when
// deprecate_ack_bundling_mode is true.
// TODO(fayang): Remove this when ACK sending logic is moved to received
