Skip to content

More update to HTTP/2 client #2428

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
an-tao merged 2 commits into from
Dec 22, 2025
Merged

More update to HTTP/2 client #2428

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
0ea978a
allow unknown frames
marty1885 Dec 21, 2025
7d07d9c
clean up round robin sending logic
marty1885 Dec 21, 2025
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
9 changes: 8 additions & 1 deletion ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

## [1.10.0-beta.3] - TBD
## [1.10.0-beta.4] - TBD

### Fixes

* Correctly track received bytes in HTTP/2 client statistics
* Ignore unknown HTTP/2 frame types instead of treating them as fatal errors (forward compatibility)

## [1.10.0-beta.3] - 2025-12-21

### Changes

Expand Down
36 changes: 18 additions & 18 deletions lib/src/Http2Transport.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,12 +625,13 @@ parseH2Frame(trantor::MsgBuffer *msg)
// MSB is reserved for future use
const uint32_t streamId = header.readU32BE() & ((1U << 31) - 1);

if (type >= (uint8_t)H2FrameType::NumEntries)
{
// TODO: Handle fatal protocol error
LOG_TRACE << "Unsupported H2 frame type: " << (int)type;
return {std::nullopt, streamId, 0, true, 0};
}
// This check is not need as HTTP/2 allows unknown frame types to be
// ignored for forward compatibility.
// if (type >= (uint8_t)H2FrameType::NumEntries)
// {
// LOG_TRACE << "Unsupported H2 frame type: " << (int)type;
// return {std::nullopt, streamId, 0, true, 0};
// }

LOG_TRACE << "H2 frame: length=" << length << " type=" << (int)type
<< " flags=" << (int)flags << " streamId=" << streamId;
Expand All @@ -657,7 +658,7 @@ parseH2Frame(trantor::MsgBuffer *msg)
frame = RstStreamFrame::parse(payload, flags);
else
{
LOG_WARN << "Unsupported H2 frame type: " << (int)type;
LOG_TRACE << "Unsupported H2 frame type: " << (int)type;
msg->retrieve(length + 9);
return {std::nullopt, streamId, 0, false, 0};
}
Expand Down Expand Up @@ -976,28 +977,27 @@ void Http2Transport::onRecvMessage(const trantor::TcpConnectionPtr &,
auto it = currentDataSend.value_or(pendingDataSend.begin());
while (it != pendingDataSend.end())
{
auto &stream = streams[it->first];
auto [sentOffset, done] = sendBodyForStream(stream, it->second);
auto streamIt = streams.find(it->first);
assert(streamIt != streams.end()); // FATAL: must exist
auto [sentOffset, done] =
sendBodyForStream(streamIt->second, it->second);
if (done)
{
it = pendingDataSend.erase(it);
if (it != pendingDataSend.end())
currentDataSend = it;
else
if (it == pendingDataSend.end())
{
currentDataSend = std::nullopt;
break;
}
currentDataSend = it;
continue;
}
it->second = sentOffset;
if (availableTxWindow != 0)
{
++it;
currentDataSend = it;
}
else
if (availableTxWindow == 0)
break;

++it;
currentDataSend = it;
}
}
else if (std::holds_alternative<SettingsFrame>(frame))
Expand Down
Loading