commit 75bb6bbd704c443b15dd7f62d3049377197741c6
author bnc <bnc@google.com> Tue May 04 07:14:42 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 04 07:15:35 2021 -0700
tree 9b1ad2fb1c76a41b27a7b94362f000c0ddab25a0
parent 5c2f34612614efc0f66102c283e25bcc926c266f

Deprecate --gfe2_reloadable_flag_quic_alps_include_scheme_in_origin.

PiperOrigin-RevId: 371908135
Change-Id: I923c9089e87480675eed24de9dcc58272d5243e5

quic/core/quic_flags_list.h

diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index ec85c24..47e7169 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -10,7 +10,6 @@
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_allocate_stream_sequencer_buffer_blocks_on_demand, false)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_allow_client_enabled_bbr_v2, false)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_alps_include_scheme_in_origin, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_and_tls_allow_sni_without_dots, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_batch_writer_fix_write_blocked, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_avoid_too_low_probe_bw_cwnd, false)

quic/core/tls_server_handshaker.cc

diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc
index 2c1f2a1..537276b 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "absl/base/macros.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "third_party/boringssl/src/include/openssl/pool.h"
 #include "third_party/boringssl/src/include/openssl/ssl.h"
@@ -1004,13 +1005,7 @@
 
   const std::string& hostname = crypto_negotiated_params_->sni;
   std::string accept_ch_value = GetAcceptChValueForOrigin(hostname);
-
-  std::string origin;
-  if (GetQuicReloadableFlag(quic_alps_include_scheme_in_origin)) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_alps_include_scheme_in_origin);
-    origin = "https://";
-  }
-  origin.append(crypto_negotiated_params_->sni);
+  std::string origin = absl::StrCat("https://", hostname);
 
   if (!accept_ch_value.empty()) {
     AcceptChFrame frame{{{std::move(origin), std::move(accept_ch_value)}}};