Skip to content

Commit

Permalink
contrib: updated njs to 0.8.5
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
andrey-zelenkov committed Jul 2, 2024
1 parent 8e254a4 commit d62a5e2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion pkg/contrib/src/njs/SHA512SUMS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
450f6866141f6f370767149c8749e84c4373f401d6d2237ca85365a851ebe7bdbd8a3c25e85a55747673e8bef2238a979dd237d5fc5c641b2f3f2cf7f26dffc8 njs-0.8.4.tar.gz
09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c njs-0.8.5.tar.gz
2 changes: 1 addition & 1 deletion pkg/contrib/src/njs/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NJS_VERSION := 0.8.4
NJS_VERSION := 0.8.5
26 changes: 14 additions & 12 deletions src/nxt_http_js.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
return NJS_DECLINED;
}

return njs_vm_value_string_set(vm, retval, r->path->start, r->path->length);
return njs_vm_value_string_create(vm, retval, r->path->start,
r->path->length);
}


Expand All @@ -136,7 +137,8 @@ nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
return NJS_DECLINED;
}

return njs_vm_value_string_set(vm, retval, r->host.start, r->host.length);
return njs_vm_value_string_create(vm, retval, r->host.start,
r->host.length);
}


Expand All @@ -152,9 +154,9 @@ nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_prop_t *prop,
return NJS_DECLINED;
}

return njs_vm_value_string_set(vm, retval,
nxt_sockaddr_address(r->remote),
r->remote->address_length);
return njs_vm_value_string_create(vm, retval,
nxt_sockaddr_address(r->remote),
r->remote->address_length);
}


Expand Down Expand Up @@ -215,8 +217,8 @@ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_prop_t *prop,
if (key.length == f->name_length
&& memcmp(key.start, f->name, f->name_length) == 0)
{
return njs_vm_value_string_set(vm, retval, f->value,
f->value_length);
return njs_vm_value_string_create(vm, retval, f->value,
f->value_length);
}

} nxt_list_loop;
Expand Down Expand Up @@ -251,7 +253,7 @@ nxt_http_js_ext_keys_header(njs_vm_t *vm, njs_value_t *value, njs_value_t *keys)
return NJS_ERROR;
}

rc = njs_vm_value_string_set(vm, value, f->name, f->name_length);
rc = njs_vm_value_string_create(vm, value, f->name, f->name_length);
if (rc != NJS_OK) {
return NJS_ERROR;
}
Expand Down Expand Up @@ -297,8 +299,8 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_prop_t *prop,
if (key.length == nv->name_length
&& memcmp(key.start, nv->name, nv->name_length) == 0)
{
return njs_vm_value_string_set(vm, retval, nv->value,
nv->value_length);
return njs_vm_value_string_create(vm, retval, nv->value,
nv->value_length);
}
}

Expand Down Expand Up @@ -341,7 +343,7 @@ nxt_http_js_ext_keys_cookie(njs_vm_t *vm, njs_value_t *value, njs_value_t *keys)
return NJS_ERROR;
}

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

if (vv != NULL) {
return njs_vm_value_string_set(vm, retval, vv->start, vv->length);
return njs_vm_value_string_create(vm, retval, vv->start, vv->length);
}

njs_value_undefined_set(retval);
Expand Down

0 comments on commit d62a5e2

Please sign in to comment.