passenger 6.0.23 → 6.0.25

data/build/test_basics.rb

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous B.V.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +34,7 @@ task :test => ['test:oxt', 'test:cxx', 'test:ruby', 'test:node', 'test:integrati
 desc "Clean all compiled test files"
 task 'test:clean' do
   sh("rm -rf #{TEST_OUTPUT_DIR}")
-  sh("rm -f test/cxx/*.gch")
+  sh("rm -f test/cxx/*.#{PlatformInfo.precompiled_header_extension} test/cxx/*.gch test/cxx/*.pch")
 end
 
 task :clean => 'test:clean'
@@ -66,19 +66,11 @@ task 'test:install_deps' do
     sh "#{gem_install} bundler"
   end
 
-  if install_base_deps
-    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
+  if !install_base_deps
     if bundler_too_new?
-      sh "bundle config set --local without 'base future'"
+      sh "bundle config set --local without 'base'"
     else
-      bundle_args.concat(["--without", "base", "future"])
+      bundle_args.concat(["--without", "base"])
     end
   end
   sh "bundle install #{bundle_args.join(' ')} #{ENV['BUNDLE_ARGS']}"

data/dev/copy_boost_headers

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous B.V.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/dev/nginx_version_sha256

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2024 Phusion Holding B.V.
+#  Copyright (c) 2024-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous B.V.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/doc/DesignAspects/LimitedGemDependencies.md

@@ -0,0 +1,39 @@
+# Limited gem dependencies
+
+## Context
+
+- We provide native packages (APT/YUM) for Passenger.
+- Passenger has a bunch of tools (e.g. `bin/passenger-status`, `helper-scripts/backtrace-sanitizer.rb`, `helper-scripts/prespawn`) that are written in Ruby. When Passenger is natively packaged, we ensure that these tools run in the "system" Ruby.
+- On Debian-based systems, the OS package repositories may supply multiple Ruby versions. So our native packaging can't assume a single Ruby version.
+
+This raises the question of how to deal with Passenger's own gem dependencies. An analysis of possible strategies and their implications/tradeoffs:
+
+1. If the OS package repositories supply dependent gems, then our native packages can depend on those directly.
+
+   Drawbacks:
+
+    - Limited selection of gems.
+
+2. We package the gem dependencies ourselves. In addition, any dependency with native extensions must be packaged separately, once for each Ruby version installable through the native OS package repositories.
+
+   Drawbacks:
+
+    - More work for us.
+
+3. We vendor the gem dependencies within the native packages. In addition, any dependency with native extensions must be vendored separately, once for each Ruby version installable through the native OS package repositories.
+
+## Decision
+
+We pick strategy 1.
+
+## Consequences
+
+- Any gems that the written-in-Ruby tools depend on, must either be available through OS repositories, or must be a Ruby standard library gem.
+  - All such dependencies must be specified in the Passenger gemspec.
+- Development-related Passenger Ruby code can depend on any gem, since they're not included in native packages.
+  - All such dependencies must be specified in the Passenger Gemfile.
+
+## See also
+
+- [No gem activation during Ruby loader initialization](NoGemActivationDuringRubyLoaderInitialization.md)
+- System Ruby runner (only used in Debian packages): `packaging/debian/debian_specs/passenger/passenger_system_ruby.c.erb`

data/doc/DesignAspects/NoGemActivationDuringRubyLoaderInitialization.md

@@ -0,0 +1,27 @@
+# No gem activation during Ruby loader initialization
+
+## Context
+
+Passenger loads a Ruby app using loader scripts (rack-loader.rb and rack-preloader.rb). These scripts perform these steps:
+
+1. Initialization, e.g., to setup communication with the Passenger Core.
+2. Activate Bundler.
+3. Load the application (config.ru).
+
+If step 1 activates any gems, then that may conflict with Bundler activation because Gemfile could specify a different gem version.
+
+## Decision
+
+All code callable by the Ruby loaders' initialization steps, must not activate any gems.
+
+## Consequences
+
+Any needed functionality that's typically provided by gems, must be reimplemented within the `PhusionPassenger` module.
+
+For example, the initialization step needs to parse JSON. Instead of activating the JSON gem, we reimplement a JSON parser in `PhusionPassenger::Utils::JSON`.
+
+### Caveat: standard library gems
+
+More and more parts of the Ruby standard library are becoming [gemified](https://stdgems.org/). This increases the chances of the initialization step activating a standard library gem. In principle, our strategy remains the same: we reimplement those libraries. For example, we reimplemented StringScanner (needed by our JSON implementation) in `PhusionPassenger::Utils::StringScanner`, but we limited its scope to just the functionality needed by the JSON implementation.
+
+If the standard library in question is a native extension (e.g., `etc`), then the strategy is to reimplement it in C++ as part of the [Passenger Agent binary](../../src/agent/README.md), as a separately callable tool. The Ruby code then spawns the written-in-C++ tool and parses its output.

data/package.json

@@ -11,7 +11,7 @@
     "body-parser": "^1.20.2",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^3.4.1",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "jquery": "^3.7.1",
     "mini-css-extract-plugin": "^2.7.6",
     "mocha": "^9.2.2",

data/passenger.gemspec

@@ -23,9 +23,13 @@ Gem::Specification.new do |s|
     "mailing_list_uri"  => "https://www.phusionpassenger.com/contact",
     "wiki_uri"          => "https://github.com/phusion/passenger/wiki"
   }
+
+  # Limit dependencies only to those available through OS package repositories.
+  # See doc/DesignAspects/LimitedGemDependencies.md
   s.add_dependency 'rake', '>= 12.3.3'
   s.add_dependency 'rack', '>= 1.6.13'
-  s.add_dependency 'rackup'
+  s.add_dependency 'rackup', '>= 2.0.0'
+
   s.files = Dir[*PhusionPassenger::Packaging::GLOB] -
     Dir[*PhusionPassenger::Packaging::EXCLUDE_GLOB]
   s.executables = PhusionPassenger::Packaging::USER_EXECUTABLES +

data/resources/templates/apache2/deployment_example.txt.erb

@@ -8,4 +8,4 @@ guide:
 Enjoy Phusion Passenger, a product of Phusion® (<b><%= @phusion_website %></b>) :-)
 <b><%= @passenger_website %></b>
 
-Passenger® is a registered trademark of Phusion Holding B.V.
+Passenger® is a registered trademark of Asynchronous B.V.

data/resources/templates/nginx/deployment_example.txt.erb

@@ -8,4 +8,4 @@ guide:
 Enjoy Phusion Passenger, a product of Phusion (<b><%= @phusion_website %></b>) :-)
 <b><%= @passenger_website %></b>
 
-Passenger® is a registered trademark of Phusion Holding B.V.
+Passenger® is a registered trademark of Asynchronous B.V.

data/resources/templates/standalone/http.erb

@@ -32,6 +32,7 @@ passenger_user_switching off;
 <%= nginx_http_option(:pool_idle_time) %>
 <%= nginx_http_option(:max_preloader_idle_time) %>
 <%= nginx_http_option(:turbocaching) %>
+<%= nginx_http_option(:old_routing) %>
 <%= nginx_http_option(:instance_registry_dir) %>
 <%= nginx_http_option(:spawn_dir) %>
 <%= nginx_http_option(:disable_security_update_check) %>

data/src/agent/AgentMain.cpp

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal

data/src/agent/Core/AdminPanelConnector.h

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2018 Phusion Holding B.V.
+ *  Copyright (c) 2017-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal

data/src/agent/Core/ApiServer.h

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013-2018 Phusion Holding B.V.
+ *  Copyright (c) 2013-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal

data/src/agent/Core/ApplicationPool/AbstractSession.h

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2016-2017 Phusion Holding B.V.
+ *  Copyright (c) 2016-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal

data/src/agent/Core/ApplicationPool/BasicGroupInfo.h

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal

data/src/agent/Core/ApplicationPool/BasicProcessInfo.h

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2018 Phusion Holding B.V.
+ *  Copyright (c) 2014-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal

data/src/agent/Core/ApplicationPool/Common.h

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2018 Phusion Holding B.V.
+ *  Copyright (c) 2011-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal

data/src/agent/Core/ApplicationPool/Context.h

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2018 Phusion Holding B.V.
+ *  Copyright (c) 2014-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -61,6 +61,8 @@ public:
 	boost::object_pool<Process> processObjectPool;
 	mutable boost::mutex agentConfigSyncher;
 
+	// Whether to use the old routing algorithm
+	bool oldRouting;
 
 	/****** Dependencies ******/
 
@@ -68,9 +70,10 @@ public:
 	Json::Value agentConfig;
 
 
-	Context()
+	Context(bool _oldRouting)
 		: sessionObjectPool(64, 1024),
-		  processObjectPool(4, 64)
+		  processObjectPool(4, 64),
+		  oldRouting(_oldRouting)
 		{ }
 
 	void finalize() {

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

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,12 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_INITIALIZATION_AND_SHUTDOWN_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_INITIALIZATION_AND_SHUTDOWN_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 
 /*************************************************************************
@@ -179,3 +185,5 @@ Group::shutdown(const Callback &callback,
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_INITIALIZATION_AND_SHUTDOWN_CPP_

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

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2018 Phusion Holding B.V.
+ *  Copyright (c) 2011-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,12 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_INTERNAL_UTILS_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_INTERNAL_UTILS_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 
 /*************************************************************************
@@ -178,7 +184,7 @@ Group::createNullProcessObject() {
 	LockGuard l(context->memoryManagementSyncher);
 	Process *process = context->processObjectPool.malloc();
 	Guard guard(context, process);
-	process = new (process) Process(&info, args);
+	process = new (process) Process(&info, info.group->restartsInitiated, args);
 	process->shutdownNotRequired();
 	guard.clear();
 	return ProcessPtr(process, false);
@@ -215,7 +221,7 @@ Group::createProcessObject(const SpawningKit::Spawner &spawner,
 	LockGuard l(context->memoryManagementSyncher);
 	Process *process = context->processObjectPool.malloc();
 	Guard guard(context, process);
-	process = new (process) Process(&info, spawnResult, args);
+	process = new (process) Process(&info, info.group->restartsInitiated, spawnResult, args);
 	guard.clear();
 	return ProcessPtr(process, false);
 }
@@ -374,3 +380,5 @@ Group::callAbortLongRunningConnectionsCallback(const ProcessPtr &process) {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_INTERNAL_UTILS_CPP_

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

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,12 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_LIFETIME_AND_BASICS_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_LIFETIME_AND_BASICS_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 
 /*************************************************************************
@@ -107,3 +113,5 @@ Group::getWrapperRegistry() const {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_LIFETIME_AND_BASICS_CPP_

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

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,13 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_MISCELLANEOUS_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_MISCELLANEOUS_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 
 /*************************************************************************
@@ -65,3 +72,5 @@ Group::authorizeByApiKey(const ApiKey &key) const {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_MISCELLANEOUS_CPP_

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

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2018 Phusion Holding B.V.
+ *  Copyright (c) 2011-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,13 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_OUT_OF_BAND_WORK_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_OUT_OF_BAND_WORK_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 #include <IOTools/MessageSerialization.h>
 
@@ -322,3 +329,5 @@ Group::requestOOBW(const ProcessPtr &process) {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_OUT_OF_BAND_WORK_CPP_

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

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous B.V.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,12 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_PROCESS_LIST_MANAGEMENT_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_PROCESS_LIST_MANAGEMENT_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 
 /*************************************************************************
@@ -63,7 +69,6 @@ Group::findProcessWithStickySessionIdOrLowestBusyness(unsigned int id) const {
 	int lowestBusyness = 0;
 	unsigned int i, size = enabledProcessBusynessLevels.size();
 	const int *enabledProcessBusynessLevels = &this->enabledProcessBusynessLevels[0];
-
 	for (i = 0; i < size; i++) {
 		Process *process = enabledProcesses[i].get();
 		if (process->getStickySessionId() == id) {
@@ -125,6 +130,77 @@ Group::findEnabledProcessWithLowestBusyness() const {
 	return enabledProcesses[leastBusyProcessIndex].get();
 }
 
+/**
+ * Return the process with the given sticky session ID if it exists.
+ * If not, then find the "best" enabled process to route a request to,
+ * according to the same criteria documented for findBestProcess().
+ *
+ * - If the process with the given sticky session ID exists, then always
+ *   returns that process. Meaning that this process could be `!canBeRoutedTo()`.
+ * - If there is no process that can be routed to, then returns nullptr.
+ */
+Process *
+Group::findBestProcessPreferringStickySessionId(unsigned int id) const {
+	Process *bestProcess = nullptr;
+	ProcessList::const_iterator it;
+	ProcessList::const_iterator end = enabledProcesses.end();
+
+	for (it = enabledProcesses.begin(); it != end; it++) {
+		Process *process = it->get();
+		if (process->getStickySessionId() == id) {
+			return process;
+		} else if (!process->isTotallyBusy()
+			&& (
+				bestProcess == nullptr
+				|| process->generation > bestProcess->generation
+				|| (process->generation == bestProcess->generation && process->spawnStartTime < bestProcess->spawnStartTime)
+				|| (process->generation == bestProcess->generation && process->spawnStartTime == bestProcess->spawnStartTime && process->busyness() < bestProcess->busyness())
+			)
+		) {
+			bestProcess = process;
+		}
+	}
+
+	return bestProcess;
+}
+
+/**
+ * Given a ProcessList, find the "best" process to route a request to.
+ * At the moment, "best" is defined as the process with the highest generation,
+ * lowest start time, and lowest busyness, in that order of priority.
+ *
+ * If there is no process that can be routed to, then returns nullptr.
+ *
+ * @post result != nullptr || result.canBeRoutedTo()
+ */
+Process *
+Group::findBestProcess(const ProcessList &processes) const {
+	if (processes.empty()) {
+		return nullptr;
+	}
+
+	Process *bestProcess = nullptr;
+	ProcessList::const_iterator it;
+	ProcessList::const_iterator end = processes.end();
+
+	for (it = processes.begin(); it != end; it++) {
+		Process *process = it->get();
+
+		if (!process->isTotallyBusy()
+			&& (
+				bestProcess == nullptr
+				|| process->generation > bestProcess->generation
+				|| (process->generation == bestProcess->generation && process->spawnStartTime < bestProcess->spawnStartTime)
+				|| (process->generation == bestProcess->generation && process->spawnStartTime == bestProcess->spawnStartTime && process->busyness() < bestProcess->busyness())
+			)
+		) {
+			bestProcess = process;
+		}
+	}
+
+	return bestProcess;
+}
+
 /**
  * Adds a process to the given list (enabledProcess, disablingProcesses, disabledProcesses)
  * and sets the process->enabled flag accordingly.
@@ -222,6 +298,7 @@ void
 Group::removeFromDisableWaitlist(const ProcessPtr &p, DisableResult result,
 	boost::container::vector<Callback> &postLockActions)
 {
+	const deque<DisableWaiter> &disableWaitlist = this->disableWaitlist;
 	deque<DisableWaiter>::const_iterator it, end = disableWaitlist.end();
 	deque<DisableWaiter> newList;
 	for (it = disableWaitlist.begin(); it != end; it++) {
@@ -233,7 +310,7 @@ Group::removeFromDisableWaitlist(const ProcessPtr &p, DisableResult result,
 			newList.push_back(waiter);
 		}
 	}
-	disableWaitlist = newList;
+	this->disableWaitlist = newList;
 }
 
 void
@@ -428,6 +505,7 @@ Group::attach(const ProcessPtr &process,
 	/* Now that there are enough resources, relevant processes in
 	 * 'disableWaitlist' can be disabled.
 	 */
+	const deque<DisableWaiter> &disableWaitlist = this->disableWaitlist;
 	deque<DisableWaiter>::const_iterator it, end = disableWaitlist.end();
 	deque<DisableWaiter> newDisableWaitlist;
 	for (it = disableWaitlist.begin(); it != end; it++) {
@@ -451,7 +529,7 @@ Group::attach(const ProcessPtr &process,
 			newDisableWaitlist.push_back(waiter);
 		}
 	}
-	disableWaitlist = newDisableWaitlist;
+	this->disableWaitlist = newDisableWaitlist;
 
 	// Update GC sleep timer.
 	wakeUpGarbageCollector();
@@ -616,3 +694,5 @@ Group::disable(const ProcessPtr &process, const DisableCallback &callback) {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_PROCESS_LIST_MANAGEMENT_CPP_