Skip to content

Decrement remainingStreamingBytes before dataHandler calls; simplify isLast check #1918

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

Draft
Copilot wants to merge 4 commits into
base: master
Choose a base branch
from
+47 −16
Draft

Decrement remainingStreamingBytes before dataHandler calls; simplify isLast check #1918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd3687d
Initial plan
Copilot Mar 20, 2026
cde8324
Fix remainingStreamingBytes decrement before dataHandler calls
Copilot Mar 20, 2026
17406e7
Add .gitignore to exclude compiled test binaries
Copilot Mar 20, 2026
09c37a3
Simplify isLast: use remainingStreamingBytes == 0 instead of local va…
Copilot 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
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
tests/BloomFilter
tests/ChunkedEncoding
tests/ExtensionsNegotiator
tests/HttpParser
tests/HttpRouter
tests/Query
tests/TopicTree
56 changes: 40 additions & 16 deletions src/HttpParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,15 @@ 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)) {
dataHandler(user, chunk, chunk.length() == 0);
bool isLast = chunk.length() == 0;
if (isLast) {
uint64_t savedState = remainingStreamingBytes;
remainingStreamingBytes = 0;
dataHandler(user, chunk, true);
remainingStreamingBytes = savedState;
} else {
dataHandler(user, chunk, false);
}
}
if (isParsingInvalidChunkedEncoding(remainingStreamingBytes)) {
return {HTTP_ERROR_400_BAD_REQUEST, FULLPTR};
Expand All @@ -590,8 +598,8 @@ struct HttpParser {

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

data += emittable;
length -= emittable;
Expand Down Expand Up @@ -635,7 +643,15 @@ struct HttpParser {
if (isParsingChunkedEncoding(remainingStreamingBytes)) {
std::string_view dataToConsume(data, length);
for (auto chunk : uWS::ChunkIterator(&dataToConsume, &remainingStreamingBytes)) {
dataHandler(user, chunk, chunk.length() == 0);
bool isLast = chunk.length() == 0;
if (isLast) {
uint64_t savedState = remainingStreamingBytes;
remainingStreamingBytes = 0;
dataHandler(user, chunk, true);
remainingStreamingBytes = savedState;
} else {
dataHandler(user, chunk, false);
}
}
if (isParsingInvalidChunkedEncoding(remainingStreamingBytes)) {
return {HTTP_ERROR_400_BAD_REQUEST, FULLPTR};
Expand All @@ -646,16 +662,16 @@ struct HttpParser {
// this is exactly the same as below!
// todo: refactor this
if (remainingStreamingBytes >= length) {
void *returnedUser = dataHandler(user, std::string_view(data, length), remainingStreamingBytes == length);
remainingStreamingBytes -= length;
void *returnedUser = dataHandler(user, std::string_view(data, length), remainingStreamingBytes == 0);
return {0, returnedUser};
} else {
void *returnedUser = dataHandler(user, std::string_view(data, remainingStreamingBytes), true);

data += (unsigned int) remainingStreamingBytes;
length -= (unsigned int) remainingStreamingBytes;

unsigned int toConsume = (unsigned int) remainingStreamingBytes;
remainingStreamingBytes = 0;
void *returnedUser = dataHandler(user, std::string_view(data, toConsume), true);

data += toConsume;
length -= toConsume;

if (returnedUser != user) {
return {0, returnedUser};
Expand Down Expand Up @@ -692,7 +708,15 @@ struct HttpParser {
if (isParsingChunkedEncoding(remainingStreamingBytes)) {
std::string_view dataToConsume(data, length);
for (auto chunk : uWS::ChunkIterator(&dataToConsume, &remainingStreamingBytes)) {
dataHandler(user, chunk, chunk.length() == 0);
bool isLast = chunk.length() == 0;
if (isLast) {
uint64_t savedState = remainingStreamingBytes;
remainingStreamingBytes = 0;
dataHandler(user, chunk, true);
remainingStreamingBytes = savedState;
} else {
dataHandler(user, chunk, false);
}
}
if (isParsingInvalidChunkedEncoding(remainingStreamingBytes)) {
return {HTTP_ERROR_400_BAD_REQUEST, FULLPTR};
Expand All @@ -702,16 +726,16 @@ struct HttpParser {
} else {
// this is exactly the same as above!
if (remainingStreamingBytes >= (unsigned int) length) {
void *returnedUser = dataHandler(user, std::string_view(data, length), remainingStreamingBytes == (unsigned int) length);
remainingStreamingBytes -= length;
void *returnedUser = dataHandler(user, std::string_view(data, length), remainingStreamingBytes == 0);
return {0, returnedUser};
} else {
void *returnedUser = dataHandler(user, std::string_view(data, remainingStreamingBytes), true);

data += (unsigned int) remainingStreamingBytes;
length -= (unsigned int) remainingStreamingBytes;

unsigned int toConsume = (unsigned int) remainingStreamingBytes;
remainingStreamingBytes = 0;
void *returnedUser = dataHandler(user, std::string_view(data, toConsume), true);

data += toConsume;
length -= toConsume;

if (returnedUser != user) {
return {0, returnedUser};
Expand Down