Deprecate --quic_dispatcher_send_connection_close_for_tls_alerts.
PiperOrigin-RevId: 475350434
diff --git a/quiche/quic/core/quic_dispatcher.cc b/quiche/quic/core/quic_dispatcher.cc
index 1ea2783..74ba7d1 100644
--- a/quiche/quic/core/quic_dispatcher.cc
+++ b/quiche/quic/core/quic_dispatcher.cc
@@ -361,10 +361,6 @@
<< "Trying to create dispatcher without any supported versions";
QUIC_DLOG(INFO) << "Created QuicDispatcher with versions: "
<< ParsedQuicVersionVectorToString(GetSupportedVersions());
- if (send_connection_close_for_tls_alerts_) {
- QUIC_RESTART_FLAG_COUNT_N(
- quic_dispatcher_send_connection_close_for_tls_alerts, 1, 3);
- }
}
QuicDispatcher::~QuicDispatcher() {
@@ -752,10 +748,7 @@
TryExtractChloOrBufferEarlyPacket(*packet_info);
auto& parsed_chlo = extract_chlo_result.parsed_chlo;
- if (send_connection_close_for_tls_alerts_ &&
- extract_chlo_result.tls_alert.has_value()) {
- QUIC_RESTART_FLAG_COUNT_N(
- quic_dispatcher_send_connection_close_for_tls_alerts, 2, 3);
+ if (extract_chlo_result.tls_alert.has_value()) {
QUIC_BUG_IF(quic_dispatcher_parsed_chlo_and_tls_alert_coexist_1,
parsed_chlo.has_value())
<< "parsed_chlo and tls_alert should not be set at the same time.";
@@ -867,9 +860,7 @@
}
}
- if (send_connection_close_for_tls_alerts_ && result.tls_alert.has_value()) {
- QUIC_RESTART_FLAG_COUNT_N(
- quic_dispatcher_send_connection_close_for_tls_alerts, 3, 3);
+ if (result.tls_alert.has_value()) {
QUIC_BUG_IF(quic_dispatcher_parsed_chlo_and_tls_alert_coexist_2,
has_full_tls_chlo)
<< "parsed_chlo and tls_alert should not be set at the same time.";
diff --git a/quiche/quic/core/quic_dispatcher.h b/quiche/quic/core/quic_dispatcher.h
index e2b7761..9cfc3b0 100644
--- a/quiche/quic/core/quic_dispatcher.h
+++ b/quiche/quic/core/quic_dispatcher.h
@@ -479,9 +479,6 @@
// destination connection ID length of all IETF long headers.
bool should_update_expected_server_connection_id_length_;
- const bool send_connection_close_for_tls_alerts_ =
- GetQuicRestartFlag(quic_dispatcher_send_connection_close_for_tls_alerts);
-
ConnectionIdGeneratorInterface& connection_id_generator_;
};
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index 3cb93c4..4ba71d6 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -59,8 +59,6 @@
QUIC_FLAG(quic_reloadable_flag_quic_flush_pending_frames_and_padding_bytes_on_migration, true)
// If true, ietf connection migration is no longer conditioned on connection option RVCM.
QUIC_FLAG(quic_reloadable_flag_quic_remove_connection_migration_connection_option_v2, false)
-// If true, if a fatal tls alert is raised while extracting CHLO, QuicDispatcher will send a connection close.
-QUIC_FLAG(quic_restart_flag_quic_dispatcher_send_connection_close_for_tls_alerts, true)
// If true, include stream information in idle timeout connection close detail.
QUIC_FLAG(quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, true)
// If true, quic server will send ENABLE_CONNECT_PROTOCOL setting and and endpoint will validate required request/response headers and extended CONNECT mechanism and update code counts of valid/invalid headers.
