Skip to content

Fetch: fixed handling of Content-Length header when body is provided. #933

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
xeioex merged 1 commit into from
Jun 18, 2025
Merged

Fetch: fixed handling of Content-Length header when body is provided. #933

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
21 changes: 20 additions & 1 deletion nginx/ngx_js_fetch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ ngx_js_ext_fetch(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
ngx_url_t u;
ngx_uint_t i;
njs_bool_t has_host;
ngx_str_t method;
ngx_pool_t *pool;
njs_value_t *init, *value;
ngx_js_http_t *http;
Expand Down Expand Up @@ -674,6 +675,13 @@ ngx_js_ext_fetch(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
continue;
}

if (h[i].key.len == 14
&& ngx_strncasecmp(h[i].key.data, (u_char *) "Content-Length", 14)
== 0)
{
continue;
}

njs_chb_append(&http->chain, h[i].key.data, h[i].key.len);
njs_chb_append_literal(&http->chain, ": ");
njs_chb_append(&http->chain, h[i].value.data, h[i].value.len);
Expand All @@ -693,7 +701,18 @@ ngx_js_ext_fetch(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
njs_chb_append(&http->chain, request.body.data, request.body.len);

} else {
njs_chb_append_literal(&http->chain, CRLF);
method = request.method;

if ((method.len == 4
&& (ngx_strncasecmp(method.data, (u_char *) "POST", 4) == 0))
|| (method.len == 3
&& ngx_strncasecmp(method.data, (u_char *) "PUT", 3) == 0))
{
njs_chb_append_literal(&http->chain, "Content-Length: 0" CRLF CRLF);

} else {
njs_chb_append_literal(&http->chain, CRLF);
}
}

if (u.addrs == NULL) {
Expand Down
21 changes: 20 additions & 1 deletion nginx/ngx_qjs_fetch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ ngx_qjs_ext_fetch(JSContext *cx, JSValueConst this_val, int argc,
JSValue init, value, promise;
ngx_int_t rc;
ngx_url_t u;
ngx_str_t method;
ngx_uint_t i;
ngx_pool_t *pool;
ngx_js_ctx_t *ctx;
Expand Down Expand Up @@ -410,6 +411,13 @@ ngx_qjs_ext_fetch(JSContext *cx, JSValueConst this_val, int argc,
continue;
}

if (h[i].key.len == 14
&& ngx_strncasecmp(h[i].key.data, (u_char *) "Content-Length", 14)
== 0)
{
continue;
}

njs_chb_append(&http->chain, h[i].key.data, h[i].key.len);
njs_chb_append_literal(&http->chain, ": ");
njs_chb_append(&http->chain, h[i].value.data, h[i].value.len);
Expand All @@ -429,7 +437,18 @@ ngx_qjs_ext_fetch(JSContext *cx, JSValueConst this_val, int argc,
njs_chb_append(&http->chain, request.body.data, request.body.len);

} else {
njs_chb_append_literal(&http->chain, CRLF);
method = request.method;

if ((method.len == 4
&& (ngx_strncasecmp(method.data, (u_char *) "POST", 4) == 0))
|| (method.len == 3
&& ngx_strncasecmp(method.data, (u_char *) "PUT", 3) == 0))
{
njs_chb_append_literal(&http->chain, "Content-Length: 0" CRLF CRLF);

} else {
njs_chb_append_literal(&http->chain, CRLF);
}
}

if (u.addrs == NULL) {
Expand Down
23 changes: 21 additions & 2 deletions nginx/t/js_fetch.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ http {
js_content test.body;
}

location /body_content_length {
js_content test.body_content_length;
}

location /body_special {
js_content test.body_special;
}
Expand Down Expand Up @@ -156,6 +160,13 @@ $t->write_file('test.js', <<EOF);
.catch(e => r.return(501, e.message))
}

async function body_content_length(r) {
let resp = await ngx.fetch(`http://127.0.0.1:$p0/loc`,
{headers: {'Content-Length': '100'},
body: "CONTENT-BODY"});
r.return(resp.status);
}

function property(r) {
var opts = {headers:{}};

Expand Down Expand Up @@ -400,12 +411,12 @@ $t->write_file('test.js', <<EOF);

export default {njs: test_njs, body, broken, broken_response, body_special,
chain, chunked_ok, chunked_fail, header, header_iter,
host_header, multi, loc, property};
host_header, multi, loc, property, body_content_length };
EOF

$t->try_run('no njs.fetch');

$t->plan(37);
$t->plan(38);

$t->run_daemon(\&http_daemon, port(8082));
$t->waitforsocket('127.0.0.1:' . port(8082));
Expand Down Expand Up @@ -508,6 +519,14 @@ like(http_get('/body_special?loc=head/large&method=HEAD'),
qr/200 OK.*<empty>$/s, 'fetch head method large content-length');
}

TODO: {
local $TODO = 'not yet' unless has_version('0.9.1');

like(http_get('/body_content_length'), qr/200 OK/s,
'fetch body content-length');

}

###############################################################################

sub has_version {
Expand Down