diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD index 662ae2cd1ef88..8866c95b53eea 100644 --- a/bazel/external/quiche.BUILD +++ b/bazel/external/quiche.BUILD @@ -2289,6 +2289,21 @@ envoy_cc_library( deps = [":quic_core_types_lib"], ) +envoy_cc_library( + name = "quic_core_http_capsule_lib", + srcs = ["quiche/quic/core/http/capsule.cc"], + hdrs = ["quiche/quic/core/http/capsule.h"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":quic_core_buffer_allocator_lib", + ":quic_core_data_lib", + ":quic_core_http_http_frames_lib", + ":quic_core_types_lib", + ":quic_platform_base", + ], +) + envoy_cc_library( name = "quic_core_http_client_lib", srcs = [ @@ -2387,6 +2402,7 @@ envoy_cc_library( repository = "@envoy", tags = ["nofips"], deps = [ + ":quic_core_http_http_constants_lib", ":quic_core_types_lib", ":quic_platform_base", ":spdy_core_framer_lib", @@ -2430,6 +2446,7 @@ envoy_cc_library( "quiche/quic/core/http/quic_spdy_session.cc", "quiche/quic/core/http/quic_spdy_stream.cc", "quiche/quic/core/http/web_transport_http3.cc", + "quiche/quic/core/http/web_transport_stream_adapter.cc", ], hdrs = [ "quiche/quic/core/http/quic_headers_stream.h", @@ -2440,6 +2457,7 @@ envoy_cc_library( "quiche/quic/core/http/quic_spdy_session.h", "quiche/quic/core/http/quic_spdy_stream.h", "quiche/quic/core/http/web_transport_http3.h", + "quiche/quic/core/http/web_transport_stream_adapter.h", ], copts = quiche_copts, repository = "@envoy", @@ -2449,6 +2467,7 @@ envoy_cc_library( ":quic_core_connection_lib", ":quic_core_crypto_crypto_handshake_lib", ":quic_core_error_codes_lib", + ":quic_core_http_capsule_lib", ":quic_core_http_header_list_lib", ":quic_core_http_http_constants_lib", ":quic_core_http_http_decoder_lib", @@ -2467,7 +2486,6 @@ envoy_cc_library( ":quic_core_utils_lib", ":quic_core_versions_lib", ":quic_core_web_transport_interface_lib", - ":quic_core_web_transport_stream_adapter", ":quic_platform_base", ":quic_platform_mem_slice_storage", ":spdy_core_framer_lib", @@ -3150,19 +3168,6 @@ envoy_cc_library( ], ) -envoy_cc_library( - name = "quic_core_web_transport_stream_adapter", - srcs = ["quiche/quic/core/web_transport_stream_adapter.cc"], - hdrs = ["quiche/quic/core/web_transport_stream_adapter.h"], - copts = quiche_copts, - repository = "@envoy", - tags = ["nofips"], - deps = [ - ":quic_core_session_lib", - ":quic_core_web_transport_interface_lib", - ], -) - envoy_cc_library( name = "quic_core_server_id_lib", srcs = ["quiche/quic/core/quic_server_id.cc"], diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 75a607f6a70fd..2d66d7458ca10 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -834,12 +834,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 = "4c1d482ab708b6e945afc53816e1bf5dc342f11e", - sha256 = "454002442133ed5dfff59686a8569effc48aabb21a756b92e1ab2173f632cc14", + version = "72442c9337bac2fa6865e223e56fe9aac90d84a8", + sha256 = "ababed9c36cb16e43e7f1d508ae4a6ea89831752944fded3fb4fd2b3bead0bad", urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"], strip_prefix = "quiche-{version}", use_category = ["dataplane_core"], - release_date = "2021-09-27", + release_date = "2021-10-06", cpe = "N/A", ), com_googlesource_googleurl = dict( diff --git a/source/common/quic/platform/quic_logging_impl.h b/source/common/quic/platform/quic_logging_impl.h index f5dc65dd7c431..10fdb01e91e2c 100644 --- a/source/common/quic/platform/quic_logging_impl.h +++ b/source/common/quic/platform/quic_logging_impl.h @@ -128,6 +128,7 @@ #endif #define QUICHE_PREDICT_FALSE_IMPL(x) ABSL_PREDICT_FALSE(x) +#define QUICHE_PREDICT_TRUE_IMPL(x) ABSL_PREDICT_TRUE(x) namespace quic { diff --git a/test/integration/quic_http_integration_test.cc b/test/integration/quic_http_integration_test.cc index 2b957e0ae46a5..1fbd3ceb5a4c2 100644 --- a/test/integration/quic_http_integration_test.cc +++ b/test/integration/quic_http_integration_test.cc @@ -71,10 +71,7 @@ class QuicHttpIntegrationTest : public HttpIntegrationTest, : HttpIntegrationTest(Http::CodecType::HTTP3, GetParam(), ConfigHelper::quicHttpProxyConfig()), supported_versions_(quic::CurrentSupportedHttp3Versions()), conn_helper_(*dispatcher_), - alarm_factory_(*dispatcher_, *conn_helper_.GetClock()) { - // Enable this flag for test coverage. - SetQuicReloadableFlag(quic_tls_set_signature_algorithm_prefs, true); - } + alarm_factory_(*dispatcher_, *conn_helper_.GetClock()) {} ~QuicHttpIntegrationTest() override { cleanupUpstreamAndDownstream();