commit 4035307dfef631900943c2b4dc2a2ef838ffb298
author wub <wub@google.com> Tue Apr 20 09:17:39 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 20 09:18:23 2021 -0700
tree 19a3265ae1daec16c43b8f8bf7cbd45b055c231a
parent 4a08a8e001993e1b6c1fb50fa3a72234757afee3

Deprecate --gfe2_restart_flag_quic_session_tickets_always_enabled.

PiperOrigin-RevId: 369454432
Change-Id: If0bb9d12e4085ba0819968f6e55b9ca0589df810

quic/core/crypto/tls_server_connection.cc

diff --git a/quic/core/crypto/tls_server_connection.cc b/quic/core/crypto/tls_server_connection.cc
index 8926909..6e9901b 100644
--- a/quic/core/crypto/tls_server_connection.cc
+++ b/quic/core/crypto/tls_server_connection.cc
@@ -30,16 +30,12 @@
     QUIC_CODE_COUNT(quic_session_tickets_enabled);
     SSL_CTX_set_ticket_aead_method(ssl_ctx.get(),
                                    &TlsServerConnection::kSessionTicketMethod);
-  } else if (!GetQuicRestartFlag(quic_session_tickets_always_enabled)) {
-    QUIC_CODE_COUNT(quic_session_tickets_disabled_by_flag);
-    SSL_CTX_set_options(ssl_ctx.get(), SSL_OP_NO_TICKET);
   } else {
     QUIC_CODE_COUNT(quic_session_tickets_disabled);
   }
-  if (proof_source->GetTicketCrypter() ||
-      GetQuicRestartFlag(quic_session_tickets_always_enabled)) {
-    SSL_CTX_set_early_data_enabled(ssl_ctx.get(), 1);
-  }
+
+  SSL_CTX_set_early_data_enabled(ssl_ctx.get(), 1);
+
   SSL_CTX_set_select_certificate_cb(
       ssl_ctx.get(), &TlsServerConnection::EarlySelectCertCallback);
   SSL_CTX_set_options(ssl_ctx.get(), SSL_OP_CIPHER_SERVER_PREFERENCE);

quic/core/quic_flags_list.h

diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 157b70a..e04ea7c 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -73,7 +73,6 @@
 QUIC_FLAG(FLAGS_quic_restart_flag_dont_fetch_quic_private_keys_from_leto, false)
 QUIC_FLAG(FLAGS_quic_restart_flag_quic_dispatcher_support_multiple_cid_per_connection_v2, true)
 QUIC_FLAG(FLAGS_quic_restart_flag_quic_offload_pacing_to_usps2, false)
-QUIC_FLAG(FLAGS_quic_restart_flag_quic_session_tickets_always_enabled, true)
 QUIC_FLAG(FLAGS_quic_restart_flag_quic_support_release_time_for_gso, false)
 QUIC_FLAG(FLAGS_quic_restart_flag_quic_testonly_default_false, false)
 QUIC_FLAG(FLAGS_quic_restart_flag_quic_testonly_default_true, true)