From 7e1f4a7f7505139411818bdc03ee710a54c98488 Mon Sep 17 00:00:00 2001 From: Andrew Clayton Date: Thu, 8 May 2025 20:03:59 +0100 Subject: njs: Update for version 0.9.0 API changes This bumps the minimum required version of njs to 0.9.0 Cc: Sergey A. Osokin Signed-off-by: Andrew Clayton --- src/nxt_http_js.c | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/nxt_http_js.c b/src/nxt_http_js.c index 34689fba..ec8554c4 100644 --- a/src/nxt_http_js.c +++ b/src/nxt_http_js.c @@ -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[] = { @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; -- cgit