Skip to content
This repository was archived by the owner on Oct 8, 2025. It is now read-only.

Commit 7e1f4a7

Browse files
ac000ac000
committed
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 <sergey.osokin@nginx.com> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
1 parent 0a89e83 commit 7e1f4a7

File tree

4 files changed

+34
-25
lines changed

4 files changed

+34
-25
lines changed

‎auto/njs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ nxt_feature_incs="$NXT_NJS_CFLAGS $NXT_NJS_AUX_CFLAGS"
2525
nxt_feature_libs="$NXT_NJS_LIBS $NXT_NJS_AUX_LIBS"
2626
nxt_feature_test="#include <njs.h>
2727

28-
#if NJS_VERSION_NUMBER < 0x000803
29-
# error njs < 0.8.3 is not supported.
28+
#if NJS_VERSION_NUMBER < 0x000900
29+
# error njs < 0.9.0 is not supported.
3030
#endif
3131

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

4545
if [ $nxt_found = no ]; then
4646
$echo
47-
$echo $0: error: no njs library \>= 0.8.3 found.
47+
$echo $0: error: no njs library \>= 0.9.0 found.
4848
$echo
4949
exit 1;
5050
fi

‎pkg/contrib/src/njs/SHA512SUMS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2929bde53863ec5099badf17fc125894bd6fbff9b3b5e5088b51d8af40895d584d0f014aae98902c7db0d5e0e48fa090ebc361fdc9dc6a6da9c2714c1d48a3ac njs-0.8.8.tar.gz
1+
a8c893593606ee5f16df65e0d7214b3487e39dbc85e0d2dd907dd086b8bf9f06b0b902000d31bdaa1836ae6aaae001d2624b4499daf887b775be5e79a32956aa njs-0.9.0.tar.gz

‎pkg/contrib/src/njs/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
NJS_VERSION := 0.8.8
1+
NJS_VERSION := 0.9.0

‎src/nxt_http_js.c‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,31 @@
99

1010

1111
static njs_int_t nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
12-
njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
12+
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
13+
njs_value_t *retval);
1314
static njs_int_t nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
14-
njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
15-
static njs_int_t nxt_http_js_ext_remote_addr(njs_vm_t *vm,
16-
njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
15+
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
1716
njs_value_t *retval);
17+
static njs_int_t nxt_http_js_ext_remote_addr(njs_vm_t *vm,
18+
njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
19+
njs_value_t *setval, njs_value_t *retval);
1820
static njs_int_t nxt_http_js_ext_get_args(njs_vm_t *vm,
19-
njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
20-
njs_value_t *retval);
21+
njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
22+
njs_value_t *setval, njs_value_t *retval);
2123
static njs_int_t nxt_http_js_ext_get_header(njs_vm_t *vm,
22-
njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
23-
njs_value_t *retval);
24+
njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
25+
njs_value_t *setval, njs_value_t *retval);
2426
static njs_int_t nxt_http_js_ext_keys_header(njs_vm_t *vm,
2527
njs_value_t *value, njs_value_t *keys);
2628
static njs_int_t nxt_http_js_ext_get_cookie(njs_vm_t *vm,
27-
njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
29+
njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
30+
njs_value_t *setval,
2831
njs_value_t *retval);
2932
static njs_int_t nxt_http_js_ext_keys_cookie(njs_vm_t *vm, njs_value_t *value,
3033
njs_value_t *keys);
3134
static njs_int_t nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
32-
njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
35+
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
36+
njs_value_t *retval);
3337

3438

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

110114

111115
static njs_int_t
112-
nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
116+
nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t atom_id,
113117
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
114118
{
115119
nxt_http_request_t *r;
@@ -126,7 +130,7 @@ nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
126130

127131

128132
static njs_int_t
129-
nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
133+
nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t atom_id,
130134
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
131135
{
132136
nxt_http_request_t *r;
@@ -144,7 +148,8 @@ nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
144148

145149
static njs_int_t
146150
nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_prop_t *prop,
147-
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
151+
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
152+
njs_value_t *retval)
148153
{
149154
nxt_http_request_t *r;
150155

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

163168
static njs_int_t
164169
nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop_t *prop,
165-
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
170+
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
171+
njs_value_t *retval)
166172
{
167173
u_char *start;
168174
njs_int_t ret;
@@ -193,7 +199,8 @@ nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop_t *prop,
193199

194200
static njs_int_t
195201
nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_prop_t *prop,
196-
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
202+
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
203+
njs_value_t *retval)
197204
{
198205
njs_int_t rc;
199206
njs_str_t key;
@@ -206,7 +213,7 @@ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_prop_t *prop,
206213
return NJS_DECLINED;
207214
}
208215

209-
rc = njs_vm_prop_name(vm, prop, &key);
216+
rc = njs_vm_prop_name(vm, atom_id, &key);
210217
if (rc != NJS_OK) {
211218
njs_value_undefined_set(retval);
212219
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)
266273

267274
static njs_int_t
268275
nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_prop_t *prop,
269-
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
276+
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
277+
njs_value_t *retval)
270278
{
271279
njs_int_t rc;
272280
njs_str_t key;
@@ -280,7 +288,7 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_prop_t *prop,
280288
return NJS_DECLINED;
281289
}
282290

283-
rc = njs_vm_prop_name(vm, prop, &key);
291+
rc = njs_vm_prop_name(vm, atom_id, &key);
284292
if (rc != NJS_OK) {
285293
njs_value_undefined_set(retval);
286294
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)
355363

356364
static njs_int_t
357365
nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
358-
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
366+
uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
367+
njs_value_t *retval)
359368
{
360369
njs_int_t rc;
361370
njs_str_t key;
@@ -369,7 +378,7 @@ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
369378
return NJS_DECLINED;
370379
}
371380

372-
rc = njs_vm_prop_name(vm, prop, &key);
381+
rc = njs_vm_prop_name(vm, atom_id, &key);
373382
if (rc != NJS_OK) {
374383
njs_value_undefined_set(retval);
375384
return NJS_DECLINED;

0 commit comments

Comments
 (0)