Deprecate gfe2_reloadable_flag_quic_disconnect_early_exit. PiperOrigin-RevId: 899680862
diff --git a/quiche/common/quiche_feature_flags_list.h b/quiche/common/quiche_feature_flags_list.h index d0aa747..2149a1c 100755 --- a/quiche/common/quiche_feature_flags_list.h +++ b/quiche/common/quiche_feature_flags_list.h
@@ -34,7 +34,6 @@ QUICHE_FLAG(bool, quiche_reloadable_flag_quic_disable_version_q046, false, true, "If true, disable QUIC version Q046.") QUICHE_FLAG(bool, quiche_reloadable_flag_quic_disable_version_rfcv1, false, false, "If true, disable QUIC version h3 (RFCv1).") QUICHE_FLAG(bool, quiche_reloadable_flag_quic_discard_initial_packet_with_key_dropped, false, true, "If true, discard INITIAL packet if the key has been dropped.") -QUICHE_FLAG(bool, quiche_reloadable_flag_quic_disconnect_early_exit, true, true, "If true, does not update ack state if the connection has been closed.") QUICHE_FLAG(bool, quiche_reloadable_flag_quic_enable_disable_resumption, true, true, "If true, disable resumption when receiving NRES connection option.") QUICHE_FLAG(bool, quiche_reloadable_flag_quic_enable_mtu_discovery_at_server, false, false, "If true, QUIC will default enable MTU discovery at server, with a target of 1450 bytes.") QUICHE_FLAG(bool, quiche_reloadable_flag_quic_enable_server_on_wire_ping, true, true, "If true, enable server retransmittable on wire PING.")
diff --git a/quiche/quic/core/quic_connection.cc b/quiche/quic/core/quic_connection.cc index a78eed6..5ad4514 100644 --- a/quiche/quic/core/quic_connection.cc +++ b/quiche/quic/core/quic_connection.cc
@@ -6107,14 +6107,10 @@ } ResetAckStates(); } - if (GetQuicReloadableFlag(quic_disconnect_early_exit)) { - // FlushAckFrame can result in a closed connection. If so, avoid updating - // ack state that could trigger QUICHE_BUGs. - QUIC_RELOADABLE_FLAG_COUNT(quic_disconnect_early_exit); - if (!connected_) { - QUIC_CODE_COUNT(quic_flush_ack_frame_result_in_disconnect); - return; - } + // FlushAckFrame can result in a closed connection. If so, avoid updating + // ack state that could trigger QUICHE_BUGs. + if (!connected_) { + return; } const QuicTime timeout =
diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc index 8555867..e0d8372 100644 --- a/quiche/quic/core/quic_connection_test.cc +++ b/quiche/quic/core/quic_connection_test.cc
@@ -18354,8 +18354,6 @@ if (!version().IsIetfQuic()) { return; } - // Test will fail if this flag is false. - SetQuicReloadableFlag(quic_disconnect_early_exit, true); // Path validation must occur after the handshake is confirmed. connection_.RemoveEncrypter(ENCRYPTION_INITIAL); connection_.SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);