Skip to content

~ bugfixes grwprintf_t size #53

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

~ bugfixes grwprintf_t size #53

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab05842
~ bugfixes grwprintf_t size
userhdisk Jan 31, 2021
e82a029
Fix broken connection after interrupted write.
suyjuris Dec 2, 2021
e4549cf
Merge pull request #1 from suyjuris/master
userhdisk Aug 23, 2022
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
11 changes: 10 additions & 1 deletion httpserver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,7 @@ void hs_server_init(struct http_server_s* serv);
void hs_delete_events(struct http_request_s* request);
void hs_add_events(struct http_request_s* request);
void hs_add_write_event(struct http_request_s* request);
void hs_add_read_event(struct http_request_s* request);
void hs_process_tokens(http_request_t* request);

#ifdef KQUEUE
Expand Down Expand Up @@ -1093,6 +1094,7 @@ void hs_write_response(http_request_t* request) {
request->state = HTTP_SESSION_INIT;
hs_free_buffer(request);
hs_reset_timeout(request, HTTP_KEEP_ALIVE_TIMEOUT);
hs_add_read_event(request);
} else {
HTTP_FLAG_SET(request->flags, HTTP_END_SESSION);
}
Expand Down Expand Up @@ -1457,7 +1459,7 @@ void grwprintf(grwprintf_t* ctx, char const * fmt, ...) {
*ctx->memused += ctx->capacity;
ctx->buf = (char*)realloc(ctx->buf, ctx->capacity);
assert(ctx->buf != NULL);
bytes += vsnprintf(ctx->buf + ctx->size, ctx->capacity - ctx->size, fmt, args);
bytes = vsnprintf(ctx->buf + ctx->size, ctx->capacity - ctx->size, fmt, args);
}
ctx->size += bytes;

Expand Down Expand Up @@ -1754,6 +1756,13 @@ void hs_add_write_event(http_request_t* request) {
epoll_ctl(request->server->loop, EPOLL_CTL_MOD, request->socket, &ev);
}

void hs_add_read_event(http_request_t* request) {
struct epoll_event ev;
ev.events = EPOLLIN | EPOLLET;
ev.data.ptr = request;
epoll_ctl(request->server->loop, EPOLL_CTL_MOD, request->socket, &ev);
}

#endif

#endif
Expand Down