Skip to content

HttpResponse: write the status, Date and Content-Length lines in one piece each #1958

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
nigrosimone wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HttpResponse: write the status, Date and Content-Length lines in one piece each #1958

Show file tree
Hide file tree
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
32 changes: 22 additions & 10 deletions src/HttpResponse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,15 @@ struct HttpResponse : public AsyncSocket<SSL> {

/* Called only once per request */
void writeMark() {
/* Date is always written */
writeHeader("Date", std::string_view(((LoopData *) us_loop_ext(us_socket_context_loop(SSL, (us_socket_context(SSL, (us_socket_t *) this)))))->date, 29));
/* Date is always written, as the line prepared when the date ticks */
writeStatus(HTTP_200_OK);
Super::write(Super::getLoopData()->dateHeader, 37);

/* You can disable this altogether */
#ifndef UWS_HTTPRESPONSE_NO_WRITEMARK
if (!Super::getLoopData()->noMark) {
/* We only expose major version */
writeHeader("uWebSockets", "20");
Super::write("uWebSockets: 20\r\n", 17);
}
#endif
}
Expand Down Expand Up @@ -182,10 +183,12 @@ struct HttpResponse : public AsyncSocket<SSL> {

/* WebSocket upgrades does not allow content-length */
if (allowContentLength) {
/* Even zero is a valid content-length */
Super::write("Content-Length: ", 16);
writeUnsigned64(totalSize);
Super::write("\r\n\r\n", 4);
/* Even zero is a valid content-length. One write for the whole line */
char buf[16 + 20 + 4];
memcpy(buf, "Content-Length: ", 16);
int length = 16 + utils::u64toa(totalSize, buf + 16);
memcpy(buf + length, "\r\n\r\n", 4);
Super::write(buf, length + 4);
} else {
Super::write("\r\n", 2);
}
Expand Down Expand Up @@ -421,9 +424,18 @@ struct HttpResponse : public AsyncSocket<SSL> {
/* Update status */
httpResponseData->state |= HttpResponseData<SSL>::HTTP_STATUS_CALLED;

Super::write("HTTP/1.1 ", 9);
Super::write(status.data(), (int) status.length());
Super::write("\r\n", 2);
/* One write for the whole line when the status is short, which it nearly always is */
if (status.length() <= 64) {
char buf[9 + 64 + 2];
memcpy(buf, "HTTP/1.1 ", 9);
memcpy(buf + 9, status.data(), status.length());
memcpy(buf + 9 + status.length(), "\r\n", 2);
Super::write(buf, (int) status.length() + 11);
} else {
Super::write("HTTP/1.1 ", 9);
Super::write(status.data(), (int) status.length());
Super::write("\r\n", 2);
}
return this;
}

Expand Down
6 changes: 6 additions & 0 deletions src/LoopData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,15 @@ struct alignas(16) LoopData {
tstruct.tm_hour % 99,
tstruct.tm_min % 99,
tstruct.tm_sec % 99);

/* The whole Date header line, so a response writes it in one piece */
memcpy(dateHeader, "Date: ", 6);
memcpy(dateHeader + 6, date, 29);
memcpy(dateHeader + 35, "\r\n", 2);
}

char date[32];
char dateHeader[37];
time_t cacheTimepoint = 0;

/* Be silent */
Expand Down
Loading