Skip to content

njs: Update for version 0.9.0 API changes #1611

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
merged 1 commit into from
May 14, 2025
Merged

njs: Update for version 0.9.0 API changes #1611

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
6 changes: 3 additions & 3 deletions auto/njs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ nxt_feature_incs="$NXT_NJS_CFLAGS $NXT_NJS_AUX_CFLAGS"
nxt_feature_libs="$NXT_NJS_LIBS $NXT_NJS_AUX_LIBS"
nxt_feature_test="#include <njs.h>

#if NJS_VERSION_NUMBER < 0x000803
# error njs < 0.8.3 is not supported.
#if NJS_VERSION_NUMBER < 0x000900
# error njs < 0.9.0 is not supported.
#endif

int main(void) {
Expand All @@ -44,7 +44,7 @@ nxt_feature_test="#include <njs.h>

if [ $nxt_found = no ]; then
$echo
$echo $0: error: no njs library \>= 0.8.3 found.
$echo $0: error: no njs library \>= 0.9.0 found.
$echo
exit 1;
fi
Expand Down
2 changes: 1 addition & 1 deletion pkg/contrib/src/njs/SHA512SUMS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2929bde53863ec5099badf17fc125894bd6fbff9b3b5e5088b51d8af40895d584d0f014aae98902c7db0d5e0e48fa090ebc361fdc9dc6a6da9c2714c1d48a3ac njs-0.8.8.tar.gz
a8c893593606ee5f16df65e0d7214b3487e39dbc85e0d2dd907dd086b8bf9f06b0b902000d31bdaa1836ae6aaae001d2624b4499daf887b775be5e79a32956aa njs-0.9.0.tar.gz
2 changes: 1 addition & 1 deletion pkg/contrib/src/njs/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NJS_VERSION := 0.8.8
NJS_VERSION := 0.9.0
49 changes: 29 additions & 20 deletions src/nxt_http_js.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,31 @@


static njs_int_t nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval);
static njs_int_t nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
static njs_int_t nxt_http_js_ext_remote_addr(njs_vm_t *vm,
njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval);
static njs_int_t nxt_http_js_ext_remote_addr(njs_vm_t *vm,
njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
njs_value_t *setval, njs_value_t *retval);
static njs_int_t nxt_http_js_ext_get_args(njs_vm_t *vm,
njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval);
njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
njs_value_t *setval, njs_value_t *retval);
static njs_int_t nxt_http_js_ext_get_header(njs_vm_t *vm,
njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval);
njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
njs_value_t *setval, njs_value_t *retval);
static njs_int_t nxt_http_js_ext_keys_header(njs_vm_t *vm,
njs_value_t *value, njs_value_t *keys);
static njs_int_t nxt_http_js_ext_get_cookie(njs_vm_t *vm,
njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
njs_value_t *setval,
njs_value_t *retval);
static njs_int_t nxt_http_js_ext_keys_cookie(njs_vm_t *vm, njs_value_t *value,
njs_value_t *keys);
static njs_int_t nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval);


static njs_external_t nxt_http_js_proto[] = {
Expand Down Expand Up @@ -109,7 +113,7 @@ nxt_http_register_js_proto(nxt_js_conf_t *jcf)


static njs_int_t
nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t atom_id,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
{
nxt_http_request_t *r;
Expand All @@ -126,7 +130,7 @@ nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,


static njs_int_t
nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t atom_id,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
{
nxt_http_request_t *r;
Expand All @@ -144,7 +148,8 @@ nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,

static njs_int_t
nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval)
{
nxt_http_request_t *r;

Expand All @@ -162,7 +167,8 @@ nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_prop_t *prop,

static njs_int_t
nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval)
{
u_char *start;
njs_int_t ret;
Expand Down Expand Up @@ -193,7 +199,8 @@ nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop_t *prop,

static njs_int_t
nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval)
{
njs_int_t rc;
njs_str_t key;
Expand All @@ -206,7 +213,7 @@ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_prop_t *prop,
return NJS_DECLINED;
}

rc = njs_vm_prop_name(vm, prop, &key);
rc = njs_vm_prop_name(vm, atom_id, &key);
if (rc != NJS_OK) {
njs_value_undefined_set(retval);
return NJS_DECLINED;
Expand Down Expand Up @@ -266,7 +273,8 @@ nxt_http_js_ext_keys_header(njs_vm_t *vm, njs_value_t *value, njs_value_t *keys)

static njs_int_t
nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval)
{
njs_int_t rc;
njs_str_t key;
Expand All @@ -280,7 +288,7 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_prop_t *prop,
return NJS_DECLINED;
}

rc = njs_vm_prop_name(vm, prop, &key);
rc = njs_vm_prop_name(vm, atom_id, &key);
if (rc != NJS_OK) {
njs_value_undefined_set(retval);
return NJS_DECLINED;
Expand Down Expand Up @@ -355,7 +363,8 @@ nxt_http_js_ext_keys_cookie(njs_vm_t *vm, njs_value_t *value, njs_value_t *keys)

static njs_int_t
nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval)
{
njs_int_t rc;
njs_str_t key;
Expand All @@ -369,7 +378,7 @@ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
return NJS_DECLINED;
}

rc = njs_vm_prop_name(vm, prop, &key);
rc = njs_vm_prop_name(vm, atom_id, &key);
if (rc != NJS_OK) {
njs_value_undefined_set(retval);
return NJS_DECLINED;
Expand Down