Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 31 Aug 2023 22:25:28 GMT
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b79c718fb916 - main - www/unit: remove needless patch
Message-ID:  <202308312225.37VMPSeI028645@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b79c718fb91677a2e119ad5f179a541e10a98d2c

commit b79c718fb91677a2e119ad5f179a541e10a98d2c
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2023-08-31 22:25:02 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2023-08-31 22:25:02 +0000

    www/unit: remove needless patch
    
    Fixes:  99dd0e5bc285af5e0a0351efc9c731bd6f5852ca
---
 www/unit/files/patch-src_nxt__js.c | 72 --------------------------------------
 1 file changed, 72 deletions(-)

diff --git a/www/unit/files/patch-src_nxt__js.c b/www/unit/files/patch-src_nxt__js.c
deleted file mode 100644
index bd7ba596126d..000000000000
--- a/www/unit/files/patch-src_nxt__js.c
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/nxt_js.c.orig	2023-05-10 16:22:28 UTC
-+++ src/nxt_js.c
-@@ -386,11 +386,11 @@ nxt_js_call(nxt_task_t *task, nxt_js_conf_t *jcf, nxt_
-     nxt_js_t *js, nxt_str_t *str, void *ctx)
- {
-     njs_vm_t            *vm;
--    njs_int_t           rc, ret;
-+    njs_int_t           ret;
-     njs_str_t           res;
--    njs_value_t         *array, *value;
-+    njs_value_t         *value;
-     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  host_str = njs_str("host");
-@@ -407,15 +407,13 @@ nxt_js_call(nxt_task_t *task, nxt_js_conf_t *jcf, nxt_
-             return NXT_ERROR;
-         }
- 
--        ret = njs_vm_start(vm);
-+        ret = njs_vm_start(vm, njs_value_arg(&retval));
-         if (ret != NJS_OK) {
-             return NXT_ERROR;
-         }
- 
--        array = njs_vm_retval(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);
-@@ -463,18 +461,20 @@ nxt_js_call(nxt_task_t *task, nxt_js_conf_t *jcf, nxt_
-         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) {
--        nxt_alert(task, "js exception: %V", &res);
-+        ret = njs_vm_exception_string(vm, &res);
-+        if (ret == NJS_OK) {
-+            nxt_alert(task, "js exception: %V", &res);
-+        }
-+
-         return NXT_ERROR;
-     }
- 
-+    ret = njs_vm_value_string(vm, &res, njs_value_arg(&retval));
-+
-     str->length = res.length;
-     str->start = res.start;
- 
-@@ -498,7 +498,7 @@ nxt_js_error(njs_vm_t *vm, u_char *error)
-     njs_str_t  res;
-     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)) {
-         return NXT_ERROR;
-     }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308312225.37VMPSeI028645>