mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-02 15:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Bun.serve) ensure timeout reset when we write data (#13525)

Browse Source
This commit is contained in:
Ciro Spaciari
2024-08-25 20:27:49 -07:00
committed by GitHub
parent df9d18659c
commit 6fd06dd023
6 changed files with 73 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/bun-uws/src/HttpContext.h
View File

@@ -305,7 +305,7 @@ private:
/* Timeout on uncork failure */
auto [written, failed] = ((AsyncSocket<SSL> *) returnedSocket)->uncork();
if (failed) {
if (written > 0 || failed) {
/* All Http sockets timeout by this, and this behavior match the one in HttpResponse::cork */
((HttpResponse<SSL> *) s)->resetTimeout();
}

14
packages/bun-uws/src/HttpResponse.h
View File

@@ -188,11 +188,8 @@ public:
/* Success is when we wrote the entire thing without any failures */
bool success = written == data.length() && !failed;
/* If we are now at the end, start a timeout. Also start a timeout if we failed. */
if (!success || httpResponseData->offset == totalSize) {
this->resetTimeout();
}
/* Reset the timeout on each tryEnd */
this->resetTimeout();
/* Remove onAborted function if we reach the end */
if (httpResponseData->offset == totalSize) {
@@ -482,9 +479,8 @@ public:
Super::write("\r\n", 2);
auto [written, failed] = Super::write(data.data(), (int) data.length());
if (failed) {
this->resetTimeout();
}
/* Reset timeout on each sended chunk */
this->resetTimeout();
/* If we did not fail the write, accept more */
return !failed;
@@ -539,7 +535,7 @@ public:
return static_cast<HttpResponse *>(newCorkedSocket);
}
if (failed) {
if (written > 0 || failed) {
/* For now we only have one single timeout so let's use it */
/* This behavior should equal the behavior in HttpContext when uncorking fails */
this->resetTimeout();