diff options
Diffstat (limited to 'www/nginx-devel/files')
3 files changed, 4 insertions, 31 deletions
diff --git a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb index 95bf79da0865..34ad92f207b2 100644 --- a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb +++ b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb @@ -1,5 +1,5 @@ ---- ../passenger-6.0.22/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.22/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.0.23/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.0.23/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 @@ -33,13 +33,12 @@ desc "Build Nginx support files" task :nginx => [ diff --git a/www/nginx-devel/files/extra-patch-passenger-disable-telemetry b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry index ca2ed9f0700a..302ae5bf765d 100644 --- a/www/nginx-devel/files/extra-patch-passenger-disable-telemetry +++ b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry @@ -1,5 +1,5 @@ ---- ../passenger-6.0.22/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.22/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../passenger-6.0.23/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.0.23/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 @@ -204,7 +204,7 @@ :name => 'passenger_disable_anonymous_telemetry', :scope => :global, 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 deleted file mode 100644 index 3d18184dd55e..000000000000 --- a/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c +++ /dev/null @@ -1,27 +0,0 @@ ---- ../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 -- 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 |