summaryrefslogtreecommitdiff
path: root/ext/flash/01_http.js
diff options
context:
space:
mode:
authorKamil Ogórek <kamil.ogorek@gmail.com>2023-02-12 11:43:05 +0100
committerGitHub <noreply@github.com>2023-02-12 16:13:05 +0530
commitd4e5a295f2f9af1f815596656a185b11d7dabb29 (patch)
tree79bccb5401460ca84ea55bef9cc1348c956b5d4e /ext/flash/01_http.js
parentbbcb144a6d8360a5ff0878d738d151bad9a948e7 (diff)
fix(ext/flash): Always send correct number of bytes when handling HEAD requests (#17740)
This was not caught in the previous test case, as the response body was smaller than the size of `HEAD` response. This made `nwritten < responseLen` check in `writeFixedResponse` to fail, and not trigger `op_flash_respond_async` as a result. When the response body is larger than the `HEAD` though, as in the updated test case (`HEAD` i 120 bytes, where our response is 300 bytes), it would think that we still have something to send, and effectively panic, as `op_flash_respond` already removed the request from the pool. This change, makes the `handleResponse` function always calculate the number of bytes to transmit when `HEAD` request is encountered. Effectively ignoring `Content-Length` of the body, but still setting it correctly in the request header itself. Fixes https://github.com/denoland/deno/issues/17737
Diffstat (limited to 'ext/flash/01_http.js')
-rw-r--r--ext/flash/01_http.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/flash/01_http.js b/ext/flash/01_http.js
index 34b158e40..5152fd9e5 100644
--- a/ext/flash/01_http.js
+++ b/ext/flash/01_http.js
@@ -316,11 +316,13 @@ async function handleResponse(
respBody,
length,
);
+ // A HEAD request always ignores body, but includes the correct content-length size.
+ const responseLen = method === 1 ? core.byteLength(responseStr) : length;
writeFixedResponse(
serverId,
i,
responseStr,
- length,
+ responseLen,
!ws, // Don't close socket if there is a deferred websocket upgrade.
respondFast,
);