Skip to content

stream info: wire http protocol to the connection info #10627

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
mattklein123 merged 2 commits into from
Apr 6, 2020
Merged

stream info: wire http protocol to the connection info #10627

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
63b94e1
stream info: wire http protocol to the connection info
kyessenov Apr 2, 2020
a1a3b6d
Merge remote-tracking branch 'upstream/master' into add_protocols
kyessenov Apr 2, 2020
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
4 changes: 4 additions & 0 deletions source/common/http/conn_manager_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,10 @@ Network::FilterStatus ConnectionManagerImpl::onData(Buffer::Instance& data, bool
}
} while (redispatch);

if (!read_callbacks_->connection().streamInfo().protocol()) {
read_callbacks_->connection().streamInfo().protocol(codec_->protocol());
}

return Network::FilterStatus::StopIteration;
}

Expand Down
3 changes: 3 additions & 0 deletions test/common/http/conn_manager_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4138,6 +4138,7 @@ TEST_F(HttpConnectionManagerImplTest, FilterHeadReply) {
EXPECT_CALL(*decoder_filters_[0], decodeComplete());
// Kick off the incoming data.
Buffer::OwnedImpl fake_input("1234");
EXPECT_CALL(filter_callbacks_.connection_.stream_info_, protocol(Envoy::Http::Protocol::Http11));
conn_manager_->onData(fake_input, false);
}

Expand Down Expand Up @@ -4613,6 +4614,7 @@ TEST_F(HttpConnectionManagerImplTest, FilterDirectDecodeEncodeDataNoTrailers) {

// Kick off the incoming data.
Buffer::OwnedImpl fake_input("1234");
EXPECT_CALL(filter_callbacks_.connection_.stream_info_, protocol(Envoy::Http::Protocol::Http11));
conn_manager_->onData(fake_input, false);

Buffer::OwnedImpl decoded_data_to_forward;
Expand Down Expand Up @@ -4791,6 +4793,7 @@ TEST_F(HttpConnectionManagerImplTest, MultipleFilters) {

// Kick off the incoming data.
Buffer::OwnedImpl fake_input("1234");
EXPECT_CALL(filter_callbacks_.connection_.stream_info_, protocol(Envoy::Http::Protocol::Http11));
conn_manager_->onData(fake_input, false);

// Mimic a decoder filter that trapped data and now sends it on, since the data was buffered
Expand Down