passenger 6.0.21 → 6.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f1e1bc52e55a73ecec3a43986b9bd90543267b64dae5d81c30322260a60bcd
-  data.tar.gz: ab48a44989e4f30661c2f149fb7bb9ed1155a82c44752b351aa9d7caf5021833
+  metadata.gz: '090896f92fb435c62847f46a39df880b08d3081323c925b35be422bb701d44a4'
+  data.tar.gz: 7c41513aef78b37d5ac93573afc01992f3d5ec6fe08101103ee0a0a2a8ab1cd4
 SHA512:
-  metadata.gz: 1541930bafaf6b29a215e2bae21af6ec97efaa367c837b09824d2cf53cf1aaa3878ba5a028d7054006598f115dc80bac2046e542adfb7e169691e5ccb5107930
-  data.tar.gz: 07346e8767eb64c6fd052200d2fab65bb0f744aa11e70a47618b7a9a1d093784a5cb27db86289c2ca052f44ecdc0fa4e8139caf0a652e6edc071208b76c61fa1
+  metadata.gz: 3c6daa23ca3426ebafa54f7d94b018467bbc6d2572799a50ddf111f0628673d5e308ead07dd8e7d06e9d6a8b63bbdc28090c1c581ef06e6a6fce1a143956a6ac
+  data.tar.gz: 12130ca0f74963de002f8d1a777a2ce4563631a4e6ea7a654325efec072dd4e44e40989df4cbe9addad1b12664cdfd53d6ceeb9e76133f3ca169dc2b334ff478

data/CHANGELOG

@@ -1,4 +1,43 @@
-Release 6.0.21 (Not yet released)
+Release 6.0.23 (Not yet released)
+-------------
+ * [Enterprise] The rolling restart feature now replaces app processes in newest-to-oldest order, to make more efficient use of alive processes during the rolling-restart's duration. Closes GH-2551.
+ * [Ruby] Improve Rack 3 compatibility.
+ * [Nginx] Upgrades preferred Nginx to 1.26.1 from 1.26.0.
+ * [Debian] Remove packages for Debian 10 Buster. (EOL 2024-07).
+ * [Ubuntu] Add packages for Ubuntu 24.04 "noble".
+ * [RPMs] Remove EL7 RPMs, CentOS7 is EOL.
+ * Fixes compatibility with Ruby apps whose Gemfile.lock depends on strscan.
+ * Adds option to render a custom error page when app fails to launch. Closes GH-2515.
+   - Apache: PassengerCustomErrorPage "public/error.html"
+   - Nginx: passenger_custom_error_page public/error.html;
+   - Standalone: --custom-error-page public/error.html
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - glibc 2.17 -> 2.28
+   - ccache 4.9.1 -> 4.10.1
+   - cmake 3.29.3 -> 3.30.1
+   - curl 8.7.1 -> 8.8.0
+   - git 2.45.0 -> 2.45.2
+   - openssl 3.3.0 -> 3.3.1
+   - pcre2 10.43 -> 10.44
+   - libassuan 2.5.7 -> 3.0.1
+   - libgcrypt 1.10.3 -> 1.11.0
+   - libgpg_error 1.49 -> 1.50
+   - libksba 1.6.6 -> 1.6.7
+   - pinentry 1.3.0 -> 1.3.1
+   - rubygems 3.5.10 -> 3.5.16
+   - rubies:
+     - dropped 3.0.7
+     - 3.1.5 -> 3.1.6
+     - 3.3.1 -> 3.3.4
+
+
+Release 6.0.22
+-------------
+ * [RPM] Fix dependency on selinux-policy. Closes GH-2545.
+ * Fix Amazon Linux detection. Closes GH-3296.
+
+
+Release 6.0.21
 -------------
  * [Python] Fix version of Python when imp module is replaced with importlib. Contributed by Grigory Ponomarenko.
  * [Ubuntu] Remove packages for Ubuntu 23.10 "mantic".
@@ -7,9 +46,9 @@ Release 6.0.21 (Not yet released)
  * [RPM] The Passenger Nginx module rpm package for EL9 (RHEL, Rocky, Alma) will now require Nginx 1.24.0 as per the policy of supporting the newest Nginx module stream available.
  * [Standalone] Fixes security update checker with builtin engine.
  * [Enterprise] Ability to enforce hard memory limits on application processes (`PassengerHardMemoryLimit`/`passenger_hard_memory_limit`/`--hard-memory-limit``). Unlike the soft memory limit, the hard memory limit doesn't wait for the request to finish. Useful for preventing high memory usage from taking down the entire machine or container.
- * [Enterprise] Ability to throttle memory metrics collection (`PassengerAnalyticsCollectionRate`/`passenger_analytics_collection_rate`). This allows you to control the frequency that Passenger Enterpprise measures the app memory use at.
+ * [Enterprise] Ability to throttle memory metrics collection (`PassengerAnalyticsCollectionRate`/`passenger_analytics_collection_rate`). This allows you to control the frequency that Passenger Enterprise measures the app memory use at.
  * Swaps http-parser for llhttp.
- * Fixes crash-watch hanging when lldb is used as backend.
+ * Fixes crash-watch hanging when lldb is used as the backend.
  * Fixes Apache module unload crash due to not properly cleaning up all threads.
  * Workaround compilation error on clang on x86_64.
  * Upgrades Boost from 1.83 -> 1.85.

data/Rakefile

@@ -27,8 +27,15 @@ $LOAD_PATH.unshift("#{SOURCE_ROOT}/src/ruby_supportlib")
 # timing-sensitive tests like those in the C++ test suite.
 if defined?(Bundler)
   clean_env = nil
-  Bundler.with_clean_env do
-    clean_env = ENV.to_hash
+
+  if Bundler.method_defined?(:with_unbundled_env)
+    Bundler.with_unbundled_env do
+      clean_env = ENV.to_hash
+    end
+  else
+    Bundler.with_clean_env do
+      clean_env = ENV.to_hash
+    end
   end
   ENV.replace(clean_env)
   ARGV.each do |arg|

data/bin/passenger-install-nginx-module

@@ -576,6 +576,7 @@ private
             system("(gcc -I/usr/local/include -I/usr/include/pcre2 " <<
               "-I/usr/pkg/include -I/opt/local/include " <<
               "-I/opt/homebrew/include " <<
+              "-DPCRE2_CODE_UNIT_WIDTH=8 " <<
               "-c passenger-check.c) >/dev/null 2>/dev/null")
           end
         ensure

data/build/test_basics.rb

@@ -22,6 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'rubygems/version.rb'
+
 TEST_BOOST_OXT_LIBRARY = LIBBOOST_OXT
 TEST_COMMON_LIBRARY    = COMMON_LIBRARY
 TEST_COMMON_CFLAGS     = "-DTESTING_APPLICATION_POOL"
@@ -49,10 +51,13 @@ task 'test:install_deps' do
   default = boolean_option('DEVDEPS_DEFAULT', true)
   install_base_deps = boolean_option('BASE_DEPS', default)
 
+  bundle_args = []
   if deps_target = string_option('DEPS_TARGET')
-    bundle_args = "--path #{shesc deps_target} #{ENV['BUNDLE_ARGS']}".strip
-  else
-    bundle_args = ENV['BUNDLE_ARGS'].to_s
+    if bundler_too_new?
+      sh "bundle config set --local path #{shesc deps_target}"
+    else
+      bundle_args.concat(["--path", shesc(deps_target)])
+    end
   end
 
   npm_args = ENV['NPM_ARGS'].to_s
@@ -62,22 +67,36 @@ task 'test:install_deps' do
   end
 
   if install_base_deps
-    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') || RUBY_PLATFORM =~ /darwin/
-      sh "bundle install #{bundle_args} --without="
-    else
-      sh "bundle install #{bundle_args} --without future"
+    unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') || RUBY_PLATFORM =~ /darwin/
+      if bundler_too_new?
+        sh "bundle config set --local without future"
+      else
+        bundle_args.concat(["--without", "future"])
+      end
     end
   else
-    sh "bundle install #{bundle_args} --without base future"
+    if bundler_too_new?
+      sh "bundle config set --local without 'base future'"
+    else
+      bundle_args.concat(["--without", "base", "future"])
+    end
   end
+  sh "bundle install #{bundle_args.join(' ')} #{ENV['BUNDLE_ARGS']}"
 
   if boolean_option('NODE_MODULES', default)
     sh "npm install #{npm_args}"
   end
 end
 
-def bundler_too_old?
+def bundler_version
   `bundle --version` =~ /version (.+)/
-  version = $1.split('.').map { |x| x.to_i }
-  version[0] < 1 || version[0] == 1 && version[1] < 10
+  Gem::Version.new($1)
+end
+
+def bundler_too_old?
+  Gem::Version.new(bundler_version) < Gem::Version.new("1.1.10")
+end
+
+def bundler_too_new?
+  Gem::Version.new(bundler_version) >= Gem::Version.new("2.1.0")
 end

data/passenger.gemspec

@@ -1,5 +1,6 @@
 source_root = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/src/ruby_supportlib")
+require 'rubygems'
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
 PhusionPassenger.require_passenger_lib 'packaging'
@@ -22,8 +23,9 @@ Gem::Specification.new do |s|
     "mailing_list_uri"  => "https://www.phusionpassenger.com/contact",
     "wiki_uri"          => "https://github.com/phusion/passenger/wiki"
   }
-  s.add_dependency 'rake', '>= 0.8.1'
-  s.add_dependency 'rack'
+  s.add_dependency 'rake', '>= 12.3.3'
+  s.add_dependency 'rack', '>= 1.6.13'
+  s.add_dependency 'rackup'
   s.files = Dir[*PhusionPassenger::Packaging::GLOB] -
     Dir[*PhusionPassenger::Packaging::EXCLUDE_GLOB]
   s.executables = PhusionPassenger::Packaging::USER_EXECUTABLES +

data/resources/templates/standalone/server.erb

@@ -55,6 +55,7 @@ passenger_enabled on;
 <%= nginx_option(app, :preload_bundler) %>
 <%= nginx_option(app, :app_file_descriptor_ulimit) %>
 <%= nginx_option(app, :friendly_error_pages) %>
+<%= nginx_option(app, :custom_error_page) %>
 <%= nginx_option(app, :abort_websockets_on_process_shutdown) %>
 <%= nginx_option(app, :force_max_concurrent_requests_per_process) %>
 <%= nginx_option(app, :max_requests) %>

data/src/agent/Core/ApplicationPool/Group/StateInspection.cpp

@@ -291,7 +291,7 @@ Group::inspectConfigInAdminPanelFormat(Json::Value &result) const {
 		result["environment_variables"] = VAL(Json::objectValue, Json::objectValue);
 	}
 
-	// Missing: sticky_sessions, sticky_session_cookie_name, friendly_error_pages
+	// Missing: sticky_sessions, sticky_session_cookie_name, friendly_error_pages, custom_error_page
 
 	/******************/
 

data/src/agent/Core/ApplicationPool/Pool/StateInspection.cpp

@@ -81,15 +81,12 @@ Pool::inspectProcessList(const InspectOptions &options, stringstream &result,
 
 		 if (process->metrics.isValid()) {
 			snprintf(cpubuf, sizeof(cpubuf), "%d%%", (int) process->metrics.cpu);
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wformat-truncation"
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation"
 			//don't worry about format-truncation here, no one has 9.3PB RAM
 			snprintf(membuf, sizeof(membuf), "%ldM",
 				(unsigned long) (process->metrics.realMemory() / 1024));
 #pragma GCC diagnostic pop
-#pragma clang diagnostic pop
 		} else {
 			snprintf(cpubuf, sizeof(cpubuf), "0%%");
 			snprintf(membuf, sizeof(membuf), "0M");

data/src/agent/Core/Config.h

@@ -118,6 +118,7 @@ using namespace std;
  *   default_abort_websockets_on_process_shutdown                    boolean            -          default(true)
  *   default_app_file_descriptor_ulimit                              unsigned integer   -          -
  *   default_bind_address                                            string             -          default("127.0.0.1")
+ *   default_custom_error_page                                       string             -          default("")
  *   default_environment                                             string             -          default("production")
  *   default_force_max_concurrent_requests_per_process               integer            -          default(-1)
  *   default_friendly_error_pages                                    string             -          default("auto")
@@ -166,7 +167,7 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/6.0.21")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.23")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_start_command                               string             -          read_only

data/src/agent/Core/Controller/CheckoutSession.cpp

@@ -23,6 +23,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#include "DataStructures/LString.h"
 #include <Core/Controller.h>
 #include <Core/SpawningKit/ErrorRenderer.h>
 
@@ -351,8 +352,17 @@ Controller::endRequestWithErrorResponse(Client **c, Request **r,
 	Request *req = *r;
 	SpawningKit::ErrorRenderer renderer(*appPool->getSpawningKitContext());
 	string data;
+	const LString *path = customErrorPageEnabled(req);
 
-	if (friendlyErrorPagesEnabled(req)) {
+	if (!psg_lstr_cmp(path, StaticString(""))) {
+		try {
+			data = renderer.renderCustom(StaticString(path->start->data, path->size));
+		} catch (const SystemException &e2) {
+			SKC_ERROR(client, "Cannot render an error page: " << e2.what() <<
+				"\n" << e2.backtrace());
+			data = "<h2>Internal server error</h2>";
+		}
+	} else if (friendlyErrorPagesEnabled(req)) {
 		try {
 			data = renderer.renderWithDetails(e);
 		} catch (const SystemException &e2) {
@@ -373,6 +383,19 @@ Controller::endRequestWithErrorResponse(Client **c, Request **r,
 	endRequestWithSimpleResponse(c, r, psg_pstrdup(req->pool, data), statusCode);
 }
 
+const LString*
+Controller::customErrorPageEnabled(Request *req) {
+	const StaticString name = "!~PASSENGER_CUSTOM_ERROR_PAGE";
+	LString* customErrorPagePath = req->secureHeaders.lookup(name);
+    if (customErrorPagePath != NULL && customErrorPagePath->size > 0) {
+        return psg_lstr_make_contiguous(customErrorPagePath, req->pool);
+    } else {
+        customErrorPagePath = (LString *) psg_palloc(req->pool, sizeof(LString));
+        psg_lstr_init(customErrorPagePath);
+		return customErrorPagePath;
+    }
+}
+
 bool
 Controller::friendlyErrorPagesEnabled(Request *req) {
 	bool defaultValue;

data/src/agent/Core/Controller/Config.h

@@ -88,6 +88,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   default_abort_websockets_on_process_shutdown        boolean            -          default(true)
  *   default_app_file_descriptor_ulimit                  unsigned integer   -          -
  *   default_bind_address                                string             -          default("127.0.0.1")
+ *   default_custom_error_page                           string             -          default("")
  *   default_environment                                 string             -          default("production")
  *   default_force_max_concurrent_requests_per_process   integer            -          default(-1)
  *   default_friendly_error_pages                        string             -          default("auto")
@@ -116,7 +117,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/6.0.21")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.23")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -161,6 +162,7 @@ private:
 		add("server_software", STRING_TYPE, OPTIONAL, SERVER_TOKEN_NAME "/" PASSENGER_VERSION);
 		add("vary_turbocache_by_cookie", STRING_TYPE, OPTIONAL);
 
+		add("default_custom_error_page", STRING_TYPE, OPTIONAL, "");
 		add("default_friendly_error_pages", STRING_TYPE, OPTIONAL, "auto");
 		add("default_environment", STRING_TYPE, OPTIONAL, DEFAULT_APP_ENV);
 		add("default_spawn_method", STRING_TYPE, OPTIONAL, DEFAULT_SPAWN_METHOD);
@@ -428,6 +430,7 @@ public:
 	StaticString defaultStickySessionsCookieAttributes;
 	StaticString defaultVaryTurbocacheByCookie;
 
+	StaticString defaultCustomErrorPage;
 	StaticString defaultFriendlyErrorPages;
 	StaticString defaultEnvironment;
 	StaticString defaultSpawnMethod;
@@ -463,6 +466,7 @@ public:
 		  defaultStickySessionsCookieAttributes(psg_pstrdup(pool, config["default_sticky_sessions_cookie_attributes"].asString())),
 		  defaultVaryTurbocacheByCookie(psg_pstrdup(pool, config["vary_turbocache_by_cookie"].asString())),
 
+		  defaultCustomErrorPage(psg_pstrdup(pool, config["default_custom_error_page"].asString())),
 		  defaultFriendlyErrorPages(psg_pstrdup(pool, config["default_friendly_error_pages"].asString())),
 		  defaultEnvironment(psg_pstrdup(pool, config["default_environment"].asString())),
 		  defaultSpawnMethod(psg_pstrdup(pool, config["default_spawn_method"].asString())),

data/src/agent/Core/Controller.h

@@ -216,6 +216,7 @@ private:
 		const ExceptionPtr &e);
 	void endRequestWithErrorResponse(Client **c, Request **r,
 		const SpawningKit::SpawnException &e, int statusCode);
+	const LString* customErrorPageEnabled(Request *req);
 	bool friendlyErrorPagesEnabled(Request *req);
 
 

data/src/agent/Core/OptionParser.h

@@ -339,6 +339,9 @@ parseCoreOption(int argc, const char *argv[], int &i, Json::Value &updates) {
 	} else if (p.isFlag(argv[i], '\0', "--multi-app")) {
 		updates["multi_app"] = true;
 		i++;
+	} else if (p.isFlag(argv[i], '\0', "--custom-error-page")) {
+		updates["custom_error_page"] = argv[i + 1];
+		i+=2;
 	} else if (p.isFlag(argv[i], '\0', "--force-friendly-error-pages")) {
 		updates["default_friendly_error_pages"] = true;
 		i++;

data/src/agent/Core/SpawningKit/ErrorRenderer.h

@@ -33,6 +33,7 @@
 #include <jsoncpp/json.h>
 
 #include <Constants.h>
+#include <DataStructures/LString.h>
 #include <StaticString.h>
 #include <FileTools/FileManip.h>
 #include <StrIntTools/Template.h>
@@ -108,6 +109,10 @@ public:
 
 		return Template::apply(unsafeReadFile(htmlFile), params);
 	}
+
+	string renderCustom(const StaticString &htmlFile) const {
+		return unsafeReadFile(htmlFile);
+	}
 };
 
 

data/src/agent/Watchdog/Config.h

@@ -104,6 +104,7 @@ using namespace std;
  *   default_abort_websockets_on_process_shutdown                             boolean            -          default(true)
  *   default_app_file_descriptor_ulimit                                       unsigned integer   -          -
  *   default_bind_address                                                     string             -          default("127.0.0.1")
+ *   default_custom_error_page                                                string             -          default("")
  *   default_environment                                                      string             -          default("production")
  *   default_force_max_concurrent_requests_per_process                        integer            -          default(-1)
  *   default_friendly_error_pages                                             string             -          default("auto")
@@ -154,7 +155,7 @@ using namespace std;
  *   security_update_checker_interval                                         unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                                        string             -          -
  *   security_update_checker_url                                              string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                          string             -          default("Phusion_Passenger/6.0.21")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.23")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -142,6 +142,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Set advanced Phusion Passenger(R) options."),
+	AP_INIT_TAKE1("PassengerCustomErrorPage",
+		(Take1Func) cmd_passenger_custom_error_page,
+		NULL,
+		RSRC_CONF | ACCESS_CONF,
+		"Path to html file to use for Passenger generated error pages."),
 	AP_INIT_TAKE1("PassengerDataBufferDir",
 		(Take1Func) cmd_passenger_data_buffer_dir,
 		NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -259,6 +259,21 @@ cmd_passenger_buffer_upload(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_custom_error_page(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
+	if (err != NULL) {
+		return err;
+	}
+
+	DirConfig *config = (DirConfig *) pcfg;
+	config->mCustomErrorPageSourceFile = cmd->directive->filename;
+	config->mCustomErrorPageSourceLine = cmd->directive->line_num;
+	config->mCustomErrorPageExplicitlySet = true;
+	config->mCustomErrorPage = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_data_buffer_dir(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp

@@ -75,6 +75,9 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	 */
 	config->mBufferResponse = Apache2Module::UNSET;
 	config->mBufferUpload = Apache2Module::UNSET;
+	/*
+	 * config->mCustomErrorPage: default initialized
+	 */
 	/*
 	 * config->mDirectInstanceRequestAddress: default initialized
 	 */
@@ -139,6 +142,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mBaseURIsSourceLine = 0;
 	config->mBufferResponseSourceLine = 0;
 	config->mBufferUploadSourceLine = 0;
+	config->mCustomErrorPageSourceLine = 0;
 	config->mDirectInstanceRequestAddressSourceLine = 0;
 	config->mEnabledSourceLine = 0;
 	config->mErrorOverrideSourceLine = 0;
@@ -177,6 +181,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mBaseURIsExplicitlySet = false;
 	config->mBufferResponseExplicitlySet = false;
 	config->mBufferUploadExplicitlySet = false;
+	config->mCustomErrorPageExplicitlySet = false;
 	config->mDirectInstanceRequestAddressExplicitlySet = false;
 	config->mEnabledExplicitlySet = false;
 	config->mErrorOverrideExplicitlySet = false;

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp

@@ -61,6 +61,9 @@ constructRequestHeaders_autoGenerated(request_rec *r, DirConfig *config, std::st
 	addHeader(result, StaticString("!~PASSENGER_APP_LOG_FILE",
 			sizeof("!~PASSENGER_APP_LOG_FILE") - 1),
 		config->mAppLogFile);
+	addHeader(result, StaticString("!~PASSENGER_CUSTOM_ERROR_PAGE",
+			sizeof("!~PASSENGER_CUSTOM_ERROR_PAGE") - 1),
+		config->mCustomErrorPage);
 	addHeader(result, StaticString("!~PASSENGER_DIRECT_INSTANCE_REQUEST_ADDRESS",
 			sizeof("!~PASSENGER_DIRECT_INSTANCE_REQUEST_ADDRESS") - 1),
 		config->mDirectInstanceRequestAddress);

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp

@@ -176,6 +176,19 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForDirConfig(server
 			pdconf->mBufferUploadSourceLine);
 		hierarchyMember["value"] = pdconf->mBufferUpload == Apache2Module::ENABLED;
 	}
+	if (pdconf->mCustomErrorPageExplicitlySet) {
+		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
+			pdconf, context, &appOptionsContainer, &locOptionsContainer);
+		Json::Value &optionContainer = findOrCreateOptionContainer(*appOptionsContainer,
+			"PassengerCustomErrorPage",
+			sizeof("PassengerCustomErrorPage") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			pdconf->mCustomErrorPageSourceFile,
+			pdconf->mCustomErrorPageSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			pdconf->mCustomErrorPage.data(),
+			pdconf->mCustomErrorPage.data() + pdconf->mCustomErrorPage.size());
+	}
 	if (pdconf->mDirectInstanceRequestAddressExplicitlySet) {
 		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
 			pdconf, context, &appOptionsContainer, &locOptionsContainer);

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp

@@ -88,6 +88,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(add->mBufferUpload != Apache2Module::UNSET)
 		? add->mBufferUpload
 		: base->mBufferUpload;
+	config->mCustomErrorPage =
+		(!add->mCustomErrorPage.empty())
+		? add->mCustomErrorPage
+		: base->mCustomErrorPage;
 	config->mDirectInstanceRequestAddress =
 		(!add->mDirectInstanceRequestAddress.empty())
 		? add->mDirectInstanceRequestAddress
@@ -207,6 +211,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsSourceFile = add->mBaseURIsSourceFile;
 	config->mBufferResponseSourceFile = add->mBufferResponseSourceFile;
 	config->mBufferUploadSourceFile = add->mBufferUploadSourceFile;
+	config->mCustomErrorPageSourceFile = add->mCustomErrorPageSourceFile;
 	config->mDirectInstanceRequestAddressSourceFile = add->mDirectInstanceRequestAddressSourceFile;
 	config->mEnabledSourceFile = add->mEnabledSourceFile;
 	config->mErrorOverrideSourceFile = add->mErrorOverrideSourceFile;
@@ -245,6 +250,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsSourceLine = add->mBaseURIsSourceLine;
 	config->mBufferResponseSourceLine = add->mBufferResponseSourceLine;
 	config->mBufferUploadSourceLine = add->mBufferUploadSourceLine;
+	config->mCustomErrorPageSourceLine = add->mCustomErrorPageSourceLine;
 	config->mDirectInstanceRequestAddressSourceLine = add->mDirectInstanceRequestAddressSourceLine;
 	config->mEnabledSourceLine = add->mEnabledSourceLine;
 	config->mErrorOverrideSourceLine = add->mErrorOverrideSourceLine;
@@ -283,6 +289,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsExplicitlySet = add->mBaseURIsExplicitlySet;
 	config->mBufferResponseExplicitlySet = add->mBufferResponseExplicitlySet;
 	config->mBufferUploadExplicitlySet = add->mBufferUploadExplicitlySet;
+	config->mCustomErrorPageExplicitlySet = add->mCustomErrorPageExplicitlySet;
 	config->mDirectInstanceRequestAddressExplicitlySet = add->mDirectInstanceRequestAddressExplicitlySet;
 	config->mEnabledExplicitlySet = add->mEnabledExplicitlySet;
 	config->mErrorOverrideExplicitlySet = add->mErrorOverrideExplicitlySet;

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -171,6 +171,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	StaticString mAppType;
 
+	/*
+	 * Path to html file to use for Passenger generated error pages.
+	 */
+	StaticString mCustomErrorPage;
+
 	/*
 	 * The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.
 	 */
@@ -265,6 +270,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mAppRootSourceFile;
 	StaticString mAppStartCommandSourceFile;
 	StaticString mAppTypeSourceFile;
+	StaticString mCustomErrorPageSourceFile;
 	StaticString mDirectInstanceRequestAddressSourceFile;
 	StaticString mGroupSourceFile;
 	StaticString mMeteorAppSettingsSourceFile;
@@ -303,6 +309,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mAppRootSourceLine;
 	unsigned int mAppStartCommandSourceLine;
 	unsigned int mAppTypeSourceLine;
+	unsigned int mCustomErrorPageSourceLine;
 	unsigned int mDirectInstanceRequestAddressSourceLine;
 	unsigned int mGroupSourceLine;
 	unsigned int mMeteorAppSettingsSourceLine;
@@ -341,6 +348,7 @@ struct AutoGeneratedDirConfig {
 	bool mAppRootExplicitlySet: 1;
 	bool mAppStartCommandExplicitlySet: 1;
 	bool mAppTypeExplicitlySet: 1;
+	bool mCustomErrorPageExplicitlySet: 1;
 	bool mDirectInstanceRequestAddressExplicitlySet: 1;
 	bool mGroupExplicitlySet: 1;
 	bool mMeteorAppSettingsExplicitlySet: 1;
@@ -540,6 +548,11 @@ struct AutoGeneratedDirConfig {
 		return mAppType;
 	}
 
+	StaticString
+	getCustomErrorPage() const {
+		return mCustomErrorPage;
+	}
+
 	StaticString
 	getDirectInstanceRequestAddress() const {
 		if (mDirectInstanceRequestAddress.empty()) {

data/src/cxx_supportlib/Constants.h

@@ -83,7 +83,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.21"
+#define PASSENGER_VERSION "6.0.23"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/DataStructures/LString.h

@@ -257,6 +257,10 @@ psg_lstr_cmp(const LString *str, const StaticString &other) {
 	const LString::Part *part;
 	const char *b;
 
+	if (str == NULL) {
+		return false;
+	}
+
 	// Fast check: check length match
 	if (str->size != other.size()) {
 		return false;

data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c

@@ -350,6 +350,14 @@
     offsetof(passenger_loc_conf_t, autogenerated.friendly_error_pages),
     NULL
 },
+{
+    ngx_string("passenger_custom_error_page"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_custom_error_page,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, autogenerated.custom_error_page),
+    NULL
+},
 {
     ngx_string("passenger_min_instances"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -541,6 +541,18 @@ passenger_conf_set_friendly_error_pages(ngx_conf_t *cf, ngx_command_t *cmd, void
     return ngx_conf_set_flag_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_custom_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.custom_error_page_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.custom_error_page_source_file,
+        &passenger_conf->autogenerated.custom_error_page_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_min_instances(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;

data/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