diff options
Diffstat (limited to 'www/nginx-devel/files')
4 files changed, 25 insertions, 36 deletions
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_redis_module.c b/www/nginx-devel/files/extra-patch-ngx_http_redis_module.c deleted file mode 100644 index 3dacd39ee6c4..000000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_redis_module.c +++ /dev/null @@ -1,34 +0,0 @@ ---- ../ngx_http_redis-0.3.9/ngx_http_redis_module.c.orig 2022-07-10 22:10:19.031893000 -0400 -+++ ../ngx_http_redis-0.3.9/ngx_http_redis_module.c 2022-07-10 22:09:41.271731000 -0400 -@@ -562,7 +562,7 @@ - /* if defined gzip_flag... */ - if (rlcf->gzip_flag) { - /* hash init */ -- h = ngx_list_push(&r->upstream->headers_in.headers); -+ h = ngx_list_push(&r->headers_out.headers); - if (h == NULL) { - return NGX_ERROR; - } -@@ -571,19 +571,11 @@ - * add Content-Encoding header for future gunzipping - * with ngx_http_gunzip_filter module - */ -- h->hash = ngx_hash(ngx_hash(ngx_hash(ngx_hash( -- ngx_hash(ngx_hash(ngx_hash( -- ngx_hash(ngx_hash(ngx_hash( -- ngx_hash(ngx_hash(ngx_hash( -- ngx_hash(ngx_hash('c', 'o'), 'n'), 't'), 'e'), -- 'n'), 't'), '-'), 'e'), 'n'), 'c'), 'o'), -- 'd'), 'i'), 'n'), 'g'); -+ h->hash = 1; -+ h->next = NULL; - ngx_str_set(&h->key, "Content-Encoding"); - ngx_str_set(&h->value, "gzip"); -- h->lowcase_key = (u_char*) "content-encoding"; --#if (NGX_HTTP_GZIP) -- u->headers_in.content_encoding = h; --#endif -+ r->headers_out.content_encoding = h; - } - - /* try to find end of string */ diff --git a/www/nginx-devel/files/extra-patch-ngx_nats.c b/www/nginx-devel/files/extra-patch-ngx_nats.c new file mode 100644 index 000000000000..76c3f2be7864 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_nats.c @@ -0,0 +1,20 @@ +--- ../nginx-nats-6f7adf1/src/ngx_nats.c.orig 2025-07-25 14:52:57.670444000 -0400 ++++ ../nginx-nats-6f7adf1/src/ngx_nats.c 2025-07-25 14:53:04.538387000 -0400 +@@ -55,7 +55,7 @@ + * we can use for uniqueness and to reach the router in testing. + */ + +-#if (NGX_LINUX) || (NGX_DARWIN) ++#if (NGX_LINUX) || (NGX_DARWIN) || (NGX_FREEBSD) + #include <net/if.h> + #include <ifaddrs.h> + #elif (NGX_WIN32) +@@ -585,7 +585,7 @@ + { + /* TODO: port to Windows when need it, extend to other platforms. */ + +-#if (NGX_LINUX) || (NGX_DARWIN) ++#if (NGX_LINUX) || (NGX_DARWIN) || (NGX_FREEBSD) + + struct ifaddrs *ifaddrs, *ifa; + int rc, family; diff --git a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config index f64ca870f20a..07eedaf37496 100644 --- a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config +++ b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config @@ -1,5 +1,5 @@ ---- ../spnego-http-auth-nginx-module-60f0811/config.orig 2020-08-27 07:59:28.423636000 -0400 -+++ ../spnego-http-auth-nginx-module-60f0811/config 2020-08-27 08:01:42.152121000 -0400 +--- ../spnego-http-auth-nginx-module-1.1.3/config.orig 2020-08-27 07:59:28.423636000 -0400 ++++ ../spnego-http-auth-nginx-module-1.1.3/config 2020-08-27 08:01:42.152121000 -0400 @@ -1,8 +1,9 @@ ngx_addon_name=ngx_http_auth_spnego_module -ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err" diff --git a/www/nginx-devel/files/nginx.in b/www/nginx-devel/files/nginx.in index 652468a97596..5ec438dd7342 100644 --- a/www/nginx-devel/files/nginx.in +++ b/www/nginx-devel/files/nginx.in @@ -47,6 +47,8 @@ _tmpprefix="%%NGINX_TMPDIR%%" required_files=%%PREFIX%%/etc/nginx/nginx.conf extra_commands="reload configtest upgrade gracefulstop" +: ${nginx_svcj_options:="net_basic"} + [ -z "$nginx_enable" ] && nginx_enable="NO" [ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO" [ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%" @@ -67,6 +69,7 @@ if [ -n "$2" ]; then required_files="${nginx_configfile}" eval nginx_enable="\${nginx_${profile}_enable:-${nginx_enable}}" eval nginx_flags="\${nginx_${profile}_flags:-${nginx_flags}}" + eval nginx_svcj_options="\${nginx_${profile}_svcj_options:-${nginx_svcj_options}}" eval nginxlimits_enable="\${nginxlimits_${profile}_enable:-${nginxlimits_enable}}" eval nginxlimits_args="\${nginxlimits_${profile}_args:-${nginxlimits_args}}" nginx_flags="-c ${nginx_configfile} -g \"pid ${pidfile};\" ${nginx_flags}" |