From f593bfc87493e808f913df0dc82ddc6127cf5875 Mon Sep 17 00:00:00 2001 From: oxpa Date: Thu, 17 Oct 2024 15:31:19 +0100 Subject: [PATCH] Updated passenger to 6.0.23. --- alpine/Makefile.module-passenger | 3 +-- contrib/src/passenger/SHA512SUMS | 2 +- contrib/src/passenger/compat-1.27.0.patch | 27 ----------------------- contrib/src/passenger/version | 2 +- debian/Makefile.module-passenger | 3 +-- docs/nginx-module-passenger.xml | 11 +++++++++ rpm/SPECS/Makefile.module-passenger | 3 +-- 7 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 contrib/src/passenger/compat-1.27.0.patch diff --git a/alpine/Makefile.module-passenger b/alpine/Makefile.module-passenger index f8a6e129..f3a72746 100644 --- a/alpine/Makefile.module-passenger +++ b/alpine/Makefile.module-passenger @@ -12,8 +12,7 @@ MODULE_VERSION_PREFIX_passenger=$(MODULE_TARGET_PREFIX) MODULE_SOURCES_passenger= passenger-$(PASSENGER_VERSION).tar.gz MODULE_PATCHES_passenger= $(CONTRIB)/src/passenger/build-nginx.rb.patch \ - $(CONTRIB)/src/passenger/src-nginx_module-ContentHandler.c.patch \ - $(CONTRIB)/src/passenger/compat-1.27.0.patch + $(CONTRIB)/src/passenger/src-nginx_module-ContentHandler.c.patch MODULE_CONFARGS_passenger= --add-dynamic-module=$(MODSRC_PREFIX)passenger-$(PASSENGER_VERSION)/src/nginx_module diff --git a/contrib/src/passenger/SHA512SUMS b/contrib/src/passenger/SHA512SUMS index d9b6a6ff..74568776 100644 --- a/contrib/src/passenger/SHA512SUMS +++ b/contrib/src/passenger/SHA512SUMS @@ -1 +1 @@ -b46864cd7fa83fe39a2a4f42d581660c9a521b96942604b56caa567adff272bb092e82a46a6817a7b68be4830ad1015c9af4429a6d5b26edfe9c3e3884046559 passenger-6.0.20.tar.gz +5e01596bd658dad94b2281ad1efd5cb4624268021d4347cd911c14824e11e15125032b1793c2aa82e879cf07f93473fe78d9fc6a1f2b6f5fc0dcc12a84a5ea45 passenger-6.0.23.tar.gz diff --git a/contrib/src/passenger/compat-1.27.0.patch b/contrib/src/passenger/compat-1.27.0.patch deleted file mode 100644 index afccc6b8..00000000 --- a/contrib/src/passenger/compat-1.27.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/src/nginx_module/Configuration.c b/src/nginx_module/Configuration.c -index 33a16cbf8..737f21598 100644 ---- a/src/nginx_module/Configuration.c -+++ b/src/nginx_module/Configuration.c -@@ -224,7 +224,9 @@ passenger_create_loc_conf(ngx_conf_t *cf) - - 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 >= 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 - -@@ -465,7 +467,10 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) - 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 diff --git a/contrib/src/passenger/version b/contrib/src/passenger/version index 19a8ce25..55795e93 100644 --- a/contrib/src/passenger/version +++ b/contrib/src/passenger/version @@ -1 +1 @@ -PASSENGER_VERSION := 6.0.20 +PASSENGER_VERSION := 6.0.23 diff --git a/debian/Makefile.module-passenger b/debian/Makefile.module-passenger index 415fbb2b..55a66e77 100644 --- a/debian/Makefile.module-passenger +++ b/debian/Makefile.module-passenger @@ -11,8 +11,7 @@ MODULE_VERSION_PREFIX_passenger=$(MODULE_TARGET_PREFIX) MODULE_SOURCES_passenger= passenger-$(PASSENGER_VERSION).tar.gz MODULE_PATCHES_passenger= $(CONTRIB)/src/passenger/build-nginx.rb.patch \ - $(CONTRIB)/src/passenger/src-nginx_module-ContentHandler.c.patch \ - $(CONTRIB)/src/passenger/compat-1.27.0.patch + $(CONTRIB)/src/passenger/src-nginx_module-ContentHandler.c.patch MODULE_CONFARGS_passenger= --add-dynamic-module=$(MODSRC_PREFIX)passenger-$(PASSENGER_VERSION)/src/nginx_module diff --git a/docs/nginx-module-passenger.xml b/docs/nginx-module-passenger.xml index e7a780a7..d87e8188 100644 --- a/docs/nginx-module-passenger.xml +++ b/docs/nginx-module-passenger.xml @@ -5,6 +5,17 @@ + + + +Updated passenger to 6.0.23. + + + + + diff --git a/rpm/SPECS/Makefile.module-passenger b/rpm/SPECS/Makefile.module-passenger index 2c030ad4..7b2fa12b 100644 --- a/rpm/SPECS/Makefile.module-passenger +++ b/rpm/SPECS/Makefile.module-passenger @@ -11,8 +11,7 @@ MODULE_VERSION_PREFIX_passenger=$(MODULE_TARGET_PREFIX) MODULE_SOURCES_passenger= passenger-$(PASSENGER_VERSION).tar.gz MODULE_PATCHES_passenger= $(CONTRIB)/src/passenger/build-nginx.rb.patch \ - $(CONTRIB)/src/passenger/src-nginx_module-ContentHandler.c.patch \ - $(CONTRIB)/src/passenger/compat-1.27.0.patch + $(CONTRIB)/src/passenger/src-nginx_module-ContentHandler.c.patch MODULE_CONFARGS_passenger= --add-dynamic-module=passenger-$(PASSENGER_VERSION)/src/nginx_module