diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD index dcf0ca5bd010..8a79f16cbb52 100644 --- a/bazel/external/quiche.BUILD +++ b/bazel/external/quiche.BUILD @@ -3054,7 +3054,6 @@ envoy_quic_cc_library( ":quic_core_alarm_lib", ":quic_core_crypto_encryption_lib", ":quic_core_http_server_initiated_spdy_stream_lib", - ":quic_core_http_spdy_server_push_utils_header", ":quic_core_http_spdy_session_lib", ":quic_core_packets_lib", ":quic_core_qpack_qpack_streams_lib", @@ -3131,15 +3130,6 @@ envoy_quic_cc_library( ], ) -envoy_quic_cc_library( - name = "quic_core_http_spdy_server_push_utils_header", - hdrs = ["quiche/quic/core/http/spdy_server_push_utils.h"], - deps = [ - ":quic_platform_base", - ":spdy_core_http2_header_block_lib", - ], -) - envoy_quic_cc_library( name = "quic_core_http_spdy_session_lib", srcs = [ diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index c4678a20728e..d6ab90ba6707 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1123,12 +1123,12 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "QUICHE", project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols", project_url = "https://github.com/google/quiche", - version = "92faee243386c6234f39ab5f3debbbd480cfcff6", - sha256 = "1e7e5c08c4b00dccc1d41a5db9ffe856db6d4174149f9d32561b07fead532229", + version = "30c4298fbadc820dbbbf7721c72b279722856930", + sha256 = "ec26667dd7e0d6e22d2d7f34d5310a5fd18da6449488f4aab24b3f2a89cff795", urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"], strip_prefix = "quiche-{version}", use_category = ["controlplane", "dataplane_core"], - release_date = "2023-10-11", + release_date = "2023-10-18", cpe = "N/A", license = "BSD-3-Clause", license_url = "https://github.com/google/quiche/blob/{version}/LICENSE", diff --git a/source/common/quic/platform/quiche_flags_impl.cc b/source/common/quic/platform/quiche_flags_impl.cc index 39f16f4cca4a..60dc6622a7a7 100644 --- a/source/common/quic/platform/quiche_flags_impl.cc +++ b/source/common/quic/platform/quiche_flags_impl.cc @@ -63,13 +63,6 @@ template <> constexpr int32_t maybeOverride(absl::string_view name, int // Flag definitions #define QUIC_FLAG(flag, value) ABSL_FLAG(bool, envoy_##flag, maybeOverride(#flag, value), ""); #include "quiche/quic/core/quic_flags_list.h" -QUIC_FLAG(quic_reloadable_flag_spdy_testonly_default_true, true) // NOLINT -QUIC_FLAG(quic_restart_flag_spdy_testonly_default_false, false) // NOLINT -QUIC_FLAG(quic_restart_flag_spdy_testonly_default_true, true) // NOLINT -QUIC_FLAG(quic_reloadable_flag_http2_testonly_default_false, false) // NOLINT -QUIC_FLAG(quic_reloadable_flag_http2_testonly_default_true, true) // NOLINT -QUIC_FLAG(quic_restart_flag_http2_testonly_default_false, false) // NOLINT -QUIC_FLAG(quic_restart_flag_http2_testonly_default_true, true) // NOLINT #undef QUIC_FLAG #define DEFINE_PROTOCOL_FLAG_IMPL(type, flag, value, help) \ diff --git a/source/common/quic/platform/quiche_flags_impl.h b/source/common/quic/platform/quiche_flags_impl.h index de425c9b05eb..e65277a3b9e4 100644 --- a/source/common/quic/platform/quiche_flags_impl.h +++ b/source/common/quic/platform/quiche_flags_impl.h @@ -47,14 +47,6 @@ class FlagRegistry { // Flag declarations #define QUIC_FLAG(flag, ...) ABSL_DECLARE_FLAG(bool, envoy_##flag); #include "quiche/quic/core/quic_flags_list.h" -QUIC_FLAG(quic_reloadable_flag_spdy_testonly_default_false, false) // NOLINT -QUIC_FLAG(quic_reloadable_flag_spdy_testonly_default_true, true) // NOLINT -QUIC_FLAG(quic_restart_flag_spdy_testonly_default_false, false) // NOLINT -QUIC_FLAG(quic_restart_flag_spdy_testonly_default_true, true) // NOLINT -QUIC_FLAG(quic_reloadable_flag_http2_testonly_default_false, false) // NOLINT -QUIC_FLAG(quic_reloadable_flag_http2_testonly_default_true, true) // NOLINT -QUIC_FLAG(quic_restart_flag_http2_testonly_default_false, false) // NOLINT -QUIC_FLAG(quic_restart_flag_http2_testonly_default_true, true) // NOLINT #undef QUIC_FLAG #define QUIC_PROTOCOL_FLAG(type, flag, ...) ABSL_DECLARE_FLAG(type, envoy_##flag);