passenger 6.0.23 → 6.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '090896f92fb435c62847f46a39df880b08d3081323c925b35be422bb701d44a4'
-  data.tar.gz: 7c41513aef78b37d5ac93573afc01992f3d5ec6fe08101103ee0a0a2a8ab1cd4
+  metadata.gz: ee981e978956fd0e8eddd31a3872eb3aecfc598a6b696994d0231a753b12a3b1
+  data.tar.gz: 545c80e32fdb5a2d0801a8d38af9ec072ba5422319b561f0f33eee5354905d30
 SHA512:
-  metadata.gz: 3c6daa23ca3426ebafa54f7d94b018467bbc6d2572799a50ddf111f0628673d5e308ead07dd8e7d06e9d6a8b63bbdc28090c1c581ef06e6a6fce1a143956a6ac
-  data.tar.gz: 12130ca0f74963de002f8d1a777a2ce4563631a4e6ea7a654325efec072dd4e44e40989df4cbe9addad1b12664cdfd53d6ceeb9e76133f3ca169dc2b334ff478
+  metadata.gz: 8c6b9628356b9c16a8ea2df657aad1cd17d896539d0d822e0c2f63f56306effbfa9677814f597819f660baa62f373778a858fd68c2d21041b2ba4fe76939398f
+  data.tar.gz: 5c775c8e36ebfe6f6dfe290d0529da1105cfa22f2ef133d7dac02bdd3780e07b91d0f7694afcd9582a621ce801f0e1781b5f7653728d58506e9ab25e3408aaff

data/CHANGELOG

@@ -1,4 +1,29 @@
-Release 6.0.23 (Not yet released)
+Release 6.0.24 (Not yet released)
+-------------
+ * [Nginx] Upgrades preferred Nginx to 1.26.2 from 1.26.1.
+ * [Enterprise] Smarter rolling restarts for better performance and reliability. We changed the way we route requests. Instead of picking the least-busy process, we now first prioritize new processes first. During a rolling restart, this new behavior leads to more efficient utilization of application caches, faster validation of new rollouts, and faster recovery from problematic deployments. Closes GH-2551.
+ * Fix a regression from 6.0.10 where running `passenger-config system-properties` would throw an error. Closes GH-2565.
+ * [Enterprise] Fix a memory corruption-related crash that could occur during rolling restarting.
+ * [Ubuntu] Add packages for Ubuntu 24.10 "oracular".
+ * [Ruby] Specify rackup version to avoid broken 1.0 gem. Closes GH-2559.
+ * Fixes compatibility with Ruby apps whose Gemfile.lock depends on base64.
+ * Upgrades Boost from 1.85 -> 1.86.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - ccache 4.10.1 -> 4.10.2
+   - cmake 3.30.1 -> 3.31.2
+   - curl 8.8.0 -> 8.11.0
+   - git 2.45.2 -> 2.47.1
+   - gnupg 2.4.5 -> 2.4.7
+   - libgpg_error 1.50 -> 1.51
+   - npth 1.7 -> 1.8
+   - openssl 3.3.1 -> 3.4.0
+   - rubygems 3.5.16 -> 3.5.23
+   - rubies:
+     - 3.2.4 -> 3.2.6
+     - 3.3.4 -> 3.3.6
+
+
+Release 6.0.23
 -------------
  * [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.

data/Rakefile

@@ -28,13 +28,17 @@ $LOAD_PATH.unshift("#{SOURCE_ROOT}/src/ruby_supportlib")
 if defined?(Bundler)
   clean_env = nil
 
-  if Bundler.method_defined?(:with_unbundled_env)
+  if Bundler.respond_to?(:with_original_env)
+    Bundler.with_original_env do
+      clean_env = ENV.to_hash.dup
+    end
+  elsif Bundler.respond_to?(:with_unbundled_env)
     Bundler.with_unbundled_env do
-      clean_env = ENV.to_hash
+      clean_env = ENV.to_hash.dup
     end
   else
     Bundler.with_clean_env do
-      clean_env = ENV.to_hash
+      clean_env = ENV.to_hash.dup
     end
   end
   ENV.replace(clean_env)

data/bin/passenger-install-apache2-module

@@ -122,6 +122,8 @@ class Installer < PhusionPassenger::AbstractInstaller
   end
 
   def run_steps
+    PlatformInfo.verbose = true if @verbose_depcheck
+
     if PhusionPassenger.build_system_dir.nil?
       # Invariant: PhusionPassenger.custom_packaged?
       if apache_module_available?
@@ -944,6 +946,9 @@ parser = OptionParser.new do |opts|
   opts.on("--force-colors", "Display colors even if stdout is not a TTY") do
     options[:colorize] = true
   end
+  opts.on("--verbose-depcheck", "Show more dependency checking-related logs") do
+    options[:verbose_depcheck] = true
+  end
   opts.on("--snippet", "Show just the Apache config snippet.") do
     options[:snippet] = true
   end

data/bin/passenger-install-nginx-module

@@ -39,6 +39,7 @@ require 'digest/sha2'
 require 'optparse'
 require 'fileutils'
 require 'tmpdir'
+PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'platform_info/openssl'
 PhusionPassenger.require_passenger_lib 'abstract_installer'
@@ -542,8 +543,18 @@ private
   end
 
   def build_nginx_configure_command(prefix, extra_configure_flags = nil)
-    extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags}".strip
-    extra_ldflags = PlatformInfo.openssl_extra_ldflags
+    # When USE_ASAN is set, we compile our own code with AddressSanitizer but not Nginx.
+    # It's a third-party codebase we don't control so enabling AddressSanitizer for
+    # Nginx as well is more likely to hurt than help.
+    extra_cflags = [
+      "-Wno-error",
+      PlatformInfo.openssl_extra_cflags,
+    ].compact.join(" ").strip
+
+    extra_ldflags = [
+      PlatformInfo.openssl_extra_ldflags,
+      boolean_option('USE_ASAN') ? PlatformInfo.address_sanitizer_flags : nil,
+    ].compact.join(" ").strip
 
     command = "sh ./configure --prefix='#{prefix}' "
     command << "--with-http_ssl_module "
@@ -601,6 +612,10 @@ private
     end
     return digest.hexdigest
   end
+
+  def boolean_option(name)
+    ["1", "on", "true", "yes"].include?(ENV[name])
+  end
 end
 
 ORIG_ARGV = ARGV.dup

data/build/apache2.rb

@@ -126,7 +126,7 @@ file(APACHE2_TARGET => dependencies) do
       PlatformInfo.apache2_module_cxx_ldflags,
       PlatformInfo.portability_cxx_ldflags,
       OPTIMIZE ? '-O' : nil,
-      USE_ASAN ? "-shared-libasan" : nil
+      USE_ASAN ? PlatformInfo.address_sanitizer_flags : nil,
     ].compact
   )
 end

data/build/basics.rb

@@ -27,6 +27,7 @@ begin
 rescue LoadError
 end
 require 'fileutils'
+require 'shellwords'
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
 PhusionPassenger.require_passenger_lib 'constants'
@@ -94,6 +95,7 @@ let(:cxx) { maybe_wrap_in_ccache(PhusionPassenger::PlatformInfo.cxx) }
 let(:libext) { PlatformInfo.library_extension }
 
 USE_ASAN    = boolean_option('USE_ASAN')
+USE_UBSAN   = boolean_option('USE_UBSAN')
 USE_SELINUX = boolean_option('USE_SELINUX')
 OPTIMIZE    = boolean_option('OPTIMIZE')
 LTO         = OPTIMIZE && boolean_option('LTO')
@@ -112,16 +114,20 @@ EXTRA_PRE_CXXFLAGS = compiler_flag_option('EXTRA_PRE_CXXFLAGS')
 let(:extra_cflags) do
   result = PlatformInfo.default_extra_cflags.dup
   result << " " << compiler_flag_option('EXTRA_CFLAGS') if !compiler_flag_option('EXTRA_CFLAGS').empty?
-  result << " #{PlatformInfo.address_sanitizer_flag}" if USE_ASAN && PlatformInfo.address_sanitizer_flag
+  result << " #{PlatformInfo.address_sanitizer_flags}" if USE_ASAN && PlatformInfo.address_sanitizer_flags
+  result << " #{PlatformInfo.undefined_behavior_sanitizer_flags}" if USE_UBSAN && PlatformInfo.undefined_behavior_sanitizer_flags
   result << " -fno-omit-frame-pointer" if USE_ASAN
+  result << " -fno-optimize-sibling-calls" if USE_ASAN && PlatformInfo.cc_supports_fno_optimize_sibling_calls_flag?
   result << " -DPASSENGER_DISABLE_THREAD_LOCAL_STORAGE" if !boolean_option('PASSENGER_THREAD_LOCAL_STORAGE', true)
   result
 end
 let(:extra_cxxflags) do
   result = PlatformInfo.default_extra_cxxflags.dup
   result << " " << compiler_flag_option('EXTRA_CXXFLAGS') if !compiler_flag_option('EXTRA_CXXFLAGS').empty?
-  result << " #{PlatformInfo.address_sanitizer_flag}" if USE_ASAN && PlatformInfo.address_sanitizer_flag
+  result << " #{PlatformInfo.address_sanitizer_flags}" if USE_ASAN && PlatformInfo.address_sanitizer_flags
+  result << " #{PlatformInfo.undefined_behavior_sanitizer_flags}" if USE_UBSAN && PlatformInfo.undefined_behavior_sanitizer_flags
   result << " -fno-omit-frame-pointer" if USE_ASAN
+  result << " -fno-optimize-sibling-calls" if USE_ASAN && PlatformInfo.cxx_supports_fno_optimize_sibling_calls_flag?
   result << " -DPASSENGER_DISABLE_THREAD_LOCAL_STORAGE" if !boolean_option('PASSENGER_THREAD_LOCAL_STORAGE', true)
   result
 end
@@ -135,7 +141,7 @@ EXTRA_PRE_CXX_LDFLAGS = compiler_flag_option('EXTRA_PRE_LDFLAGS') + " " +
 # These should be included last in the command string, even after portability_*_ldflags.
 let(:extra_c_ldflags) do
   result = []
-  result << PlatformInfo.address_sanitizer_flag if USE_ASAN
+  result << PlatformInfo.address_sanitizer_flags if USE_ASAN
   result << compiler_flag_option('EXTRA_LDFLAGS')
   result << compiler_flag_option('EXTRA_C_LDFLAGS')
   result.compact!
@@ -143,7 +149,7 @@ let(:extra_c_ldflags) do
 end
 let(:extra_cxx_ldflags) do
   result = []
-  result << PlatformInfo.address_sanitizer_flag if USE_ASAN
+  result << PlatformInfo.address_sanitizer_flags if USE_ASAN
   result << compiler_flag_option('EXTRA_LDFLAGS')
   result << compiler_flag_option('EXTRA_CXX_LDFLAGS')
   result.compact!

data/build/cxx_tests.rb

@@ -158,7 +158,15 @@ let(:test_cxx_include_paths) do
 end
 
 let(:test_cxx_flags) do
-  ['-include test/cxx/TestSupport.h'] + basic_test_cxx_flags
+  # Some flags are necessary to make precompiled headers play well with ccache (and possibly also sccache):
+  # https://ccache.dev/manual/4.8.2.html#_precompiled_headers
+  if PlatformInfo.cxx_is_gcc?
+    ['-include test/cxx/TestSupport.h', '-fpch-preprocess']
+  elsif PlatformInfo.cxx_is_clang?
+    ["-include-pch test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}", '-Xclang', '-fno-pch-timestamp']
+  else
+    ['-include test/cxx/TestSupport.h']
+  end + basic_test_cxx_flags
 end
 
 let(:test_cxx_ldflags) do
@@ -182,7 +190,7 @@ TEST_CXX_OBJECTS.each_pair do |object, source|
     lambda { {
       :include_paths => test_cxx_include_paths,
       :flags => test_cxx_flags,
-      :deps => 'test/cxx/TestSupport.h.gch'
+      :deps => "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}"
     } }
   )
 end
@@ -204,14 +212,16 @@ file(TEST_CXX_TARGET => dependencies) do
   )
 end
 
-dependencies = [
+cxx_test_dependencies = [
   TEST_CXX_TARGET,
   "#{TEST_OUTPUT_DIR}allocate_memory",
   NATIVE_SUPPORT_TARGET,
   AGENT_TARGET
 ].compact
+task 'test:cxx:build' => cxx_test_dependencies
+
 desc "Run unit tests for the C++ components"
-task 'test:cxx' => dependencies do
+task 'test:cxx' => cxx_test_dependencies do
   args = ENV['GROUPS'].to_s.split(";").map{ |name| "-g #{name}" }
 
   if level = string_option('LOG_LEVEL')
@@ -280,14 +290,15 @@ task 'test:cxx' => dependencies do
   end
 end
 
-file('test/cxx/TestSupport.h.gch' => generate_compilation_task_dependencies('test/cxx/TestSupport.h')) do
+file("test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}" => generate_compilation_task_dependencies('test/cxx/TestSupport.h')) do
   compile_cxx(
-    'test/cxx/TestSupport.h.gch',
+    "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}",
     'test/cxx/TestSupport.h',
     :include_paths => test_cxx_include_paths,
     :flags => [
       "-x c++-header",
+      PlatformInfo.cxx_is_clang? ? "-Xclang -emit-pch" : nil,
       basic_test_cxx_flags
-    ].flatten
+    ].compact.flatten
   )
 end

data/build/support/cxx_dependency_map.rb

@@ -307,6 +307,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/agent/Core/ApplicationPool/BasicGroupInfo.h"=>
   ["src/agent/Core/ApplicationPool/Context.h",
+   "src/agent/Core/ApplicationPool/Options.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h",
    "src/agent/Core/SpawningKit/Context.h",
@@ -393,6 +394,7 @@ CXX_DEPENDENCY_MAP =
  "src/agent/Core/ApplicationPool/BasicProcessInfo.h"=>
   ["src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Core/ApplicationPool/Context.h",
+   "src/agent/Core/ApplicationPool/Options.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h",
    "src/agent/Core/SpawningKit/Context.h",
@@ -563,7 +565,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/thread.hpp",
    "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/agent/Core/ApplicationPool/Context.h"=>
-  ["src/agent/Core/SpawningKit/Config.h",
+  ["src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h",
    "src/agent/Core/SpawningKit/Context.h",
    "src/agent/Core/SpawningKit/DirectSpawner.h",
@@ -750,6 +753,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Context.h",
    "src/agent/Core/ApplicationPool/Group.h",
    "src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/ApplicationPool/Pool.h",
    "src/agent/Core/ApplicationPool/Process.h",
    "src/agent/Core/ApplicationPool/Session.h",
    "src/agent/Core/ApplicationPool/Socket.h",
@@ -818,6 +822,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Lock.h",
+   "src/cxx_supportlib/Utils/MessagePassing.h",
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
    "src/cxx_supportlib/Utils/Timer.h",
@@ -848,6 +853,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Context.h",
    "src/agent/Core/ApplicationPool/Group.h",
    "src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/ApplicationPool/Pool.h",
    "src/agent/Core/ApplicationPool/Process.h",
    "src/agent/Core/ApplicationPool/Session.h",
    "src/agent/Core/ApplicationPool/Socket.h",
@@ -916,6 +922,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Lock.h",
+   "src/cxx_supportlib/Utils/MessagePassing.h",
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
    "src/cxx_supportlib/Utils/Timer.h",
@@ -946,6 +953,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Context.h",
    "src/agent/Core/ApplicationPool/Group.h",
    "src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/ApplicationPool/Pool.h",
    "src/agent/Core/ApplicationPool/Process.h",
    "src/agent/Core/ApplicationPool/Session.h",
    "src/agent/Core/ApplicationPool/Socket.h",
@@ -1014,6 +1022,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Lock.h",
+   "src/cxx_supportlib/Utils/MessagePassing.h",
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
    "src/cxx_supportlib/Utils/Timer.h",
@@ -1044,6 +1053,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Context.h",
    "src/agent/Core/ApplicationPool/Group.h",
    "src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/ApplicationPool/Pool.h",
    "src/agent/Core/ApplicationPool/Process.h",
    "src/agent/Core/ApplicationPool/Session.h",
    "src/agent/Core/ApplicationPool/Socket.h",
@@ -1112,6 +1122,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Lock.h",
+   "src/cxx_supportlib/Utils/MessagePassing.h",
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
    "src/cxx_supportlib/Utils/Timer.h",
@@ -1142,6 +1153,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Context.h",
    "src/agent/Core/ApplicationPool/Group.h",
    "src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/ApplicationPool/Pool.h",
    "src/agent/Core/ApplicationPool/Process.h",
    "src/agent/Core/ApplicationPool/Session.h",
    "src/agent/Core/ApplicationPool/Socket.h",
@@ -1211,6 +1223,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Lock.h",
+   "src/cxx_supportlib/Utils/MessagePassing.h",
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
    "src/cxx_supportlib/Utils/Timer.h",
@@ -1241,6 +1254,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Context.h",
    "src/agent/Core/ApplicationPool/Group.h",
    "src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/ApplicationPool/Pool.h",
    "src/agent/Core/ApplicationPool/Process.h",
    "src/agent/Core/ApplicationPool/Session.h",
    "src/agent/Core/ApplicationPool/Socket.h",
@@ -1309,6 +1323,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Lock.h",
+   "src/cxx_supportlib/Utils/MessagePassing.h",
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
    "src/cxx_supportlib/Utils/Timer.h",
@@ -1339,6 +1354,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Context.h",
    "src/agent/Core/ApplicationPool/Group.h",
    "src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/ApplicationPool/Pool.h",
    "src/agent/Core/ApplicationPool/Process.h",
    "src/agent/Core/ApplicationPool/Session.h",
    "src/agent/Core/ApplicationPool/Socket.h",
@@ -1407,6 +1423,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Lock.h",
+   "src/cxx_supportlib/Utils/MessagePassing.h",
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
    "src/cxx_supportlib/Utils/Timer.h",
@@ -1437,6 +1454,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Context.h",
    "src/agent/Core/ApplicationPool/Group.h",
    "src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/ApplicationPool/Pool.h",
    "src/agent/Core/ApplicationPool/Process.h",
    "src/agent/Core/ApplicationPool/Session.h",
    "src/agent/Core/ApplicationPool/Socket.h",
@@ -1505,6 +1523,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Lock.h",
+   "src/cxx_supportlib/Utils/MessagePassing.h",
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
    "src/cxx_supportlib/Utils/Timer.h",
@@ -1535,6 +1554,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Context.h",
    "src/agent/Core/ApplicationPool/Group.h",
    "src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/ApplicationPool/Pool.h",
    "src/agent/Core/ApplicationPool/Process.h",
    "src/agent/Core/ApplicationPool/Session.h",
    "src/agent/Core/ApplicationPool/Socket.h",
@@ -1603,6 +1623,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Lock.h",
+   "src/cxx_supportlib/Utils/MessagePassing.h",
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
    "src/cxx_supportlib/Utils/Timer.h",
@@ -1633,6 +1654,7 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Context.h",
    "src/agent/Core/ApplicationPool/Group.h",
    "src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/ApplicationPool/Pool.h",
    "src/agent/Core/ApplicationPool/Process.h",
    "src/agent/Core/ApplicationPool/Session.h",
    "src/agent/Core/ApplicationPool/Socket.h",
@@ -1701,6 +1723,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Lock.h",
+   "src/cxx_supportlib/Utils/MessagePassing.h",
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
    "src/cxx_supportlib/Utils/Timer.h",
@@ -1787,6 +1810,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/DataStructures/HashMap.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
+   "src/cxx_supportlib/DataStructures/LString.h",
    "src/cxx_supportlib/DataStructures/StringKeyTable.h",
    "src/cxx_supportlib/DataStructures/StringMap.h",
    "src/cxx_supportlib/Exceptions.h",
@@ -1804,6 +1828,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/LoggingKit/Logging.h",
    "src/cxx_supportlib/LoggingKit/LoggingKit.h",
    "src/cxx_supportlib/LveLoggingDecorator.h",
+   "src/cxx_supportlib/MemoryKit/mbuf.h",
    "src/cxx_supportlib/MemoryKit/palloc.h",
    "src/cxx_supportlib/ProcessManagement/Spawn.h",
    "src/cxx_supportlib/ProcessManagement/Utils.h",
@@ -6124,7 +6149,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/system_calls.hpp",
    "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/agent/Core/SpawningKit/DirectSpawner.h"=>
-  ["src/agent/Core/SpawningKit/Config.h",
+  ["src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h",
    "src/agent/Core/SpawningKit/Context.h",
    "src/agent/Core/SpawningKit/Exceptions.h",
@@ -6200,7 +6226,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/thread.hpp",
    "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/agent/Core/SpawningKit/DummySpawner.h"=>
-  ["src/agent/Core/SpawningKit/Config.h",
+  ["src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h",
    "src/agent/Core/SpawningKit/Context.h",
    "src/agent/Core/SpawningKit/Exceptions.h",
@@ -6275,6 +6302,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/DataStructures/HashMap.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
+   "src/cxx_supportlib/DataStructures/LString.h",
    "src/cxx_supportlib/DataStructures/StringKeyTable.h",
    "src/cxx_supportlib/DataStructures/StringMap.h",
    "src/cxx_supportlib/Exceptions.h",
@@ -6287,6 +6315,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/LoggingKit/Forward.h",
    "src/cxx_supportlib/LoggingKit/Logging.h",
    "src/cxx_supportlib/LoggingKit/LoggingKit.h",
+   "src/cxx_supportlib/MemoryKit/mbuf.h",
+   "src/cxx_supportlib/MemoryKit/palloc.h",
    "src/cxx_supportlib/ProcessManagement/Spawn.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/cxx_supportlib/ResourceLocator.h",
@@ -6355,7 +6385,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/system_calls.hpp",
    "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/agent/Core/SpawningKit/Factory.h"=>
-  ["src/agent/Core/SpawningKit/Config.h",
+  ["src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h",
    "src/agent/Core/SpawningKit/Context.h",
    "src/agent/Core/SpawningKit/DirectSpawner.h",
@@ -6637,6 +6668,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/agent/Core/SpawningKit/Handshake/WorkDir.h"=>
   ["src/cxx_supportlib/Exceptions.h",
+   "src/cxx_supportlib/FileTools/FileManip.h",
    "src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/StrIntTools/StrIntUtils.h",
    "src/cxx_supportlib/Utils.h",
@@ -6752,7 +6784,8 @@ CXX_DEPENDENCY_MAP =
  "src/agent/Core/SpawningKit/Result/AutoGeneratedCode.h"=>
   [],
  "src/agent/Core/SpawningKit/SmartSpawner.h"=>
-  ["src/agent/Core/SpawningKit/Config.h",
+  ["src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h",
    "src/agent/Core/SpawningKit/Context.h",
    "src/agent/Core/SpawningKit/Exceptions.h",
@@ -6831,7 +6864,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/thread.hpp",
    "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/agent/Core/SpawningKit/Spawner.h"=>
-  ["src/agent/Core/SpawningKit/Config.h",
+  ["src/agent/Core/ApplicationPool/Options.h",
+   "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h",
    "src/agent/Core/SpawningKit/Context.h",
    "src/agent/Core/SpawningKit/Result.h",

data/build/test_basics.rb

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

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   }
   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/src/agent/Core/ApplicationPool/Group/InitializationAndShutdown.cpp

@@ -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

@@ -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

@@ -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_