passenger 6.0.19 → 6.0.21

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

@@ -12,8 +12,7 @@
 #pragma once
 #endif
 
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/unordered/detail/fwd.hpp>
+#include <boost/container_hash/hash_fwd.hpp>
 #include <functional>
 #include <memory>
 
@@ -30,9 +29,8 @@ namespace boost {
     inline bool operator!=(
       unordered_set<T, H, P, A> const&, unordered_set<T, H, P, A> const&);
     template <class T, class H, class P, class A>
-    inline void swap(
-      unordered_set<T, H, P, A>& m1, unordered_set<T, H, P, A>& m2)
-      BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(m1.swap(m2)));
+    inline void swap(unordered_set<T, H, P, A>& m1,
+      unordered_set<T, H, P, A>& m2) noexcept(noexcept(m1.swap(m2)));
 
     template <class K, class H, class P, class A, class Predicate>
     typename unordered_set<K, H, P, A>::size_type erase_if(
@@ -49,9 +47,8 @@ namespace boost {
     inline bool operator!=(unordered_multiset<T, H, P, A> const&,
       unordered_multiset<T, H, P, A> const&);
     template <class T, class H, class P, class A>
-    inline void swap(
-      unordered_multiset<T, H, P, A>& m1, unordered_multiset<T, H, P, A>& m2)
-      BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(m1.swap(m2)));
+    inline void swap(unordered_multiset<T, H, P, A>& m1,
+      unordered_multiset<T, H, P, A>& m2) noexcept(noexcept(m1.swap(m2)));
 
     template <class K, class H, class P, class A, class Predicate>
     typename unordered_multiset<K, H, P, A>::size_type erase_if(
@@ -59,13 +56,10 @@ namespace boost {
 
     template <class N, class T, class A> class node_handle_set;
     template <class Iter, class NodeType> struct insert_return_type_set;
-  }
+  } // namespace unordered
 
-  using boost::unordered::unordered_set;
   using boost::unordered::unordered_multiset;
-  using boost::unordered::swap;
-  using boost::unordered::operator==;
-  using boost::unordered::operator!=;
-}
+  using boost::unordered::unordered_set;
+} // namespace boost
 
 #endif

data/src/cxx_supportlib/vendor-modified/boost/utility/swap.hpp

@@ -10,8 +10,11 @@
 #define BOOST_UTILITY_SWAP_HPP
 
 // The header file at this path is deprecated;
-// use boost/core/swap.hpp instead.
+// use boost/core/invoke_swap.hpp instead.
 
+#include <boost/config/header_deprecated.hpp>
 #include <boost/core/swap.hpp>
 
+BOOST_HEADER_DEPRECATED("boost/core/invoke_swap.hpp")
+
 #endif

data/src/cxx_supportlib/vendor-modified/boost/utility/value_init.hpp

@@ -23,7 +23,7 @@
 // contains. More details on these issues are at libs/utility/value_init.htm
 
 #include <boost/config.hpp> // For BOOST_NO_COMPLETE_VALUE_INITIALIZATION.
-#include <boost/core/swap.hpp>
+#include <boost/core/invoke_swap.hpp>
 #include <cstring>
 #include <cstddef>
 
@@ -32,7 +32,7 @@
 // It is safe to ignore the following warning from MSVC 7.1 or higher:
 // "warning C4351: new behavior: elements of array will be default initialized"
 #pragma warning(disable: 4351)
-// It is safe to ignore the following MSVC warning, which may pop up when T is 
+// It is safe to ignore the following MSVC warning, which may pop up when T is
 // a const type: "warning C4512: assignment operator could not be generated".
 #pragma warning(disable: 4512)
 #endif
@@ -40,8 +40,8 @@
 #ifndef BOOST_UTILITY_DOCS
 
 #ifdef BOOST_NO_COMPLETE_VALUE_INITIALIZATION
-  // Implementation detail: The macro BOOST_DETAIL_VALUE_INIT_WORKAROUND_SUGGESTED 
-  // suggests that a workaround should be applied, because of compiler issues 
+  // Implementation detail: The macro BOOST_DETAIL_VALUE_INIT_WORKAROUND_SUGGESTED
+  // suggests that a workaround should be applied, because of compiler issues
   // regarding value-initialization.
   #define BOOST_DETAIL_VALUE_INIT_WORKAROUND_SUGGESTED
 #endif
@@ -117,7 +117,7 @@ class initialized
     BOOST_GPU_ENABLED
     void swap(initialized & arg)
     {
-      ::boost::swap( this->data(), arg.data() );
+      ::boost::core::invoke_swap( this->data(), arg.data() );
     }
 
     BOOST_GPU_ENABLED
@@ -164,13 +164,13 @@ class value_initialized
     initialized<T> m_data;
 
   public :
-    
+
     BOOST_GPU_ENABLED
     value_initialized()
     :
     m_data()
     { }
-    
+
     BOOST_GPU_ENABLED
     T const & data() const
     {
@@ -228,7 +228,7 @@ void swap ( value_initialized<T> & lhs, value_initialized<T> & rhs )
 class initialized_value_t
 {
   public :
-    
+
     template <class T> BOOST_GPU_ENABLED operator T() const
     {
       return initialized<T>().data();

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 108100
+#define BOOST_VERSION 108500
 
 //
 //  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_81"
+#define BOOST_LIB_VERSION "1_85"
 
 #endif

data/src/cxx_supportlib/vendor-modified/jsoncpp/jsoncpp.cpp

@@ -1823,22 +1823,15 @@ bool OurReader::decodeDouble(Token& token, Value& decoded) {
   }
   size_t const ulength = static_cast<size_t>(length);
 
-  // Avoid using a string constant for the format control string given to
-  // sscanf, as this can cause hard to debug crashes on OS X. See here for more
-  // info:
-  //
-  //     http://developer.apple.com/library/mac/#DOCUMENTATION/DeveloperTools/gcc-4.0.1/gcc/Incompatibilities.html
-  char format[] = "%lf";
-
   if (length <= bufferSize) {
     Char buffer[bufferSize + 1];
     memcpy(buffer, token.start_, ulength);
     buffer[length] = 0;
     fixNumericLocaleInput(buffer, buffer + length);
-    count = sscanf(buffer, format, &value);
+    count = sscanf(buffer, "%lf", &value);
   } else {
     JSONCPP_STRING buffer(token.start_, token.end_);
-    count = sscanf(buffer.c_str(), format, &value);
+    count = sscanf(buffer.c_str(), "%lf", &value);
   }
 
   if (count != 1)

data/src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/frame.hpp

@@ -120,17 +120,6 @@ namespace opcode {
                (v >= control_rsvb && v <= control_rsvf);
     }
 
-    /// Check if an opcode is invalid
-    /**
-     * Invalid opcodes are negative or require greater than 4 bits to store.
-     *
-     * @param v The opcode to test.
-     * @return Whether or not the opcode is invalid.
-     */
-    inline bool invalid(value v) {
-        return (v > 0xF || v < 0);
-    }
-
     /// Check if an opcode is for a control frame
     /**
      * @param v The opcode to test.

data/src/cxx_supportlib/vendor-modified/websocketpp/websocketpp/processors/hybi13.hpp

@@ -88,11 +88,11 @@ public:
     err_str_pair negotiate_extensions(request_type const & request) {
         return negotiate_extensions_helper(request);
     }
-    
+
     err_str_pair negotiate_extensions(response_type const & response) {
         return negotiate_extensions_helper(response);
     }
-    
+
     /// Extension negotiation helper function
     /**
      * This exists mostly because the code for requests and responses is
@@ -137,11 +137,11 @@ public:
 
                 // if we have already successfully negotiated this extension
                 // then skip any other requests to negotiate the same one
-                // with different parameters 
+                // with different parameters
                 if (m_permessage_deflate.is_enabled()) {
                     continue;
                 }
-                
+
                 // attempt to negotiate this offer
                 neg_ret = m_permessage_deflate.negotiate(it->second);
 
@@ -158,8 +158,8 @@ public:
                 lib::error_code ec = m_permessage_deflate.init(base::m_server);
 
                 if (ec) {
-                    // Negotiation succeeded but initialization failed this is 
-                    // an error that should stop negotiation of permessage 
+                    // Negotiation succeeded but initialization failed this is
+                    // an error that should stop negotiation of permessage
                     // deflate. Return the reason for the init failure
 
                     ret.first = ec;
@@ -174,7 +174,7 @@ public:
             }
         }
 
-        // support for future extensions would go here. Should check the value of 
+        // support for future extensions would go here. Should check the value of
         // ret.first before continuing. Might need to consider whether failure of
         // negotiation of an earlier extension should stop negotiation of subsequent
         // ones
@@ -206,7 +206,7 @@ public:
      * generic struct if other user input parameters to the processed handshake
      * are found.
      */
-    lib::error_code process_handshake(request_type const & request, 
+    lib::error_code process_handshake(request_type const & request,
         std::string const & subprotocol, response_type & response) const
     {
         std::string server_key = request.get_header("Sec-WebSocket-Key");
@@ -440,12 +440,12 @@ public:
                             ec = make_error_code(error::message_too_big);
                             break;
                         }
-                        
+
                         m_data_msg = msg_metadata(
                             m_msg_manager->get_message(op,m_bytes_needed),
                             frame::get_masking_key(m_basic_header,m_extended_header)
                         );
-                        
+
                         if (m_permessage_deflate.is_enabled()) {
                             m_data_msg.msg_ptr->set_compressed(frame::get_rsv1(m_basic_header));
                         }
@@ -453,12 +453,12 @@ public:
                         // Fetch the underlying payload buffer from the data message we
                         // are writing into.
                         std::string & out = m_data_msg.msg_ptr->get_raw_payload();
-                        
+
                         if (out.size() + m_bytes_needed > base::m_max_message_size) {
                             ec = make_error_code(error::message_too_big);
                             break;
                         }
-                        
+
                         // Each frame starts a new masking key. All other state
                         // remains between frames.
                         m_data_msg.prepared_key = prepare_masking_key(
@@ -467,7 +467,7 @@ public:
                                 m_extended_header
                             )
                         );
-                        
+
                         out.reserve(out.size() + m_bytes_needed);
                     }
                     m_current_msg = &m_data_msg;
@@ -878,12 +878,6 @@ protected:
             return make_error_code(error::invalid_opcode);
         }
 
-        // Check for invalid opcodes
-        // TODO: unit tests for this?
-        if (frame::opcode::invalid(op)) {
-            return make_error_code(error::invalid_opcode);
-        }
-
         // Check for fragmented control message
         if (frame::opcode::is_control(op) && !frame::get_fin(h)) {
             return make_error_code(error::fragmented_control);
@@ -1009,7 +1003,7 @@ protected:
             out->set_header(frame::prepare_header(h,e));
             std::copy(payload.begin(),payload.end(),o.begin());
         }
-    
+
         out->set_opcode(op);
         out->set_prepared(true);
 

data/src/helper-scripts/wsgi-loader.py

@@ -25,7 +25,7 @@
 
 import sys, os, threading, signal, traceback, socket, select, struct, logging, errno
 import tempfile, json, time
-if sys.version_info[0] >= 3:
+if sys.version_info[0] >= 3 and sys.version_info[1] >= 5:
 	from importlib import util
 else:
 	import imp
@@ -80,7 +80,7 @@ def load_app():
 
 	sys.path.insert(0, os.getcwd())
 	startup_file = options.get('startup_file', 'passenger_wsgi.py')
-	if sys.version_info[0] >= 3:
+	if sys.version_info[0] >= 3 and sys.version_info[1] >= 5:
 		spec = util.spec_from_file_location("passenger_wsgi", startup_file)
 		assert spec is not None
 		app_module = util.module_from_spec(spec)

data/src/nginx_module/ConfigGeneral/ManifestGeneration.c

@@ -248,7 +248,7 @@ find_manifest_loc_config_container(manifest_gen_ctx_t *ctx,
         json_location_matcher_type.data = (u_char *) psg_json_value_get_str(
             psg_json_value_get(location_matcher_doc, "type", -1),
             &json_location_matcher_type.len);
-        #if (NGX_PCRE)
+        #if (NGX_PCRE) || (NGX_PCRE2)
             if (clcf->regex != NULL) {
                 if (json_location_matcher_type.len != sizeof("regex") - 1
                     || ngx_memcmp(json_location_matcher_type.data, "regex", sizeof("regex") - 1) != 0)
@@ -319,7 +319,7 @@ create_manifest_loc_config_container(manifest_gen_ctx_t *ctx,
 
     psg_json_value_set_str(location_matcher_doc, "value",
         (const char *) clcf->name.data, clcf->name.len);
-    #if (NGX_PCRE)
+    #if (NGX_PCRE) || (NGX_PCRE2)
         if (clcf->regex != NULL) {
             psg_json_value_set_str(location_matcher_doc, "type",
                 "regex", -1);

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -302,10 +302,9 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'StrIntTools/StrIntUtilsNoStrictAliasing.o',
     :source   => 'StrIntTools/StrIntUtilsNoStrictAliasing.cpp',
     :category => :base,
-    # Compiling with -O3 causes segfaults on RHEL 6
-    :optimize => :heavy,
+    :optimize => :very_heavy,
     # Compiling with SSE2 causes segfaults on Amazon Linux 2
-    :cflags => RbConfig::CONFIG['host_cpu'] == 'x86_64' ? ' -mno-sse2' : '',
+    :cflags => RbConfig::CONFIG['host_cpu'] == 'x86_64' && RbConfig::CONFIG['host_os'] == 'linux-gnu' ? ' -mno-sse2' : '',
     :strict_aliasing => false
   define_component 'IOTools/IOUtils.o',
     :source   => 'IOTools/IOUtils.cpp',
@@ -341,8 +340,20 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
     :source   => 'MemoryKit/palloc.cpp',
     :category => :other,
     :optimize => true
-  define_component 'ServerKit/http_parser.o',
-    :source   => 'ServerKit/http_parser.cpp',
+  define_component 'ServerKit/url_parser.o',
+    :source   => 'ServerKit/url_parser.c',
+    :category => :other,
+    :optimize => :very_heavy
+  define_component 'ServerKit/llhttp.o',
+    :source   => 'ServerKit/llhttp.c',
+    :category => :other,
+    :optimize => :very_heavy
+  define_component 'ServerKit/llhttp_http.o',
+    :source   => 'ServerKit/llhttp_http.c',
+    :category => :other,
+    :optimize => :very_heavy
+  define_component 'ServerKit/llhttp_api.o',
+    :source   => 'ServerKit/llhttp_api.c',
     :category => :other,
     :optimize => :very_heavy
   define_component 'ServerKit/Implementation.o',

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

@@ -81,7 +81,7 @@ module PhusionPassenger
           'rake',
           'openssl-dev',
           'zlib-dev',
-          'pcre-dev'
+          'pcre2-dev'
         ].compact
         return [specs, ids]
       end

data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb

@@ -315,7 +315,9 @@ module PhusionPassenger
       # database connection handles.
       if forked
         if defined?(ActiveRecord::Base)
-          if ActiveRecord::Base.respond_to?(:clear_all_connections!)
+          if ActiveRecord::Base.respond_to?(:connection_handler) && !ActiveRecord::Base.connection_handler.nil? && ActiveRecord::Base.connection_handler.respond_to?(:clear_all_connections!)
+            ActiveRecord::Base.connection_handler.clear_all_connections!
+          elsif ActiveRecord::Base.respond_to?(:clear_all_connections!)
             ActiveRecord::Base.clear_all_connections!
           elsif ActiveRecord::Base.respond_to?(:clear_active_connections!)
             ActiveRecord::Base.clear_active_connections!

data/src/ruby_supportlib/phusion_passenger/native_support.rb

@@ -427,14 +427,17 @@ module PhusionPassenger
         require(name_or_filename)
         return defined?(PhusionPassenger::NativeSupport)
       rescue LoadError => e
-        s = e.to_s
-        s = s.encode("US-ASCII", :invalid => :replace) if s.respond_to?(:encode)
-        if s =~ /dlopen/
-          # Print dlopen failures. We're not interested in any other
-          # kinds of failures, such as file-not-found.
-          puts s.gsub(/^/, "     ")
+        begin
+          s = e.to_s
+          s = s.encode("US-ASCII", :invalid => :replace) if s.respond_to?(:encode)
+          if s =~ /dlopen/
+            # Print dlopen failures. We're not interested in any other
+            # kinds of failures, such as file-not-found.
+            puts s.gsub(/^/, "     ")
+          end
+          return false
+        rescue EncodingError
         end
-        return false
       end
     end
   end

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

@@ -673,7 +673,7 @@ module PhusionPassenger
         # macOS >= 10.12 Sierra no longer includes apr-config
         # so we'll use a hardcoded path here.
         if os_name_simple == 'macosx' && os_version >= '10.12' && httpd == '/usr/sbin/httpd'
-          apxs2_flags << ' -I/usr/include/apr-1'
+          apxs2_flags << " -I#{`xcrun --show-sdk-path`.strip}/usr/include/apr-1"
         end
 
         apxs2_flags.strip!
@@ -692,7 +692,7 @@ module PhusionPassenger
         #   /usr/sbin/httpd (for architecture ppc64):       Mach-O 64-bit executable ppc64
         #   /usr/sbin/httpd (for architecture i386):        Mach-O executable i386
         #   /usr/sbin/httpd (for architecture x86_64):      Mach-O 64-bit executable x86_64
-        #   /usr/sbin/httpd (for architecture arm64e):	    Mach-O 64-bit executable arm64e
+        #   /usr/sbin/httpd (for architecture arm64e):	    Mach-O 64-bit executable arm64
         #
         # But on some machines, it may output just:
         #
@@ -701,12 +701,14 @@ module PhusionPassenger
         # (http://code.google.com/p/phusion-passenger/issues/detail?id=236)
         output = `file "#{httpd}"`.strip
         if output =~ /Mach-O fat file/ && output !~ /for architecture/
-          architectures = ["i386", "ppc", "x86_64", "ppc64", "arm64e"]
+          architectures = ["i386", "ppc", "x86_64", "ppc64", "arm64"]
         else
           architectures = []
           output.split("\n").grep(/for architecture/).each do |line|
             line =~ /for architecture (.*?)\)/
-            architectures << $1
+            arch = $1
+            arch = "arm64" if arch.start_with?("arm64")
+            architectures << arch
           end
         end
         # The compiler may not support all architectures in the binary.
@@ -838,9 +840,7 @@ module PhusionPassenger
             # files. On Hongli's and Camden's systems it's inside the Xcode directory,
             # while on https://github.com/phusion/passenger/issues/1986 it's inside
             # /Library/Developer/CommandLineTools.
-            xcode_prefix = `/usr/bin/xcode-select -p`.strip
-            ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1 " \
-             "-I#{xcode_prefix}/SDKs/MacOSX.sdk/usr/include/apr-1",
+            ["-I#{`xcrun --show-sdk-path`.strip}/usr/include/apr-1",
              '-lapr-1']
           else
             ['-I/usr/include/apr-1', '-lapr-1']
@@ -888,9 +888,7 @@ module PhusionPassenger
           if os_version >= '10.13'
             # On macOS >= 10.13 High Sierra /usr/include no longer
             # exists.
-            xcode_prefix = `/usr/bin/xcode-select -p`.strip
-            ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1 " \
-             "-I#{xcode_prefix}/SDKs/MacOSX.sdk/usr/include/apr-1",
+            ["-I#{`xcrun --show-sdk-path`.strip}/usr/include/apr-1",
              '-laprutil-1']
           else
             ['-I/usr/include/apr-1', '-laprutil-1']

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

@@ -395,6 +395,20 @@ module PhusionPassenger
     end
     memoize :cxx_supports_wno_missing_field_initializers_flag?, true
 
+    def self.cc_supports_wno_unknown_pragmas_flag?
+      return try_compile_with_warning_flag(
+        "Checking for C compiler '-Wno-unknown-pragmas' support",
+        :c, '', '-Wno-unknown-pragmas')
+    end
+    memoize :cc_supports_wno_unknown_pragmas_flag?, true
+
+    def self.cxx_supports_wno_unknown_pragmas_flag?
+      return try_compile_with_warning_flag(
+        "Checking for C++ compiler '-Wno-unknown-pragmas' support",
+        :cxx, '', '-Wno-unknown-pragmas')
+    end
+    memoize :cxx_supports_wno_unknown_pragmas_flag?, true
+
     def self.cxx_supports_wno_unused_local_typedefs_flag?
       return try_compile_with_warning_flag(
         "Checking for C++ compiler '-Wno-unused-local-typedefs' support",

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

@@ -122,11 +122,14 @@ module PhusionPassenger
         if send("#{cc_or_cxx}_supports_wno_missing_field_initializers_flag?")
           flags << "-Wno-missing-field-initializers"
         end
+        if send("#{cc_or_cxx}_supports_wno_unknown_pragmas_flag?")
+          flags << "-Wno-unknown-pragmas"
+        end
         if requires_no_tls_direct_seg_refs? && send("#{cc_or_cxx}_supports_no_tls_direct_seg_refs_option?")
           flags << "-mno-tls-direct-seg-refs"
         end
         # Work around Clang warnings in ev++.h.
-        if send("#{cc_or_cxx}_is_clang?")
+        if send("#{cc_or_cxx}_is_clang?") && compiler_supports_wno_ambiguous_member_template?
           flags << "-Wno-ambiguous-member-template"
         end
       end

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

@@ -111,21 +111,21 @@ define 'zlib-dev' do
   end
 end
 
-define 'pcre-dev' do
-  name "PCRE development headers"
+define 'pcre2-dev' do
+  name "PCRE2 development headers"
   website "http://www.pcre.org/"
   define_checker do
-    check_for_header('pcre.h', :c,
+    check_for_header('pcre2.h', :c,
       PlatformInfo.pcre_extra_cflags)
   end
 
   on :debian do
-    apt_get_install "libpcre3-dev"
+    apt_get_install "libpcre2-dev"
   end
   on :redhat do
-    yum_install 'pcre-devel'
+    yum_install 'pcre2-devel'
   end
   on :macosx do
-    brew_install "pcre"
+    brew_install "pcre2"
   end
 end

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

@@ -29,30 +29,29 @@ module PhusionPassenger
 
   module PlatformInfo
     def self.pcre_extra_cflags
+      cflags = ""
       if PlatformInfo.os_name_simple == "macosx"
-        if File.exist?("/usr/local/opt/pcre/include")
+        brew_path = "#{`/usr/bin/env -P /usr/local/bin:/opt/homebrew/bin brew --prefix pcre2`.strip}/include"
+        if File.exist?(brew_path)
           # Use the one from Homebrew.
-          "-I/usr/local/opt/pcre/include"
-        elsif File.exist?("/opt/homebrew/opt/pcre/include")
-          # Use the one from Homebrew on Apple Silicon
-          "-I/opt/homebrew/opt/pcre/include"
+          cflags = "-I#{brew_path}"
         else
           # Use the one from Macports.
-          "-I/opt/local/include"
+          cflags = "-I/opt/local/include"
         end
-      else
-        ""
       end
+      return "#{cflags} -DPCRE2_CODE_UNIT_WIDTH=8"
     end
     memoize :pcre_extra_cflags
 
     def self.pcre_extra_ldflags
       if PlatformInfo.os_name_simple == "macosx"
-        if File.exist?("/usr/local/opt/pcre/include")
-          "-L/usr/local/opt/pcre/lib"
-        elsif File.exist?("/opt/homebrew/opt/pcre/include")
-          "-L/opt/homebrew/opt/pcre/include"
+        brew_path = "#{`/usr/bin/env -P /usr/local/bin:/opt/homebrew/bin brew --prefix pcre2`.strip}/lib"
+        if File.exist?(brew_path)
+          # Use the one from Homebrew.
+          "-L#{brew_path}"
         else
+          # Use the one from Macports.
           "-L/opt/local/lib"
         end
       else

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/app.rb

@@ -81,7 +81,7 @@ module CrashWatch
         gdb.debug = options[:debug]
 
         # Ruby sometimes uses SIGVTARLM for thread scheduling.
-        gdb.execute("handle SIGVTALRM noprint pass")
+        gdb.handle_signal("SIGVTALRM")
 
         if gdb.attach(argv[0])
           if options[:dump]

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/gdb_controller.rb

@@ -123,6 +123,10 @@ module CrashWatch
       result !~ /(No such process|Unable to access task|Operation not permitted)/
     end
 
+    def handle_signal(sig)
+      execute("handle SIGVTALRM noprint pass")
+    end
+
     def program_counter
       execute("p/x $pc").gsub(/.* = /, '')
     end

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/lldb_controller.rb

@@ -60,7 +60,7 @@ module CrashWatch
       puts "lldb write #{command_string.inspect}" if @debug
       marker = "\n#{END_OF_RESPONSE_MARKER}\n"
       @in.puts(command_string)
-      @in.puts("script print #{marker.inspect}")
+      @in.puts("script print(#{marker.inspect})")
       done = false
       result = []
       while !done
@@ -134,6 +134,10 @@ module CrashWatch
       result !~ /(unable to attach|cannot attach)/
     end
 
+    def handle_signal(sig)
+      execute("process handle #{sig} noprint pass")
+    end
+
     def program_counter
       execute("p/x $pc").gsub(/.* = /, '')
     end