Skip to content

http_server_http1: updated the request size measurement function #10062

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
edsiper merged 1 commit into from
Mar 13, 2025
Merged

http_server_http1: updated the request size measurement function #10062

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 16 additions & 40 deletions src/http_server/flb_http_server_http1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,10 @@ static void dummy_mk_http_request_init(struct mk_http_session *session,

static int http1_evict_request(struct flb_http1_server_session *session)
{
uintptr_t session_buffer_upper_bound;
uintptr_t session_buffer_lower_bound;
size_t session_buffer_length;
cfl_sds_t session_buffer;
size_t content_length;
size_t request_length;
uintptr_t request_end;

request_end = 0;
content_length = 0;
session_buffer = session->parent->incoming_data;

if (session_buffer == NULL) {
Expand All @@ -87,46 +81,28 @@ static int http1_evict_request(struct flb_http1_server_session *session)

session_buffer_length = cfl_sds_len(session_buffer);

if (session->inner_request.data.data != NULL) {
content_length = session->inner_request.data.len;
request_length = mk_http_parser_request_size(&session->inner_parser,
session_buffer,
session_buffer_length);

request_end = (uintptr_t) session->inner_request.data.data;
request_end += content_length;
}
else {
request_end = (uintptr_t) strstr(session_buffer,
"\r\n\r\n");
if (request_length == -1 ||
request_length > session_buffer_length) {
cfl_sds_set_len(session_buffer, 0);

if(request_end != 0) {
request_end += 4;
}
return -1;
}

if (request_end != 0) {
session_buffer_lower_bound = (uintptr_t) session_buffer;
session_buffer_upper_bound = (uintptr_t) &session_buffer[session_buffer_length];

if (request_end < session_buffer_lower_bound ||
request_end > session_buffer_upper_bound) {
return -1;
}

request_length = (size_t) (request_end - session_buffer_lower_bound);

if (request_length == session_buffer_length) {
session_buffer_length = 0;
}
else {
session_buffer_length -= request_length;
if ((session_buffer_length - request_length) > 0) {
session_buffer_length -= request_length;

memmove(session_buffer,
&session_buffer[request_length],
session_buffer_length);
memmove(session_buffer,
&session_buffer[request_length],
session_buffer_length);

session_buffer[session_buffer_length] = '\0';
}

cfl_sds_set_len(session_buffer, session_buffer_length);
session_buffer[session_buffer_length] = '\0';
}
else {
cfl_sds_set_len(session_buffer, 0);
}

return 0;
Expand Down
Loading