summaryrefslogtreecommitdiff
path: root/www/unit
diff options
context:
space:
mode:
Diffstat (limited to 'www/unit')
-rw-r--r--www/unit/Makefile1
-rw-r--r--www/unit/distinfo6
-rw-r--r--www/unit/files/patch-auto_njs22
-rw-r--r--www/unit/files/patch-src_nxt__http__js.c139
-rw-r--r--www/unit/version.mk2
5 files changed, 4 insertions, 166 deletions
diff --git a/www/unit/Makefile b/www/unit/Makefile
index f4d4b544b295..4544f45f4acd 100644
--- a/www/unit/Makefile
+++ b/www/unit/Makefile
@@ -1,6 +1,5 @@
PORTNAME= unit
PORTVERSION= ${UNIT_VERSION}
-PORTREVISION= 2
CATEGORIES= www
MASTER_SITES?= https://unit.nginx.org/download/
DISTFILES?= ${PORTNAME}-${PORTVERSION}.tar.gz
diff --git a/www/unit/distinfo b/www/unit/distinfo
index 5886c570613b..62c97096598d 100644
--- a/www/unit/distinfo
+++ b/www/unit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741021688
-SHA256 (unit-1.34.2.tar.gz) = 49ffb49d7ead1b9e64602f07f8b615839c099a9324943dedad40d057ce109504
-SIZE (unit-1.34.2.tar.gz) = 1054961
+TIMESTAMP = 1757870545
+SHA256 (unit-1.35.0.tar.gz) = 20bb921b8128ff046c3d7a52b93ab2d94ae46c3b5a85d479b6b5ee9928e89c87
+SIZE (unit-1.35.0.tar.gz) = 1066376
diff --git a/www/unit/files/patch-auto_njs b/www/unit/files/patch-auto_njs
deleted file mode 100644
index a4cbc6ec8d3c..000000000000
--- a/www/unit/files/patch-auto_njs
+++ /dev/null
@@ -1,22 +0,0 @@
---- auto/njs.orig 2025-02-27 22:02:21 UTC
-+++ auto/njs
-@@ -25,8 +25,8 @@ nxt_feature_test="#include <njs.h>
- nxt_feature_libs="$NXT_NJS_LIBS $NXT_NJS_AUX_LIBS"
- nxt_feature_test="#include <njs.h>
-
-- #if NJS_VERSION_NUMBER < 0x000803
-- # error njs < 0.8.3 is not supported.
-+ #if NJS_VERSION_NUMBER < 0x000900
-+ # error njs < 0.9.0 is not supported.
- #endif
-
- int main(void) {
-@@ -44,7 +44,7 @@ if [ $nxt_found = no ]; then
-
- if [ $nxt_found = no ]; then
- $echo
-- $echo $0: error: no njs library \>= 0.8.3 found.
-+ $echo $0: error: no njs library \>= 0.9.0 found.
- $echo
- exit 1;
- fi
diff --git a/www/unit/files/patch-src_nxt__http__js.c b/www/unit/files/patch-src_nxt__http__js.c
deleted file mode 100644
index 41a2a39a1c56..000000000000
--- a/www/unit/files/patch-src_nxt__http__js.c
+++ /dev/null
@@ -1,139 +0,0 @@
---- src/nxt_http_js.c.orig 2025-02-27 22:02:21 UTC
-+++ src/nxt_http_js.c
-@@ -9,27 +9,31 @@ static njs_int_t nxt_http_js_ext_uri(njs_vm_t *vm, njs
-
-
- static njs_int_t nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
-- njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
-+ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
-+ njs_value_t *retval);
- static njs_int_t nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
-- njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
--static njs_int_t nxt_http_js_ext_remote_addr(njs_vm_t *vm,
-- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
-+ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
- njs_value_t *retval);
-+static njs_int_t nxt_http_js_ext_remote_addr(njs_vm_t *vm,
-+ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
-+ njs_value_t *setval, njs_value_t *retval);
- static njs_int_t nxt_http_js_ext_get_args(njs_vm_t *vm,
-- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
-- njs_value_t *retval);
-+ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
-+ njs_value_t *setval, njs_value_t *retval);
- static njs_int_t nxt_http_js_ext_get_header(njs_vm_t *vm,
-- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
-- njs_value_t *retval);
-+ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
-+ njs_value_t *setval, njs_value_t *retval);
- static njs_int_t nxt_http_js_ext_keys_header(njs_vm_t *vm,
- njs_value_t *value, njs_value_t *keys);
- static njs_int_t nxt_http_js_ext_get_cookie(njs_vm_t *vm,
-- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
-+ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
-+ njs_value_t *setval,
- njs_value_t *retval);
- static njs_int_t nxt_http_js_ext_keys_cookie(njs_vm_t *vm, njs_value_t *value,
- njs_value_t *keys);
- static njs_int_t nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
-- njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
-+ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
-+ njs_value_t *retval);
-
-
- static njs_external_t nxt_http_js_proto[] = {
-@@ -109,7 +113,7 @@ static njs_int_t
-
-
- static njs_int_t
--nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
-+nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t atom_id,
- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
- {
- nxt_http_request_t *r;
-@@ -126,7 +130,7 @@ static njs_int_t
-
-
- static njs_int_t
--nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
-+nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t atom_id,
- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
- {
- nxt_http_request_t *r;
-@@ -144,7 +148,8 @@ nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_p
-
- static njs_int_t
- nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_prop_t *prop,
-- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
-+ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
-+ njs_value_t *retval)
- {
- nxt_http_request_t *r;
-
-@@ -162,7 +167,8 @@ nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop
-
- static njs_int_t
- nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop_t *prop,
-- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
-+ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
-+ njs_value_t *retval)
- {
- u_char *start;
- njs_int_t ret;
-@@ -193,7 +199,8 @@ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_pr
-
- static njs_int_t
- nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_prop_t *prop,
-- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
-+ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
-+ njs_value_t *retval)
- {
- njs_int_t rc;
- njs_str_t key;
-@@ -206,7 +213,7 @@ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_pr
- return NJS_DECLINED;
- }
-
-- rc = njs_vm_prop_name(vm, prop, &key);
-+ rc = njs_vm_prop_name(vm, atom_id, &key);
- if (rc != NJS_OK) {
- njs_value_undefined_set(retval);
- return NJS_DECLINED;
-@@ -266,7 +273,8 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_pr
-
- static njs_int_t
- nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_prop_t *prop,
-- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
-+ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
-+ njs_value_t *retval)
- {
- njs_int_t rc;
- njs_str_t key;
-@@ -280,7 +288,7 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_pr
- return NJS_DECLINED;
- }
-
-- rc = njs_vm_prop_name(vm, prop, &key);
-+ rc = njs_vm_prop_name(vm, atom_id, &key);
- if (rc != NJS_OK) {
- njs_value_undefined_set(retval);
- return NJS_DECLINED;
-@@ -355,7 +363,8 @@ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_
-
- static njs_int_t
- nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
-- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
-+ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
-+ njs_value_t *retval)
- {
- njs_int_t rc;
- njs_str_t key;
-@@ -369,7 +378,7 @@ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_
- return NJS_DECLINED;
- }
-
-- rc = njs_vm_prop_name(vm, prop, &key);
-+ rc = njs_vm_prop_name(vm, atom_id, &key);
- if (rc != NJS_OK) {
- njs_value_undefined_set(retval);
- return NJS_DECLINED;
diff --git a/www/unit/version.mk b/www/unit/version.mk
index 1364ab43adc7..b47ec048a5c5 100644
--- a/www/unit/version.mk
+++ b/www/unit/version.mk
@@ -2,6 +2,6 @@
UNITVERSION_MK= defined
# Define NGINX Unit's version.
-UNIT_VERSION= 1.34.2
+UNIT_VERSION= 1.35.0
.endif # UNITVERSION_MK