technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

NJS: supported 0.8.0.

Browse Source
This commit is contained in:
Zhidao HONG
2023-07-11 09:30:50 +08:00
parent 075c6a7038
commit 18d3637e4b
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changes.xml
View File

@@ -32,6 +32,12 @@ NGINX Unit updated to 1.31.0.
date="" time="" date="" time=""
packager="Nginx Packaging <nginx-packaging@f5.com>"> packager="Nginx Packaging <nginx-packaging@f5.com>">
<change type="change">
<para>
njs updated to 0.8.0.
</para>
</change>
<change type="bugfix"> <change type="bugfix">
<para> <para>
ensure that $uri variable is not cached. ensure that $uri variable is not cached.

28
src/nxt_js.c
View File

@@ -386,11 +386,11 @@ nxt_js_call(nxt_task_t *task, nxt_js_conf_t *jcf, nxt_js_cache_t *cache,
nxt_js_t *js, nxt_str_t *str, void *ctx) nxt_js_t *js, nxt_str_t *str, void *ctx)
{ {
njs_vm_t *vm; njs_vm_t *vm;
njs_int_t rc, ret; njs_int_t ret;
njs_str_t res; njs_str_t res;
njs_value_t *array, *value; njs_value_t *value;
njs_function_t *func; njs_function_t *func;
njs_opaque_value_t opaque_value, arguments[6]; njs_opaque_value_t retval, opaque_value, arguments[6];
static const njs_str_t uri_str = njs_str("uri"); static const njs_str_t uri_str = njs_str("uri");
static const njs_str_t host_str = njs_str("host"); static const njs_str_t host_str = njs_str("host");
@@ -407,15 +407,13 @@ nxt_js_call(nxt_task_t *task, nxt_js_conf_t *jcf, nxt_js_cache_t *cache,
return NXT_ERROR; return NXT_ERROR;
} }
ret = njs_vm_start(vm); ret = njs_vm_start(vm, njs_value_arg(&retval));
if (ret != NJS_OK) { if (ret != NJS_OK) {
return NXT_ERROR; return NXT_ERROR;
} }
array = njs_vm_retval(vm);
cache->vm = vm; cache->vm = vm;
cache->array = *array; cache->array = *njs_value_arg(&retval);
} }
value = njs_vm_array_prop(vm, &cache->array, js->index, &opaque_value); value = njs_vm_array_prop(vm, &cache->array, js->index, &opaque_value);
@@ -463,18 +461,20 @@ nxt_js_call(nxt_task_t *task, nxt_js_conf_t *jcf, nxt_js_cache_t *cache,
return NXT_ERROR; return NXT_ERROR;
} }
ret = njs_vm_call(vm, func, njs_value_arg(&arguments), 6); ret = njs_vm_invoke(vm, func, njs_value_arg(&arguments), 6,
njs_value_arg(&retval));
rc = njs_vm_retval_string(vm, &res);
if (rc != NJS_OK) {
return NXT_ERROR;
}
if (ret != NJS_OK) { if (ret != NJS_OK) {
ret = njs_vm_exception_string(vm, &res);
if (ret == NJS_OK) {
nxt_alert(task, "js exception: %V", &res); nxt_alert(task, "js exception: %V", &res);
}
return NXT_ERROR; return NXT_ERROR;
} }
ret = njs_vm_value_string(vm, &res, njs_value_arg(&retval));
str->length = res.length; str->length = res.length;
str->start = res.start; str->start = res.start;
@@ -498,7 +498,7 @@ nxt_js_error(njs_vm_t *vm, u_char *error)
njs_str_t res; njs_str_t res;
nxt_str_t err; nxt_str_t err;
ret = njs_vm_retval_string(vm, &res); ret = njs_vm_exception_string(vm, &res);
if (nxt_slow_path(ret != NJS_OK)) { if (nxt_slow_path(ret != NJS_OK)) {
return NXT_ERROR; return NXT_ERROR;
} }