passenger 6.0.22 → 6.0.24

data/src/cxx_supportlib/vendor-modified/boost/unordered/unordered_node_map_fwd.hpp

@@ -1,5 +1,6 @@
 
 // Copyright (C) 2022 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -15,6 +16,10 @@
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
     template <class Key, class T, class Hash = boost::hash<Key>,
@@ -36,6 +41,16 @@ namespace boost {
     void swap(unordered_node_map<Key, T, Hash, KeyEqual, Allocator>& lhs,
       unordered_node_map<Key, T, Hash, KeyEqual, Allocator>& rhs)
       noexcept(noexcept(lhs.swap(rhs)));
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class Key, class T, class Hash = boost::hash<Key>,
+        class KeyEqual = std::equal_to<Key> >
+      using unordered_node_map =
+        boost::unordered::unordered_node_map<Key, T, Hash, KeyEqual,
+          std::pmr::polymorphic_allocator<std::pair<const Key, T> > >;
+    } // namespace pmr
+#endif
   } // namespace unordered
 
   using boost::unordered::unordered_node_map;

data/src/cxx_supportlib/vendor-modified/boost/unordered/unordered_node_set.hpp

@@ -105,6 +105,10 @@ namespace boost {
       using insert_return_type =
         detail::foa::insert_return_type<iterator, node_type>;
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      using stats = typename table_type::stats;
+#endif
+
       unordered_node_set() : unordered_node_set(0) {}
 
       explicit unordered_node_set(size_type n, hasher const& h = hasher(),
@@ -563,6 +567,14 @@ namespace boost {
 
       void reserve(size_type n) { table_.reserve(n); }
 
+#if defined(BOOST_UNORDERED_ENABLE_STATS)
+      /// Stats
+      ///
+      stats get_stats() const { return table_.get_stats(); }
+
+      void reset_stats() noexcept { table_.reset_stats(); }
+#endif
+
       /// Observers
       ///
 

data/src/cxx_supportlib/vendor-modified/boost/unordered/unordered_node_set_fwd.hpp

@@ -1,5 +1,6 @@
 
 // Copyright (C) 2023 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -15,6 +16,10 @@
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
     template <class Key, class Hash = boost::hash<Key>,
@@ -36,6 +41,15 @@ namespace boost {
     void swap(unordered_node_set<Key, Hash, KeyEqual, Allocator>& lhs,
       unordered_node_set<Key, Hash, KeyEqual, Allocator>& rhs)
       noexcept(noexcept(lhs.swap(rhs)));
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class Key, class Hash = boost::hash<Key>,
+        class KeyEqual = std::equal_to<Key> >
+      using unordered_node_set = boost::unordered::unordered_node_set<Key, Hash,
+        KeyEqual, std::pmr::polymorphic_allocator<Key> >;
+    } // namespace pmr
+#endif
   } // namespace unordered
 
   using boost::unordered::unordered_node_set;

data/src/cxx_supportlib/vendor-modified/boost/unordered/unordered_set_fwd.hpp

@@ -1,6 +1,7 @@
 
 // Copyright (C) 2008-2011 Daniel James.
 // Copyright (C) 2022 Christian Mazakas
+// Copyright (C) 2024 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -16,6 +17,10 @@
 #include <functional>
 #include <memory>
 
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+#include <memory_resource>
+#endif
+
 namespace boost {
   namespace unordered {
     template <class T, class H = boost::hash<T>, class P = std::equal_to<T>,
@@ -56,6 +61,18 @@ namespace boost {
 
     template <class N, class T, class A> class node_handle_set;
     template <class Iter, class NodeType> struct insert_return_type_set;
+
+#ifndef BOOST_NO_CXX17_HDR_MEMORY_RESOURCE
+    namespace pmr {
+      template <class T, class H = boost::hash<T>, class P = std::equal_to<T> >
+      using unordered_set = boost::unordered::unordered_set<T, H, P,
+        std::pmr::polymorphic_allocator<T> >;
+
+      template <class T, class H = boost::hash<T>, class P = std::equal_to<T> >
+      using unordered_multiset = boost::unordered::unordered_multiset<T, H, P,
+        std::pmr::polymorphic_allocator<T> >;
+    } // namespace pmr
+#endif
   } // namespace unordered
 
   using boost::unordered::unordered_multiset;

data/src/cxx_supportlib/vendor-modified/boost/utility/detail/minstd_rand.hpp

@@ -11,48 +11,6 @@
 // An implementation of minstd_rand that does not require
 // the Random library
 
-#include <boost/cstdint.hpp>
-
-namespace boost
-{
-namespace detail
-{
-
-class minstd_rand
-{
-private:
-
-    boost::uint_least32_t x_;
-
-    enum { a = 48271, m = 2147483647 };
-
-public:
-
-    minstd_rand(): x_( 1 )
-    {
-    }
-
-    explicit minstd_rand( boost::uint_least32_t x ): x_( x % m )
-    {
-        if( x_ == 0 )
-        {
-            x_ = 1;
-        }
-    }
-
-    boost::uint_least32_t operator()()
-    {
-        boost::uint_least64_t y = x_;
-
-        y = ( a * y ) % m;
-
-        x_ = static_cast<boost::uint_least32_t>( y );
-
-        return x_;
-    }
-};
-
-} // namespace detail
-} // namespace boost
+#include <boost/core/detail/minstd_rand.hpp>
 
 #endif // #ifndef BOOST_UTILITY_DETAIL_MINSTD_RAND_HPP_INCLUDED

data/src/cxx_supportlib/vendor-modified/boost/version.hpp

@@ -19,7 +19,7 @@
 //  BOOST_VERSION / 100 % 1000 is the minor version
 //  BOOST_VERSION / 100000 is the major version
 
-#define BOOST_VERSION 108500
+#define BOOST_VERSION 108600
 
 //
 //  BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
@@ -27,6 +27,6 @@
 //  number, y is the minor version number, and z is the patch level if not 0.
 //  This is used by <config/auto_link.hpp> to select which library version to link to.
 
-#define BOOST_LIB_VERSION "1_85"
+#define BOOST_LIB_VERSION "1_86"
 
 #endif

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

data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c

@@ -51,6 +51,8 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->environment.data = NULL;
     conf->environment.len  = 0;
     conf->friendly_error_pages = NGX_CONF_UNSET;
+    conf->custom_error_page.data = NULL;
+    conf->custom_error_page.len  = 0;
     conf->min_instances = NGX_CONF_UNSET_UINT;
     conf->start_timeout = NGX_CONF_UNSET_UINT;
     conf->user.data = NULL;
@@ -128,6 +130,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->friendly_error_pages_source_file.len = 0;
     conf->friendly_error_pages_source_line = 0;
     conf->friendly_error_pages_explicitly_set = 0;
+    conf->custom_error_page_source_file.data = NULL;
+    conf->custom_error_page_source_file.len = 0;
+    conf->custom_error_page_source_line = 0;
+    conf->custom_error_page_explicitly_set = 0;
     conf->min_instances_source_file.data = NULL;
     conf->min_instances_source_file.len = 0;
     conf->min_instances_source_line = 0;

data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c

@@ -86,6 +86,12 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
             : sizeof("f\r\n") - 1;
     }
 
+    if (conf->autogenerated.custom_error_page.data != NULL) {
+        len += sizeof("!~PASSENGER_CUSTOM_ERROR_PAGE: ") - 1;
+        len += conf->autogenerated.custom_error_page.len;
+        len += sizeof("\r\n") - 1;
+    }
+
     if (conf->autogenerated.min_instances != NGX_CONF_UNSET_UINT) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
@@ -342,6 +348,15 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         }
     }
 
+    if (conf->autogenerated.custom_error_page.data != NULL) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_CUSTOM_ERROR_PAGE: ",
+            sizeof("!~PASSENGER_CUSTOM_ERROR_PAGE: ") - 1);
+        pos = ngx_copy(pos,
+            conf->autogenerated.custom_error_page.data,
+            conf->autogenerated.custom_error_page.len);
+        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+    }
     if (conf->autogenerated.min_instances != NGX_CONF_UNSET_UINT) {
         pos = ngx_copy(pos,
             "!~PASSENGER_MIN_PROCESSES: ",

data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c

@@ -129,6 +129,20 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         psg_json_value_set_bool(hierarchy_member, "value",
             plcf->autogenerated.friendly_error_pages);
     }
+    if (plcf->autogenerated.custom_error_page_explicitly_set) {
+        find_or_create_manifest_app_and_loc_options_containers(ctx,
+            plcf, cscf, clcf, &app_options_container, &loc_options_container);
+        option_container = find_or_create_manifest_option_container(ctx,
+            app_options_container,
+            "passenger_custom_error_page",
+            sizeof("passenger_custom_error_page") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.custom_error_page_source_file,
+            plcf->autogenerated.custom_error_page_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.custom_error_page.data,
+            plcf->autogenerated.custom_error_page.len);
+    }
     if (plcf->autogenerated.min_instances_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);

data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c

@@ -61,6 +61,9 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_value(conf->friendly_error_pages,
         prev->friendly_error_pages,
         NGX_CONF_UNSET);
+    ngx_conf_merge_str_value(conf->custom_error_page,
+        prev->custom_error_page,
+        NULL);
     ngx_conf_merge_uint_value(conf->min_instances,
         prev->min_instances,
         1);

data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h

@@ -67,6 +67,7 @@ typedef struct {
     ngx_str_t app_root;
     ngx_str_t app_start_command;
     ngx_str_t app_type;
+    ngx_str_t custom_error_page;
     ngx_str_t direct_instance_request_address;
     ngx_str_t document_root;
     ngx_str_t environment;
@@ -92,6 +93,7 @@ typedef struct {
     ngx_str_t app_type_source_file;
     ngx_str_t base_uris_source_file;
     ngx_str_t buffer_upload_source_file;
+    ngx_str_t custom_error_page_source_file;
     ngx_str_t debugger_source_file;
     ngx_str_t direct_instance_request_address_source_file;
     ngx_str_t document_root_source_file;
@@ -147,6 +149,7 @@ typedef struct {
     ngx_uint_t app_type_source_line;
     ngx_uint_t base_uris_source_line;
     ngx_uint_t buffer_upload_source_line;
+    ngx_uint_t custom_error_page_source_line;
     ngx_uint_t debugger_source_line;
     ngx_uint_t direct_instance_request_address_source_line;
     ngx_uint_t document_root_source_line;
@@ -202,6 +205,7 @@ typedef struct {
     ngx_int_t app_type_explicitly_set;
     ngx_int_t base_uris_explicitly_set;
     ngx_int_t buffer_upload_explicitly_set;
+    ngx_int_t custom_error_page_explicitly_set;
     ngx_int_t debugger_explicitly_set;
     ngx_int_t direct_instance_request_address_explicitly_set;
     ngx_int_t document_root_explicitly_set;

data/src/ruby_native_extension/passenger_native_support.c

@@ -993,6 +993,7 @@ Init_passenger_native_support() {
 			fs_watcher_wait_for_change, 0);
 		rb_define_method(cFileSystemWatcher, "close",
 			fs_watcher_close, 0);
+		rb_undef_alloc_func(cFileSystemWatcher);
 	#endif
 
 	/* The maximum length of a Unix socket path, including terminating null. */

data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb

@@ -462,6 +462,11 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :dynamic_default => 'On if PassengerAppEnv is development, off otherwise',
     :desc      => 'Whether to display friendly error pages when something goes wrong.'
   },
+  {
+    :name      => 'PassengerCustomErrorPage',
+    :type      => :string,
+    :desc      => 'Path to html file to use for Passenger generated error pages.'
+  },
   {
     :name      => 'PassengerRestartDir',
     :type      => :string,

data/src/ruby_supportlib/phusion_passenger/config/compile_nginx_engine_command.rb

@@ -39,7 +39,8 @@ module PhusionPassenger
           :colorize => :auto,
           :force_tip => true,
           :connect_timeout => 30,
-          :idle_timeout => 30
+          :idle_timeout => 30,
+          :address_sanitizer => false,
         }
         parse_options
         initialize_objects
@@ -70,7 +71,7 @@ module PhusionPassenger
           opts.on("--nginx-tarball PATH", String, "Use the given Nginx tarball instead of#{nl}" +
             "downloading it. You MUST also specify the#{nl}" +
             "Nginx version with --nginx-version") do |val|
-            options[:nginx_tarball] = val
+            options[:nginx_tarball] = File.absolute_path(val)
           end
           opts.on("-f", "--force", "Skip sanity checks") do
             options[:force] = true
@@ -88,6 +89,9 @@ module PhusionPassenger
           opts.on("--idle-timeout SECONDS", Integer, "The maximum idle read time. Default: 30") do |val|
             options[:idle_timeout] = val
           end
+          opts.on("--address-sanitizer", "Compile with AddressSanitizer support") do
+            options[:address_sanitizer] = true
+          end
           opts.on("-h", "--help", "Show this help") do
             options[:help] = true
           end

data/src/ruby_supportlib/phusion_passenger/config/install_standalone_runtime_command.rb

@@ -272,11 +272,21 @@ module PhusionPassenger
             args << "--nginx-tarball"
             args << @options[:nginx_tarball]
           end
+          # The agent and the support libraries are compiled through Rake, which
+          # already supports $USE_ASAN, so it makes sense to use that environment
+          # variable here as well rather than introducing a CLI flag.
+          if boolean_option('USE_ASAN')
+            args << "--address-sanitizer"
+          end
           CompileNginxEngineCommand.new(args).run
         else
           abort "No precompiled Nginx engine could be downloaded. Refusing to compile because --no-compile is given."
         end
       end
+
+      def boolean_option(env_name)
+        ["true", "on", "yes", "1"].include?(ENV[env_name])
+      end
     end
 
   end # module Config

data/src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb

@@ -44,11 +44,19 @@ module PhusionPassenger
     class NginxEngineCompiler < AbstractInstaller
       include InstallationUtils
 
-      def self.configure_script_options
-        extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags} #{PlatformInfo.pcre_extra_cflags}".strip
+      def self.configure_script_options(address_sanitizer: false)
+        extra_cflags = [
+          "-Wno-error",
+          PlatformInfo.openssl_extra_cflags,
+          PlatformInfo.pcre_extra_cflags,
+        ].compact.join(" ").strip
         result = "--with-cc-opt=#{Shellwords.escape extra_cflags} "
 
-        extra_ldflags = "#{PlatformInfo.openssl_extra_ldflags} #{PlatformInfo.pcre_extra_ldflags}".strip
+        extra_ldflags = [
+          PlatformInfo.openssl_extra_ldflags,
+          PlatformInfo.pcre_extra_ldflags,
+          address_sanitizer ? PlatformInfo.address_sanitizer_flags : nil,
+        ].compact.join(" ").strip
         if !extra_ldflags.empty?
           result << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
         end
@@ -339,7 +347,7 @@ module PhusionPassenger
         # work around the problem by configure Nginx with prefix
         # /tmp.
         command << "#{shell} ./configure --prefix=/tmp " +
-          "#{self.class.configure_script_options} " +
+          "#{self.class.configure_script_options(address_sanitizer: @address_sanitizer)} " +
           "--add-module=#{Shellwords.escape PhusionPassenger.nginx_module_source_dir}"
         run_command_yield_activity(command) do
           yield

data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb

@@ -403,6 +403,11 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :flag,
     :dynamic_default => 'On if passenger_app_env is development, off otherwise'
   },
+  {
+    :name     => 'passenger_custom_error_page',
+    :scope    => :application,
+    :type     => :string
+  },
   {
     :name     => 'passenger_min_instances',
     :scope    => :application,

data/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb

@@ -142,8 +142,6 @@ module PhusionPassenger
     private_class_method :cc_or_cxx_supports_feliminate_unused_debug?
 
     def self.cc_or_cxx_supports_blocks?(language)
-      ext = detect_language_extension(language)
-      compiler_type_name = detect_compiler_type_name(language)
       command = create_compiler_command(language,"-E -dM",'- </dev/null')
       result = `#{command}`
       return result.include? "__BLOCKS__"
@@ -360,6 +358,13 @@ module PhusionPassenger
     end
     memoize :cc_supports_fno_limit_debug_info_flag?
 
+    def self.cc_supports_fno_optimize_sibling_calls_flag?
+      try_compile_with_warning_flag(
+        "Checking for C compiler '-fno-optimize-sibling-calls' support",
+        :c, '', '-fno-optimize-sibling-calls')
+    end
+    memoize :cc_supports_fno_optimize_sibling_calls_flag?
+
     def self.cxx_supports_visibility_flag?
       return false if os_name_simple == "aix"
       return try_compile("Checking for C++ compiler '-fvisibility' support",
@@ -430,6 +435,13 @@ module PhusionPassenger
     end
     memoize :cxx_supports_fno_limit_debug_info_flag?
 
+    def self.cxx_supports_fno_optimize_sibling_calls_flag?
+      try_compile_with_warning_flag(
+        "Checking for C++ compiler '-fno-optimize-sibling-calls' support",
+        :cxx, '', '-fno-optimize-sibling-calls')
+    end
+    memoize :cxx_supports_fno_optimize_sibling_calls_flag?
+
     def self.cc_supports_no_tls_direct_seg_refs_option?
       return try_compile("Checking for C compiler '-mno-tls-direct-seg-refs' support",
         :c, '', '-mno-tls-direct-seg-refs')
@@ -493,10 +505,10 @@ module PhusionPassenger
     end
     memoize :cxx_visibility_flag_generates_warnings?, true
 
-    def self.address_sanitizer_flag
+    def self.address_sanitizer_flags
       if cc_is_clang?
         if `#{cc} --help` =~ /-fsanitize=/
-          "-fsanitize=address"
+          "-fsanitize=address -fsanitize-address-use-after-return=always -fsanitize-address-use-after-scope"
         else
           "-faddress-sanitizer"
         end
@@ -504,7 +516,14 @@ module PhusionPassenger
         nil
       end
     end
-    memoize :address_sanitizer_flag
+
+    def self.undefined_behavior_sanitizer_flags
+      if cc_is_clang?
+        "-fsanitize=undefined"
+      else
+        nil
+      end
+    end
 
     def self.cxx_11_flag
       # C++11 support on FreeBSD 10.0 + Clang seems to be bugged.
@@ -603,6 +622,14 @@ module PhusionPassenger
       end
     end
 
+    def self.precompiled_header_extension
+      if cxx_is_gcc?
+        'gch'
+      else
+        'pch'
+      end
+    end
+
 
     def self.make
       return string_env('MAKE', find_command('make'))

data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/gems.rb

@@ -13,3 +13,13 @@ define 'rack' do
   end
   gem_install 'rack'
 end
+
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
+define 'rackup' do
+  name 'rackup'
+  define_checker do
+    check_for_ruby_library('rackup')
+  end
+  gem_install 'rackup'
+end
+end

data/src/ruby_supportlib/phusion_passenger/rack/handler.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2024 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding 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
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+module PhusionPassenger
+  module Rack
+    module Handler
+      def run(app, options = {})
+        result = system(ruby_executable, '-S', find_passenger_standalone,
+                        'start', *build_args(options))
+        if !result
+          raise "Error starting Passenger"
+        end
+      end
+
+      def environment
+        ENV['RAILS_ENV'] || 'development'
+      end
+
+      def to_s
+        'Passenger application server'
+      end
+
+      private
+      def build_args(options)
+        args = ['-e', environment]
+        args << '-p' << options[:Port].to_s if options[:Port]
+        args << '-a' << options[:Host].to_s if options[:Host]
+        args << '-R' << options[:config].to_s if options[:config]
+        args
+      end
+
+      def rb_config
+        if defined?(::RbConfig)
+          ::RbConfig::CONFIG
+        else
+          ::Config::CONFIG
+        end
+      end
+
+      def ruby_executable
+        @ruby_executable ||= rb_config['bindir'] + '/' +
+                             rb_config['RUBY_INSTALL_NAME'] + rb_config['EXEEXT']
+      end
+
+      def find_passenger_standalone
+        ::File.join(::PhusionPassenger.bin_dir, 'passenger')
+      end
+    end
+  end
+end