diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD index 9adef6754908..edf01db3bbb4 100644 --- a/bazel/external/quiche.BUILD +++ b/bazel/external/quiche.BUILD @@ -44,7 +44,6 @@ src_files = glob([ test_suite( name = "ci_tests", tests = [ - "http2_adapter_callback_visitor_test", "http2_adapter_event_forwarder_test", "http2_adapter_header_validator_test", "http2_adapter_impl_comparison_test", @@ -77,35 +76,25 @@ envoy_cc_test_library( ) envoy_cc_library( - name = "http2_adapter_callback_visitor", - srcs = ["quiche/http2/adapter/callback_visitor.cc"], - hdrs = ["quiche/http2/adapter/callback_visitor.h"], + name = "http2_adapter_chunked_buffer", + srcs = ["quiche/http2/adapter/chunked_buffer.cc"], + hdrs = ["quiche/http2/adapter/chunked_buffer.h"], copts = quiche_copts, - local_defines = ["NGHTTP2_16"], repository = "@envoy", deps = [ - ":http2_adapter_http2_util", - ":http2_adapter_http2_visitor_interface", - ":http2_adapter_nghttp2_include", - ":http2_adapter_nghttp2_util", - ":quiche_common_callbacks", + ":quiche_common_circular_deque_lib", ":quiche_common_platform_export", ], ) envoy_cc_test( - name = "http2_adapter_callback_visitor_test", - srcs = ["quiche/http2/adapter/callback_visitor_test.cc"], + name = "http2_adapter_chunked_buffer_test", + srcs = ["quiche/http2/adapter/chunked_buffer_test.cc"], copts = quiche_copts, repository = "@envoy", deps = [ - ":http2_adapter_callback_visitor", - ":http2_adapter_mock_nghttp2_callbacks", - ":http2_adapter_nghttp2_adapter", - ":http2_adapter_nghttp2_test_utils", - ":http2_adapter_test_frame_sequence", - ":http2_adapter_test_utils", ":quiche_common_platform_test", + "@com_google_absl//absl/strings", ], ) @@ -285,7 +274,6 @@ envoy_cc_library( copts = quiche_copts, repository = "@envoy", deps = [ - ":http2_adapter_callback_visitor", ":http2_adapter_data_source", ":http2_adapter_http2_protocol", ":http2_adapter_http2_util", @@ -450,7 +438,7 @@ envoy_cc_library( ], repository = "@envoy", deps = [ - ":http2_adapter_callback_visitor", + ":http2_adapter_chunked_buffer", ":http2_adapter_data_source", ":http2_adapter_event_forwarder", ":http2_adapter_header_validator", @@ -2023,6 +2011,31 @@ envoy_quic_cc_library( deps = [":quic_platform_export"], ) +envoy_quic_cc_library( + name = "quic_core_blocked_writer_list_lib", + srcs = ["quiche/quic/core/quic_blocked_writer_list.cc"], + hdrs = ["quiche/quic/core/quic_blocked_writer_list.h"], + deps = [ + ":quic_core_blocked_writer_interface_lib", + ":quic_platform_base", + ":quic_platform_bug_tracker", + ":quiche_common_lib", + ], +) + +envoy_cc_test( + name = "quic_core_blocked_writer_list_test", + srcs = ["quiche/quic/core/quic_blocked_writer_list_test.cc"], + copts = quiche_copts, + repository = "@envoy", + tags = ["nofips"], + deps = [ + ":quic_core_blocked_writer_interface_lib", + ":quic_core_blocked_writer_list_lib", + ":quic_platform_test", + ], +) + envoy_quic_cc_library( name = "quic_core_arena_scoped_ptr_lib", hdrs = ["quiche/quic/core/quic_arena_scoped_ptr.h"], @@ -3904,6 +3917,7 @@ envoy_quic_cc_library( ":quic_core_alarm_factory_lib", ":quic_core_alarm_lib", ":quic_core_blocked_writer_interface_lib", + ":quic_core_blocked_writer_list_lib", ":quic_core_connection_id_generator_interface_lib", ":quic_core_connection_lib", ":quic_core_crypto_crypto_handshake_lib", diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index a32235aa842e..085f25b1e585 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1192,12 +1192,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 = "62f5f6c9caabe019240b2a4377090bb657012c3f", - sha256 = "d4d976917b173167a8d600b87f01a4b9c169d15b92625894bfce2802362c76ad", + version = "e08f8dde2d09ad28f0c3458be3703cb1c8a9c9fb", + sha256 = "749752c27151ba9dfef1676866178131bc6abb4ff9a8360e12789732ab738544", urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"], strip_prefix = "quiche-{version}", use_category = ["controlplane", "dataplane_core"], - release_date = "2024-04-19", + release_date = "2024-04-24", cpe = "N/A", license = "BSD-3-Clause", license_url = "https://github.com/google/quiche/blob/{version}/LICENSE", diff --git a/test/common/http/http2/codec_impl_test.cc b/test/common/http/http2/codec_impl_test.cc index 7f99020dac89..6f25b2b886fb 100644 --- a/test/common/http/http2/codec_impl_test.cc +++ b/test/common/http/http2/codec_impl_test.cc @@ -33,7 +33,6 @@ #include "codec_impl_test_util.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "quiche/http2/adapter/callback_visitor.h" #include "quiche/http2/adapter/nghttp2_adapter.h" using testing::_;