Merged with the default branch.1.30.0-1

1 files changed, 10 insertions, 2 deletions

diff --git a/src/nxt_tstr.c b/src/nxt_tstr.c
index fda585b8..516415d9 100644
--- a/src/nxt_tstr.c
+++ b/src/nxt_tstr.c
@@ -70,7 +70,7 @@ nxt_tstr_state_new(nxt_mp_t *mp, nxt_bool_t test)
     }
 
 #if (NXT_HAVE_NJS)
-    state->jcf = nxt_js_conf_new(mp);
+    state->jcf = nxt_js_conf_new(mp, test);
     if (nxt_slow_path(state->jcf == NULL)) {
         return NULL;
     }
@@ -273,7 +273,8 @@ nxt_tstr_query(nxt_task_t *task, nxt_tstr_query_t *query, nxt_tstr_t *tstr,
 
     } else {
 #if (NXT_HAVE_NJS)
-        ret = nxt_js_call(task, &query->cache->js, tstr->u.js, val, query->ctx);
+        ret = nxt_js_call(task, query->state->jcf, &query->cache->js,
+                          tstr->u.js, val, query->ctx);
 
         if (nxt_slow_path(ret != NXT_OK)) {
             query->failed = 1;
@@ -296,6 +297,13 @@ nxt_tstr_query(nxt_task_t *task, nxt_tstr_query_t *query, nxt_tstr_t *tstr,
 }
 
 
+nxt_bool_t
+nxt_tstr_query_failed(nxt_tstr_query_t *query)
+{
+    return query->failed;
+}
+
+
 void
 nxt_tstr_query_resolve(nxt_task_t *task, nxt_tstr_query_t *query, void *data,
     nxt_work_handler_t ready, nxt_work_handler_t error)