Deprecate gfe2_reloadable_flag_quic_delay_connection_close_on_invalid_sni PiperOrigin-RevId: 855253662
diff --git a/quiche/common/quiche_feature_flags_list.h b/quiche/common/quiche_feature_flags_list.h index d9b7ecb..9383d97 100755 --- a/quiche/common/quiche_feature_flags_list.h +++ b/quiche/common/quiche_feature_flags_list.h
@@ -24,7 +24,6 @@ QUICHE_FLAG(bool, quiche_reloadable_flag_quic_default_enable_5rto_blackhole_detection2, true, true, "If true, default-enable 5RTO blachole detection.") QUICHE_FLAG(bool, quiche_reloadable_flag_quic_default_to_bbr, true, false, "When true, defaults to BBR congestion control instead of Cubic.") QUICHE_FLAG(bool, quiche_reloadable_flag_quic_default_to_bbr_v2, false, false, "If true, use BBRv2 as the default congestion controller. Takes precedence over --quic_default_to_bbr.") -QUICHE_FLAG(bool, quiche_reloadable_flag_quic_delay_connection_close_on_invalid_sni, true, true, "Delay closing the connection on invalid SNI in client hello till after the transport parameters are parsed.") QUICHE_FLAG(bool, quiche_reloadable_flag_quic_delete_config, false, false, "If true, the QuicSession will delete the QuicConfig after the handshake completes.") QUICHE_FLAG(bool, quiche_reloadable_flag_quic_deliver_stop_sending_to_zombie_streams, true, true, "If true, deliver STOP_SENDING to zombie streams.") QUICHE_FLAG(bool, quiche_reloadable_flag_quic_disable_batch_write, false, false, "If true, round-robin stream writes instead of batching in QuicWriteBlockedList.")
diff --git a/quiche/quic/core/tls_server_handshaker.cc b/quiche/quic/core/tls_server_handshaker.cc index 3334f61..ecf8d34 100644 --- a/quiche/quic/core/tls_server_handshaker.cc +++ b/quiche/quic/core/tls_server_handshaker.cc
@@ -1002,15 +1002,13 @@ crypto_negotiated_params_->sni = QuicHostnameUtils::NormalizeHostname(hostname); if (!ValidateHostname(hostname)) { - if (GetQuicReloadableFlag(quic_delay_connection_close_on_invalid_sni)) { - std::string error_details; - const bool success = - ProcessTransportParameters(client_hello, &error_details); - if (success) { - QUIC_CODE_COUNT(quic_tls_server_invalid_hostname_but_tp_succeeded); - } else { - QUIC_CODE_COUNT(quic_tls_server_invalid_hostname_and_tp_failed); - } + std::string error_details; + const bool success = + ProcessTransportParameters(client_hello, &error_details); + if (success) { + QUIC_CODE_COUNT(quic_tls_server_invalid_hostname_but_tp_succeeded); + } else { + QUIC_CODE_COUNT(quic_tls_server_invalid_hostname_and_tp_failed); } CloseConnection(QUIC_HANDSHAKE_FAILED_INVALID_HOSTNAME, absl::StrCat("Invalid SNI provided: ", hostname));