Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Hamilton <[email protected]>
  • Loading branch information
RyanTheOptimist committed Mar 13, 2024
1 parent fd0f89b commit 74858e6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
1 change: 0 additions & 1 deletion source/common/quic/envoy_quic_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ class EnvoyQuicStream : public virtual Http::StreamEncoder,
std::unique_ptr<Http::MetadataMap>
metadataMapFromHeaderList(const quic::QuicHeaderList& header_list);


// Returns true if the cumulative limit on METADATA headers has been reached
// after adding `bytes`.
bool mustRejectMetadata(size_t bytes) {
Expand Down
22 changes: 10 additions & 12 deletions test/integration/multiplexed_integration_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@ class Http2MetadataIntegrationTest : public HttpProtocolIntegrationTest {
protocol_options.mutable_explicit_http_config()
->mutable_http2_protocol_options()
->set_allow_metadata(true);

}
ConfigHelper::setProtocolOptions(
*bootstrap.mutable_static_resources()->mutable_clusters(0), protocol_options);
Expand All @@ -302,7 +301,8 @@ class Http2MetadataIntegrationTest : public HttpProtocolIntegrationTest {
[&](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager&
hcm) -> void {
hcm.mutable_http2_protocol_options()->set_allow_metadata(true);
hcm.mutable_http3_protocol_options()->set_allow_metadata(true); });
hcm.mutable_http3_protocol_options()->set_allow_metadata(true);
});
}

void testRequestMetadataWithStopAllFilter();
Expand All @@ -311,9 +311,7 @@ class Http2MetadataIntegrationTest : public HttpProtocolIntegrationTest {

void runHeaderOnlyTest(bool send_request_body, size_t body_size);

Http::CodecClient::Type upstreamProtocol() {
return GetParam().upstream_protocol;
}
Http::CodecClient::Type upstreamProtocol() { return GetParam().upstream_protocol; }

protected:
// Utility function to prepend filters. Note that the filters
Expand Down Expand Up @@ -590,13 +588,13 @@ TEST_P(Http2MetadataIntegrationTest, TestResponseMetadata) {
EXPECT_EQ(4, response->metadataMapsDecodedCount());

// Upstream responds with headers, 100-continue and data.
response =
codec_client_->makeRequestWithBody(Http::TestRequestHeaderMapImpl{{":method", "GET"},
{":path", "/dynamo/url"},
{":scheme", "http"},
{":authority", "sni.lyft.com"},
{"expect", "100-contINUE"}},
10);
response = codec_client_->makeRequestWithBody(
Http::TestRequestHeaderMapImpl{{":method", "GET"},
{":path", "/dynamo/url"},
{":scheme", "http"},
{":authority", "sni.lyft.com"},
{"expect", "100-contINUE"}},
10);

waitForNextUpstreamRequest();
upstream_request_->encode1xxHeaders(Http::TestResponseHeaderMapImpl{{":status", "100"}});
Expand Down

0 comments on commit 74858e6

Please sign in to comment.