From nobody Thu Aug 31 22:25:28 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RcG2J6BVrz4rh9D; Thu, 31 Aug 2023 22:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RcG2J5hCyz3Np8; Thu, 31 Aug 2023 22:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693520728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57y21OnnCHuue25isM5qVCEeBdiPnLtqeJMGFuI4BNQ=; b=CeqLe0rODw4Fy7CPRxhadyLdy1PK+szkmMof1m51QpDZb6eWFR27ZQyJX8OZw6EQgNf5OE 25HyCLoPIu9erMaMDphPGXKS7Z5yCBPAcYNAdeR3RrXz2s2Q6Mau73A42vi2Ch80R/uXQ6 UBzZuOnmVwdFfe3wbzuJyzK1VfjfbeL9HIfv4wvXlSYteHbCgdrnF0n44txYyhdXikM+cq EC1tcni2o/9i/ovBme5FJClwdnT0xAuSl+Lv3fM/yzi+QOuhPPBevMjRW6/dO8HzlT5h8O wnhCf5O+0SLPvxBEbGh1ey+r1uG2y9e5recD7DNo0bx3EexoRs7Y0VbSoIlLXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693520728; a=rsa-sha256; cv=none; b=jTD+UV8XJZK3EeMzPJaPtCqhUwO6dCUwbNwmCcBdfgsl7QT0hQPjWLBh+g4k++OiLzwVwC vpkvO3cMYpbDGJa/31lEnhgaetX7D6hrs7j77Dbu+ytw6DaVvuRmGb50LJJHz2cyMv6Adk t+5/LKaMILFGtgEcbdeL9md2BDUDaJx8xugG1r5Qjt7aBOXlzuLnLmGQSYVXuHkcpiY072 Sn8StKjYwA1hhtTYlqWEMJEaOLTdtH95xUyE0GKSfAREJ8c4OtH+oSRPdWjUmnWo3ZVebU SiOA2nlRF9LKfOFgEH9w5Od3fKVDWX/U+h6adS9dYmHUFPjjaTJcvAjRweirDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693520728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57y21OnnCHuue25isM5qVCEeBdiPnLtqeJMGFuI4BNQ=; b=cE1IdeEg4lvR56+zl1J/a1kHjf+h7y9wHuI+o9t4rm4IBcZNiMrIlqIzGuKt0R+rkquVDs K+rqoqMS2v5xnyEz7+xdkMSKpXFpBsBD8HJwBHdVDUpmssM4xuy2UCq5iZ/DCCF3LCA7aR CpgqrG24zn4pCDbuYDNBB/Y1xltp99X3Onin1eVLVLfKiSor3oLVevZCxJwe/l3ZW4s2Gk rwhr7m0okpYWlwDUw6LYQNkdAFNFKGCzJIO6QNZJmGGes73CshatLmLF7sKE87lYLKid5t AWHuqVpMeEyZgd9XR6v/YrNk7AsmB/5mqfuFI1cgHQI0Q6DDiU4jEGwwOMHMSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RcG2J4QnKzbwM; Thu, 31 Aug 2023 22:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37VMPSe7028648; Thu, 31 Aug 2023 22:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37VMPSeI028645; Thu, 31 Aug 2023 22:25:28 GMT (envelope-from git) Date: Thu, 31 Aug 2023 22:25:28 GMT Message-Id: <202308312225.37VMPSeI028645@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: b79c718fb916 - main - www/unit: remove needless patch List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b79c718fb91677a2e119ad5f179a541e10a98d2c Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=b79c718fb91677a2e119ad5f179a541e10a98d2c commit b79c718fb91677a2e119ad5f179a541e10a98d2c Author: Sergey A. Osokin AuthorDate: 2023-08-31 22:25:02 +0000 Commit: Sergey A. Osokin 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; - }