diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2024-06-04 11:09:42 -0400 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2024-06-04 11:14:28 -0400 |
| commit | 482b5137ce1ecb52784c7f07f8ae3e6cb61ae8e1 (patch) | |
| tree | e11927028047adbe84ed4529b43af80006ee60f5 /www/nginx-devel/files | |
| parent | devel/codequery: Update to 1.0.0 (diff) | |
www/nginx-devel: fix third-party passenger module warning
Also, release third-party passenger module from the pcre1 users
list, it builds fine with pcre2.
Bump PORTREVISION.
Diffstat (limited to 'www/nginx-devel/files')
| -rw-r--r-- | www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c b/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c index 4958d721fd2b..3d18184dd55e 100644 --- a/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c +++ b/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c @@ -1,11 +1,27 @@ ---- ../passenger-6.0.22/src/nginx_module/Configuration.c.orig 2024-05-29 12:56:52.144194000 -0400 -+++ ../passenger-6.0.22/src/nginx_module/Configuration.c 2024-05-29 12:58:07.308893000 -0400 -@@ -225,7 +225,7 @@ +--- ../passenger-6.0.22/src/nginx_module/Configuration.c.orig 2013-10-26 20:00:00.000000000 -0400 ++++ ../passenger-6.0.22/src/nginx_module/Configuration.c 2024-06-04 10:53:52.178855000 -0400 +@@ -224,8 +224,10 @@ + conf->upstream_config.send_lowat = NGX_CONF_UNSET_SIZE; conf->upstream_config.buffer_size = NGX_CONF_UNSET_SIZE; - #if NGINX_VERSION_NUM >= 1007007 +- #if NGINX_VERSION_NUM >= 1007007 - conf->upstream_config.limit_rate = NGX_CONF_UNSET_SIZE; ++ #if NGINX_VERSION_NUM >= 1027000 + conf->upstream_config.limit_rate = NGX_CONF_UNSET_PTR; ++ #elif NGINX_VERSION_NUM >= 1007007 ++ conf->upstream_config.limit_rate = NGX_CONF_UNSET_SiZE; #endif conf->upstream_config.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE; +@@ -465,7 +467,10 @@ + prev->upstream_config.buffer_size, + 16 * 1024); + +- #if NGINX_VERSION_NUM >= 1007007 ++ #if NGINX_VERSION_NUM >= 1027000 ++ ngx_conf_merge_ptr_value(conf->upstream_config.limit_rate, ++ prev->upstream_config.limit_rate, NULL); ++ #elif NGINX_VERSION_NUM >= 1007007 + ngx_conf_merge_size_value(conf->upstream_config.limit_rate, + prev->upstream_config.limit_rate, 0); + #endif |