diff options
Diffstat (limited to 'www/unit')
-rw-r--r-- | www/unit/Makefile | 1 | ||||
-rw-r--r-- | www/unit/files/patch-auto_njs | 22 | ||||
-rw-r--r-- | www/unit/files/patch-src_nxt__http__js.c | 139 |
3 files changed, 162 insertions, 0 deletions
diff --git a/www/unit/Makefile b/www/unit/Makefile index 4544f45f4acd..c331b0fb8614 100644 --- a/www/unit/Makefile +++ b/www/unit/Makefile @@ -1,5 +1,6 @@ PORTNAME= unit PORTVERSION= ${UNIT_VERSION} +PORTREVISION= 1 CATEGORIES= www MASTER_SITES?= https://unit.nginx.org/download/ DISTFILES?= ${PORTNAME}-${PORTVERSION}.tar.gz diff --git a/www/unit/files/patch-auto_njs b/www/unit/files/patch-auto_njs new file mode 100644 index 000000000000..a4cbc6ec8d3c --- /dev/null +++ b/www/unit/files/patch-auto_njs @@ -0,0 +1,22 @@ +--- 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 new file mode 100644 index 000000000000..41a2a39a1c56 --- /dev/null +++ b/www/unit/files/patch-src_nxt__http__js.c @@ -0,0 +1,139 @@ +--- 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; |