Deprecate --gfe2_reloadable_flag_quic_tls_no_select_cert_if_disconnected. PiperOrigin-RevId: 440907212
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h index b1c1dec..609734e 100644 --- a/quiche/quic/core/quic_flags_list.h +++ b/quiche/quic/core/quic_flags_list.h
@@ -57,8 +57,6 @@ QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_disable_server_blackhole_detection, false) // If true, discard INITIAL packet if the key has been dropped. QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_discard_initial_packet_with_key_dropped, true) -// If true, do not call ProofSourceHandle::SelectCertificate if QUIC connection has disconnected. -QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_tls_no_select_cert_if_disconnected, true) // If true, do not count bytes sent/received on the alternative path into the bytes sent/received on the default path. QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_count_bytes_on_alternative_path_seperately, true) // If true, enable server retransmittable on wire PING.
diff --git a/quiche/quic/core/tls_server_handshaker.cc b/quiche/quic/core/tls_server_handshaker.cc index 7d14507..6365424 100644 --- a/quiche/quic/core/tls_server_handshaker.cc +++ b/quiche/quic/core/tls_server_handshaker.cc
@@ -210,10 +210,6 @@ if (session->connection()->context()->tracer) { tls_connection_.EnableInfoCallback(); } - - if (no_select_cert_if_disconnected_) { - QUIC_RELOADABLE_FLAG_COUNT_N(quic_tls_no_select_cert_if_disconnected, 1, 2); - } } TlsServerHandshaker::~TlsServerHandshaker() { CancelOutstandingCallbacks(); } @@ -953,9 +949,7 @@ ? std::string(alps_result.alps_buffer.get(), alps_result.alps_length) : std::string(); - if (no_select_cert_if_disconnected_ && - !session()->connection()->connected()) { - QUIC_RELOADABLE_FLAG_COUNT_N(quic_tls_no_select_cert_if_disconnected, 2, 2); + if (!session()->connection()->connected()) { select_cert_status_ = QUIC_FAILURE; return ssl_select_cert_error; }
diff --git a/quiche/quic/core/tls_server_handshaker.h b/quiche/quic/core/tls_server_handshaker.h index b7df310..fc2e9c4 100644 --- a/quiche/quic/core/tls_server_handshaker.h +++ b/quiche/quic/core/tls_server_handshaker.h
@@ -383,8 +383,6 @@ last_received_cached_network_params_; bool cert_matched_sni_ = false; - const bool no_select_cert_if_disconnected_ = - GetQuicReloadableFlag(quic_tls_no_select_cert_if_disconnected); }; } // namespace quic
diff --git a/quiche/quic/core/tls_server_handshaker_test.cc b/quiche/quic/core/tls_server_handshaker_test.cc index b49d959..b903821 100644 --- a/quiche/quic/core/tls_server_handshaker_test.cc +++ b/quiche/quic/core/tls_server_handshaker_test.cc
@@ -1062,13 +1062,6 @@ })); AdvanceHandshakeWithFakeClient(); - if (!GetQuicReloadableFlag(quic_tls_no_select_cert_if_disconnected)) { - // SelectCertificate is called when flag is false. - EXPECT_FALSE(server_handshaker_->fake_proof_source_handle() - ->all_select_cert_args() - .empty()); - return; - } EXPECT_TRUE(server_handshaker_->fake_proof_source_handle() ->all_select_cert_args()