mirror of
https://github.com/openbsd/ports.git
synced 2026-06-17 23:13:55 +02:00
www/unit: update to 1.35.0
from Sergey A. Osokin (maintainer) Going forward, NGINX Unit will no longer receive new features or enhancements from the project maintainers. NGINX Unit is still open to community contributions. The team is focusing its limited capacity to keep NGINX Unit stable, secure and high-quality. Its focus will be on critical maintenance, such as for security issues, dependency upgrades, and resolving crashes or undefined behavior.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
VERSION?= 1.34.2
|
||||
VERSION?= 1.35.0
|
||||
DISTNAME= unit-${VERSION}
|
||||
|
||||
CATEGORIES= www
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
SHA256 (unit-1.34.2.tar.gz) = Sf+0nX6tG55kYC8H+LYVg5wJmpMklD3trUDQV84QlQQ=
|
||||
SIZE (unit-1.34.2.tar.gz) = 1054961
|
||||
SHA256 (unit-1.35.0.tar.gz) = ILuSG4Eo/wRsPXpSuTqy2UrkbDtahdR5trXumSjonIc=
|
||||
SIZE (unit-1.35.0.tar.gz) = 1066376
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
SHA256 (unit-1.34.2.tar.gz) = Sf+0nX6tG55kYC8H+LYVg5wJmpMklD3trUDQV84QlQQ=
|
||||
SIZE (unit-1.34.2.tar.gz) = 1054961
|
||||
SHA256 (unit-1.35.0.tar.gz) = ILuSG4Eo/wRsPXpSuTqy2UrkbDtahdR5trXumSjonIc=
|
||||
SIZE (unit-1.35.0.tar.gz) = 1066376
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
SHA256 (unit-1.34.2.tar.gz) = Sf+0nX6tG55kYC8H+LYVg5wJmpMklD3trUDQV84QlQQ=
|
||||
SIZE (unit-1.34.2.tar.gz) = 1054961
|
||||
SHA256 (unit-1.35.0.tar.gz) = ILuSG4Eo/wRsPXpSuTqy2UrkbDtahdR5trXumSjonIc=
|
||||
SIZE (unit-1.35.0.tar.gz) = 1066376
|
||||
|
||||
@@ -2,7 +2,6 @@ BROKEN-sparc64= doesn't detect Ruby library in configure
|
||||
|
||||
UNIT_MODNAME= ruby${MODRUBY_REV}
|
||||
UNIT_SHORTNAME= ruby
|
||||
REVISION= 0
|
||||
|
||||
MODULES+= lang/ruby
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
SHA256 (unit-1.34.2.tar.gz) = Sf+0nX6tG55kYC8H+LYVg5wJmpMklD3trUDQV84QlQQ=
|
||||
SIZE (unit-1.34.2.tar.gz) = 1054961
|
||||
SHA256 (unit-1.35.0.tar.gz) = ILuSG4Eo/wRsPXpSuTqy2UrkbDtahdR5trXumSjonIc=
|
||||
SIZE (unit-1.35.0.tar.gz) = 1066376
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
COMMENT= dynamic web application server
|
||||
|
||||
REVISION= 0
|
||||
|
||||
WANTLIB= c crypto m pcre2-8 pthread ssl xml2 z
|
||||
|
||||
LIB_DEPENDS= devel/pcre2
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
SHA256 (unit-1.34.2.tar.gz) = Sf+0nX6tG55kYC8H+LYVg5wJmpMklD3trUDQV84QlQQ=
|
||||
SIZE (unit-1.34.2.tar.gz) = 1054961
|
||||
SHA256 (unit-1.35.0.tar.gz) = ILuSG4Eo/wRsPXpSuTqy2UrkbDtahdR5trXumSjonIc=
|
||||
SIZE (unit-1.35.0.tar.gz) = 1066376
|
||||
|
||||
@@ -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
|
||||
@@ -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;
|
||||
Reference in New Issue
Block a user