Skip to content

quiche: update QUICHE to commit 72442c9337bac2fa6865e223e56fe9aac90d84a8 #18490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alyssawilk merged 2 commits into from
Oct 7, 2021
Merged

quiche: update QUICHE to commit 72442c9337bac2fa6865e223e56fe9aac90d84a8 #18490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51398f8
update tar
danzh1989 Oct 6, 2021
fdad1d2
Merge branch 'master' into updatetar17
danzh1989 Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions bazel/external/quiche.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"],
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions source/common/quic/platform/quic_logging_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
5 changes: 1 addition & 4 deletions test/integration/quic_http_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down