Skip to content

Decouple maxRemainingBodyLength() from live remainingStreamingBytes state #1919

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

Closed
Copilot wants to merge 4 commits into from
+13 −2
Closed

Decouple maxRemainingBodyLength() from live remainingStreamingBytes state #1919

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
baa3126
Initial plan
Copilot Mar 20, 2026
b581454
Change maxRemainingBodyLength() to read from a separate remainingBody…
Copilot Mar 20, 2026
2fa1139
Add test binaries to .gitignore and remove them from tracking
Copilot Mar 20, 2026
3d31b3b
Delete .gitignore
uNetworkingAB Mar 20, 2026
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
15 changes: 13 additions & 2 deletions src/HttpParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ struct HttpParser {
std::string fallback;
/* This guy really has only 30 bits since we reserve two highest bits to chunked encoding parsing state */
uint64_t remainingStreamingBytes = 0;
/* Set before (and only before) each call to dataHandler; equals remainingStreamingBytes minus the emitted chunk */
uint64_t remainingBodyLength = 0;

/* Returns UINT64_MAX on error. Maximum 999999999 is allowed. */
static uint64_t toUnsignedInteger(std::string_view str) {
Expand Down Expand Up @@ -571,6 +573,7 @@ struct HttpParser {
/* Go ahead and parse it (todo: better heuristics for emitting FIN to the app level) */
std::string_view dataToConsume(data, length);
for (auto chunk : uWS::ChunkIterator(&dataToConsume, &remainingStreamingBytes)) {
remainingBodyLength = (chunk.length() == 0) ? 0 : STATE_IS_CHUNKED;
dataHandler(user, chunk, chunk.length() == 0);
}
if (isParsingInvalidChunkedEncoding(remainingStreamingBytes)) {
Expand All @@ -590,6 +593,7 @@ struct HttpParser {

if (!CONSUME_MINIMALLY) {
unsigned int emittable = (unsigned int) std::min<uint64_t>(remainingStreamingBytes, length);
remainingBodyLength = remainingStreamingBytes - emittable;
dataHandler(user, std::string_view(data, emittable), emittable == remainingStreamingBytes);
remainingStreamingBytes -= emittable;

Expand All @@ -599,6 +603,7 @@ struct HttpParser {
}
} else {
/* If we came here without a body; emit an empty data chunk to signal no data */
remainingBodyLength = 0;
dataHandler(user, {}, true);
}

Expand All @@ -617,10 +622,10 @@ struct HttpParser {
public:
/* Returns the remaining body length if set via content-length, UINT64_MAX if transfer-encoding is chunked, or 0 if no body */
uint64_t maxRemainingBodyLength() {
if (isParsingChunkedEncoding(remainingStreamingBytes)) {
if (isParsingChunkedEncoding(remainingBodyLength)) {
return UINT64_MAX;
}
return remainingStreamingBytes;
return remainingBodyLength;
}

std::pair<unsigned int, void *> consumePostPadded(char *data, unsigned int length, void *user, void *reserved, MoveOnlyFunction<void *(void *, HttpRequest *)> &&requestHandler, MoveOnlyFunction<void *(void *, std::string_view, bool)> &&dataHandler) {
Expand All @@ -635,6 +640,7 @@ struct HttpParser {
if (isParsingChunkedEncoding(remainingStreamingBytes)) {
std::string_view dataToConsume(data, length);
for (auto chunk : uWS::ChunkIterator(&dataToConsume, &remainingStreamingBytes)) {
remainingBodyLength = (chunk.length() == 0) ? 0 : STATE_IS_CHUNKED;
dataHandler(user, chunk, chunk.length() == 0);
}
if (isParsingInvalidChunkedEncoding(remainingStreamingBytes)) {
Expand All @@ -646,10 +652,12 @@ struct HttpParser {
// this is exactly the same as below!
// todo: refactor this
if (remainingStreamingBytes >= length) {
remainingBodyLength = remainingStreamingBytes - length;
void *returnedUser = dataHandler(user, std::string_view(data, length), remainingStreamingBytes == length);
remainingStreamingBytes -= length;
return {0, returnedUser};
} else {
remainingBodyLength = 0;
void *returnedUser = dataHandler(user, std::string_view(data, remainingStreamingBytes), true);

data += (unsigned int) remainingStreamingBytes;
Expand Down Expand Up @@ -692,6 +700,7 @@ struct HttpParser {
if (isParsingChunkedEncoding(remainingStreamingBytes)) {
std::string_view dataToConsume(data, length);
for (auto chunk : uWS::ChunkIterator(&dataToConsume, &remainingStreamingBytes)) {
remainingBodyLength = (chunk.length() == 0) ? 0 : STATE_IS_CHUNKED;
dataHandler(user, chunk, chunk.length() == 0);
}
if (isParsingInvalidChunkedEncoding(remainingStreamingBytes)) {
Expand All @@ -702,10 +711,12 @@ struct HttpParser {
} else {
// this is exactly the same as above!
if (remainingStreamingBytes >= (unsigned int) length) {
remainingBodyLength = remainingStreamingBytes - length;
void *returnedUser = dataHandler(user, std::string_view(data, length), remainingStreamingBytes == (unsigned int) length);
remainingStreamingBytes -= length;
return {0, returnedUser};
} else {
remainingBodyLength = 0;
void *returnedUser = dataHandler(user, std::string_view(data, remainingStreamingBytes), true);

data += (unsigned int) remainingStreamingBytes;
Expand Down
Loading