Skip to content

Commit d62a5e2

Browse files
contrib: updated njs to 0.8.5
njs changed strings API so now instead of njs_vm_value_string_set() used njs_vm_value_string_create() as a drop-in replacement. Link: <nginx/njs@5730d5f>
1 parent 8e254a4 commit d62a5e2

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

pkg/contrib/src/njs/SHA512SUMS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
450f6866141f6f370767149c8749e84c4373f401d6d2237ca85365a851ebe7bdbd8a3c25e85a55747673e8bef2238a979dd237d5fc5c641b2f3f2cf7f26dffc8 njs-0.8.4.tar.gz
1+
09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c njs-0.8.5.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.4
1+
NJS_VERSION := 0.8.5

src/nxt_http_js.c

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
120120
return NJS_DECLINED;
121121
}
122122

123-
return njs_vm_value_string_set(vm, retval, r->path->start, r->path->length);
123+
return njs_vm_value_string_create(vm, retval, r->path->start,
124+
r->path->length);
124125
}
125126

126127

@@ -136,7 +137,8 @@ nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
136137
return NJS_DECLINED;
137138
}
138139

139-
return njs_vm_value_string_set(vm, retval, r->host.start, r->host.length);
140+
return njs_vm_value_string_create(vm, retval, r->host.start,
141+
r->host.length);
140142
}
141143

142144

@@ -152,9 +154,9 @@ nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_prop_t *prop,
152154
return NJS_DECLINED;
153155
}
154156

155-
return njs_vm_value_string_set(vm, retval,
156-
nxt_sockaddr_address(r->remote),
157-
r->remote->address_length);
157+
return njs_vm_value_string_create(vm, retval,
158+
nxt_sockaddr_address(r->remote),
159+
r->remote->address_length);
158160
}
159161

160162

@@ -215,8 +217,8 @@ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_prop_t *prop,
215217
if (key.length == f->name_length
216218
&& memcmp(key.start, f->name, f->name_length) == 0)
217219
{
218-
return njs_vm_value_string_set(vm, retval, f->value,
219-
f->value_length);
220+
return njs_vm_value_string_create(vm, retval, f->value,
221+
f->value_length);
220222
}
221223

222224
} nxt_list_loop;
@@ -251,7 +253,7 @@ nxt_http_js_ext_keys_header(njs_vm_t *vm, njs_value_t *value, njs_value_t *keys)
251253
return NJS_ERROR;
252254
}
253255

254-
rc = njs_vm_value_string_set(vm, value, f->name, f->name_length);
256+
rc = njs_vm_value_string_create(vm, value, f->name, f->name_length);
255257
if (rc != NJS_OK) {
256258
return NJS_ERROR;
257259
}
@@ -297,8 +299,8 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_prop_t *prop,
297299
if (key.length == nv->name_length
298300
&& memcmp(key.start, nv->name, nv->name_length) == 0)
299301
{
300-
return njs_vm_value_string_set(vm, retval, nv->value,
301-
nv->value_length);
302+
return njs_vm_value_string_create(vm, retval, nv->value,
303+
nv->value_length);
302304
}
303305
}
304306

@@ -341,7 +343,7 @@ nxt_http_js_ext_keys_cookie(njs_vm_t *vm, njs_value_t *value, njs_value_t *keys)
341343
return NJS_ERROR;
342344
}
343345

344-
rc = njs_vm_value_string_set(vm, value, nv->name, nv->name_length);
346+
rc = njs_vm_value_string_create(vm, value, nv->name, nv->name_length);
345347
if (rc != NJS_OK) {
346348
return NJS_ERROR;
347349
}
@@ -381,7 +383,7 @@ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
381383
vv = nxt_var_get(&r->task, rtcf->tstr_state, &r->tstr_cache.var, &name, r);
382384

383385
if (vv != NULL) {
384-
return njs_vm_value_string_set(vm, retval, vv->start, vv->length);
386+
return njs_vm_value_string_create(vm, retval, vv->start, vv->length);
385387
}
386388

387389
njs_value_undefined_set(retval);

0 commit comments

Comments
 (0)