passenger 6.0.8 → 6.0.20

data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/package.json

@@ -1,12 +1,8 @@
 {
-  "author": {
-    "name": "Felix Geisendörfer",
-    "email": "felix@debuggable.com",
-    "url": "http://debuggable.com/"
-  },
+  "author": "Felix Geisendörfer <felix@debuggable.com> (http://debuggable.com/)",
   "name": "stack-trace",
   "description": "Get v8 stack traces as an array of CallSite objects.",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "homepage": "https://github.com/felixge/node-stack-trace",
   "repository": {
     "type": "git",
@@ -16,18 +12,10 @@
   "engines": {
     "node": "*"
   },
+  "license": "MIT",
   "dependencies": {},
   "devDependencies": {
     "far": "0.0.3",
     "long-stack-traces": "0.1.2"
-  },
-  "readme": "# stack-trace\n\nGet v8 stack traces as an array of CallSite objects.\n\n## Install\n\n``` bash\nnpm install stack-trace\n```\n\n## Usage\n\nThe stack-trace module makes it easy for you to capture the current stack:\n\n``` javascript\nvar stackTrace = require('stack-trace');\nvar trace = stackTrace.get();\n\nrequire('assert').strictEqual(trace[0].getFileName(), __filename);\n```\n\nHowever, sometimes you have already popped the stack you are interested in,\nand all you have left is an `Error` object. This module can help:\n\n``` javascript\nvar stackTrace = require('stack-trace');\nvar err = new Error('something went wrong');\nvar trace = stackTrace.parse(err);\n\nrequire('assert').strictEqual(trace[0].getFileName(), __filename);\n```\n\nPlease note that parsing the `Error#stack` property is not perfect, only\ncertain properties can be retrieved with it as noted in the API docs below.\n\n## Long stack traces\n\nstack-trace works great with [long-stack-traces][], when parsing an `err.stack`\nthat has crossed the event loop boundary, a `CallSite` object returning\n`'----------------------------------------'` for `getFileName()` is created.\nAll other methods of the event loop boundary call site return `null`.\n\n[long-stack-traces]: https://github.com/tlrobinson/long-stack-traces\n\n## API\n\n### stackTrace.get([belowFn])\n\nReturns an array of `CallSite` objects, where element `0` is the current call\nsite.\n\nWhen passing a function on the current stack as the `belowFn` parameter, the\nreturned array will only include `CallSite` objects below this function.\n\n### stackTrace.parse(err)\n\nParses the `err.stack` property of an `Error` object into an array compatible\nwith those returned by `stackTrace.get()`. However, only the following methods\nare implemented on the returned `CallSite` objects.\n\n* getTypeName\n* getFunctionName\n* getMethodName\n* getFileName\n* getLineNumber\n* getColumnNumber\n* isNative\n\nNote: Except `getFunctionName()`, all of the above methods return exactly the\nsame values as you would get from `stackTrace.get()`. `getFunctionName()`\nis sometimes a little different, but still useful.\n\n### CallSite\n\nThe official v8 CallSite object API can be found [here][v8stackapi]. A quick\nexcerpt:\n\n> A CallSite object defines the following methods:\n>\n> * **getThis**: returns the value of this\n> * **getTypeName**: returns the type of this as a string. This is the name of the function stored in the constructor field of this, if available, otherwise the object's [[Class]] internal property.\n> * **getFunction**: returns the current function\n> * **getFunctionName**: returns the name of the current function, typically its name property. If a name property is not available an attempt will be made to try to infer a name from the function's context.\n> * **getMethodName**: returns the name of the property of this or one of its prototypes that holds the current function\n> * **getFileName**: if this function was defined in a script returns the name of the script\n> * **getLineNumber**: if this function was defined in a script returns the current line number\n> * **getColumnNumber**: if this function was defined in a script returns the current column number\n> * **getEvalOrigin**: if this function was created using a call to eval returns a CallSite object representing the location where eval was called\n> * **isToplevel**: is this a toplevel invocation, that is, is this the global object?\n> * **isEval**: does this call take place in code defined by a call to eval?\n> * **isNative**: is this call in native V8 code?\n> * **isConstructor**: is this a constructor call?\n\n[v8stackapi]: http://code.google.com/p/v8/wiki/JavaScriptStackTraceApi\n\n## License\n\nstack-trace is licensed under the MIT license.\n",
-  "readmeFilename": "Readme.md",
-  "bugs": {
-    "url": "https://github.com/felixge/node-stack-trace/issues"
-  },
-  "_id": "stack-trace@0.0.9",
-  "_shasum": "a8f6eaeca90674c333e7c43953f275b451510695",
-  "_from": "stack-trace@0.0.x",
-  "_resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+  }
 }

data/src/nodejs_supportlib/vendor-copy/winston/package.json

@@ -1,42 +1,18 @@
 {
   "name": "winston",
   "description": "A multi-transport async logging library for Node.js",
-  "version": "1.1.2",
-  "author": {
-    "name": "Charlie Robbins",
-    "email": "charlie.robbins@gmail.com"
-  },
+  "version": "2.4.5",
+  "author": "Charlie Robbins <charlie.robbins@gmail.com>",
   "maintainers": [
-    {
-      "name": "indexzero",
-      "email": "charlie.robbins@gmail.com"
-    },
-    {
-      "name": "chjj",
-      "email": "chjjeffrey@gmail.com"
-    },
-    {
-      "name": "jcrugzz",
-      "email": "jcrugzz@gmail.com"
-    },
-    {
-      "name": "pose",
-      "email": "albertopose@gmail.com"
-    },
-    {
-      "name": "v1",
-      "email": "info@3rd-Eden.com"
-    },
-    {
-      "name": "3rdeden",
-      "email": "npm@3rd-Eden.com"
-    }
+    "Jarrett Cruger <jcrugzz@gmail.com>",
+    "Alberto Pose <albertopose@gmail.com>"
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/winstonjs/winston.git"
+    "url": "https://github.com/winstonjs/winston.git"
   },
   "keywords": [
+    "winston",
     "logging",
     "sysadmin",
     "tools"
@@ -47,41 +23,21 @@
     "cycle": "1.0.x",
     "eyes": "0.1.x",
     "isstream": "0.1.x",
-    "pkginfo": "0.3.x",
     "stack-trace": "0.0.x"
   },
   "devDependencies": {
+    "cross-spawn-async": "^2.0.0",
     "hock": "1.x.x",
     "std-mocks": "~1.0.0",
     "vows": "0.7.x"
   },
   "main": "./lib/winston",
   "scripts": {
-    "test": "vows --spec --isolate"
+    "test": "vows --dot-matrix --isolate"
   },
+  "types": "./index.d.ts",
   "engines": {
-    "node": ">= 0.8.0"
-  },
-  "license": "MIT",
-  "gitHead": "2064bfe3b0f3da77c798d248a1609dbc24ff077e",
-  "bugs": {
-    "url": "https://github.com/winstonjs/winston/issues"
-  },
-  "homepage": "https://github.com/winstonjs/winston#readme",
-  "_id": "winston@1.1.2",
-  "_shasum": "68edd769ff79d4f9528cf0e5d80021aade67480c",
-  "_from": "winston@^1.1.0",
-  "_npmVersion": "2.14.5",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "name": "indexzero",
-    "email": "charlie.robbins@gmail.com"
-  },
-  "dist": {
-    "shasum": "68edd769ff79d4f9528cf0e5d80021aade67480c",
-    "tarball": "http://registry.npmjs.org/winston/-/winston-1.1.2.tgz"
+    "node": ">= 0.10.0"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "license": "MIT"
 }

data/src/ruby_native_extension/extconf.rb

@@ -24,7 +24,7 @@
 
 # Apple has a habit of getting their Ruby headers wrong, so if we are building using system ruby we need to patch things up, sierra & mojave both did this.
 # eg https://openradar.appspot.com/46465917
-if RUBY_PLATFORM =~ /darwin/ && !File.exists?(RbConfig::CONFIG["rubyarchhdrdir"])
+if RUBY_PLATFORM =~ /darwin/ && !File.exist?(RbConfig::CONFIG["rubyarchhdrdir"])
   RbConfig::CONFIG["rubyarchhdrdir"].sub!(RUBY_PLATFORM.split('-').last, Dir.entries(File.dirname(RbConfig::CONFIG["rubyarchhdrdir"])).reject{|d|d.start_with?(".","ruby")}.first.split('-').last)
 end
 

data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb

@@ -104,8 +104,9 @@ module PhusionPassenger
         # as the instance registry dir. See https://github.com/phusion/passenger/issues/1475
         #
         # systemd's PrivateTmp feature works like an inverted OSX, apache gets its own
-        # TMPDIR and users use /tmp
-        [string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg",*Dir['/tmp/systemd-private-*-{httpd,nginx}.service-*/tmp']].compact
+        # TMPDIR and users use /tmp, however the path is often too long because socket paths can
+        # only be up to 108 characters long.
+        [string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg",*Dir['/tmp/systemd-private-*-{httpd,nginx,apache2}.service-*/tmp']].compact
       end
 
       def string_env(name)

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

@@ -437,6 +437,12 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :default   => true,
     :desc      => 'Whether to load environment variables from the shell before running the application.'
   },
+  {
+    :name      => 'PassengerPreloadBundler',
+    :type      => :flag,
+    :default   => false,
+    :desc      => 'Whether to tell Ruby to load the bundler gem before running the application.'
+  },
   {
     :name      => 'PassengerSpawnMethod',
     :type      => :string,

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

@@ -32,6 +32,7 @@ PhusionPassenger.require_passenger_lib 'config/installation_utils'
 PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'platform_info/openssl'
+PhusionPassenger.require_passenger_lib 'platform_info/pcre'
 PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 PhusionPassenger.require_passenger_lib 'utils/shellwords'
 PhusionPassenger.require_passenger_lib 'utils/progress_bar'
@@ -44,10 +45,10 @@ module PhusionPassenger
       include InstallationUtils
 
       def self.configure_script_options
-        extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags}".strip
+        extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags} #{PlatformInfo.pcre_extra_cflags}".strip
         result = "--with-cc-opt=#{Shellwords.escape extra_cflags} "
 
-        extra_ldflags = PlatformInfo.openssl_extra_ldflags
+        extra_ldflags = "#{PlatformInfo.openssl_extra_ldflags} #{PlatformInfo.pcre_extra_ldflags}".strip
         if !extra_ldflags.empty?
           result << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
         end

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

@@ -25,7 +25,7 @@
 require 'optparse'
 require 'net/http'
 require 'socket'
-require 'rexml/document'
+require 'json'
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'admin_tools/instance_registry'
 PhusionPassenger.require_passenger_lib 'config/command'
@@ -148,8 +148,8 @@ module PhusionPassenger
       end
 
       def select_app_group_name_exact(name)
-        query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
-          if group.elements["name"].text == name
+        query_pool_json.each do |group|
+          if group[:name] == name
             @groups << group
           end
         end
@@ -161,8 +161,8 @@ module PhusionPassenger
 
       def query_group_names
         result = []
-        query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
-          result << group.elements["name"].text
+        query_pool_json.each do |group|
+          result << group[:name]
         end
         result << "Cancel"
         result
@@ -204,8 +204,8 @@ module PhusionPassenger
           app_root = Dir.pwd
         end
         regex = /^#{Regexp.escape(app_root)}/
-        query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
-          if group.elements["app_root"].text =~ regex
+        query_pool_json.each do |group|
+          if group[:app_root] =~ regex
             @groups << group
           end
         end
@@ -218,7 +218,7 @@ module PhusionPassenger
       def perform_restart
         restart_method = @options[:rolling_restart] ? "rolling" : "blocking"
         @groups.each do |group|
-          group_name = group.elements["name"].text
+          group_name = group[:name]
           puts "Restarting #{group_name}"
           request = Net::HTTP::Post.new("/pool/restart_app_group.json")
           try_performing_full_admin_basic_auth(request, @instance)
@@ -249,15 +249,19 @@ module PhusionPassenger
         end
       end
 
-      def query_pool_xml
-        request = Net::HTTP::Get.new("/pool.xml")
+      def query_pool_json
+        request = Net::HTTP::Get.new("/pool.json")
         try_performing_ro_admin_basic_auth(request, @instance)
         response = @instance.http_request("agents.s/core_api", request)
         if response.code.to_i / 100 == 2
-          REXML::Document.new(response.body)
+          if RUBY_VERSION >= '2.3'
+            JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value.dig(:app_root,0,:value)}}
+          else
+            JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value[:app_root][0][:value]}}
+          end
         elsif response.code.to_i == 401
           if response["pool-empty"] == "true"
-            REXML::Document.new('<?xml version="1.0" encoding="iso8859-1"?><info version="3"></info>')
+            []
           elsif @options[:ignore_app_not_running]
             print_instance_querying_permission_error
             exit

data/src/ruby_supportlib/phusion_passenger/console_text_template.rb

@@ -40,8 +40,13 @@ module PhusionPassenger
         data = input[:text]
       end
       @colors = options[:colors] || AnsiColors.new
-      @template = ERB.new(@colors.ansi_colorize(data),
-        nil, '-', '@buffer')
+
+      if RUBY_VERSION >= '2.6'
+        @template = ERB.new(@colors.ansi_colorize(data), trim_mode: '-', eoutvar: '@buffer')
+      else
+        @template = ERB.new(@colors.ansi_colorize(data), nil, '-', '@buffer')
+      end
+
       @template.filename = filename if filename
       options.each_pair do |name, value|
         self[name] = value

data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb

@@ -310,12 +310,14 @@ module PhusionPassenger
       end
 
       # If we were forked from a preloader process then clear or
-      # re-establish ActiveRecord database connections. This prevents
+      # re-establish ActiveRecord/Mongoid database connections. This prevents
       # child processes from concurrently accessing the same
       # 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!
@@ -327,6 +329,13 @@ module PhusionPassenger
           end
         end
 
+        if defined?(Mongoid::Clients)
+          Mongoid::Clients.clients.each do |name, client|
+            client.close
+            client.reconnect
+          end
+        end
+
         if defined?(Sequel)
           Sequel::DATABASES.each(&:disconnect)
         end

data/src/ruby_supportlib/phusion_passenger/native_support.rb

@@ -427,10 +427,12 @@ module PhusionPassenger
         require(name_or_filename)
         return defined?(PhusionPassenger::NativeSupport)
       rescue LoadError => e
-        if e.to_s =~ /dlopen/
+        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 e.to_s.gsub(/^/, "     ")
+          puts s.gsub(/^/, "     ")
         end
         return false
       end

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

@@ -488,6 +488,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :flag,
     :default  => true
   },
+  {
+    :name     => 'passenger_preload_bundler',
+    :scope    => :application,
+    :type     => :flag,
+    :default  => false
+  },
   {
     :name     => 'passenger_max_request_queue_size',
     :scope    => :application,
@@ -676,6 +682,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :integer,
     :default  => 503
   },
+  {
+    :name     => 'passenger_spawn_exception_status_code',
+    :scope    => :location,
+    :type     => :integer,
+    :default  => 500
+  },
   {
     :name     => 'passenger_buffer_upload',
     :type     => :flag,

data/src/ruby_supportlib/phusion_passenger/packaging.rb

@@ -88,11 +88,13 @@ module PhusionPassenger
       '**/.DS_Store',
       '**/*.gch',
       '**/.editorconfig',
+      '**/.clangd',
       '.externalToolBuilders/**/*',
       '.github/**/*',
       '.settings/**/*',
       '.vscode/**/*',
       '.cproject',
+      'compile_commands.json',
       '.gitattributes',
       '.gitignore',
       '.gitmodules',
@@ -103,7 +105,7 @@ module PhusionPassenger
       'Jenkinsfile',
       'Passenger.sublime-project',
       'Vagrantfile',
-      'yarn.lock',
+      'package-lock.json',
       'build/support/vendor/*/.*',
       'build/support/vendor/*/spec/**/*',
       'dev/*/**/*',

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

@@ -687,11 +687,12 @@ module PhusionPassenger
         # Running 'file' on the Apache executable usually outputs something
         # like this:
         #
-        #   /usr/sbin/httpd: Mach-O universal binary with 4 architectures
+        #   /usr/sbin/httpd: Mach-O universal binary with 5 architectures
         #   /usr/sbin/httpd (for architecture ppc7400):     Mach-O executable ppc
         #   /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 arm64
         #
         # But on some machines, it may output just:
         #
@@ -700,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"]
+          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.

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

@@ -64,14 +64,16 @@ module PhusionPassenger
         if RUBY_PLATFORM =~ /universal/
           ruby_arch = "universal"
         else
-          # OS X <  10.8: something like:
+          # OS X often prints something like:
           #   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable x86_64"
-          output = `file -L "#{ruby_executable}"`.strip
-          ruby_arch = output.sub(/.* /, '')
+          output = `file -L "#{ruby_executable}"`.lines.first.strip
+          ruby_arch = output.split.last
           if ruby_arch == "executable"
-            # OS X >= 10.8: something like:
+            # some OS X print something like:
             #   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable"
-            if output =~ /Mach-O 64-bit/
+            if output =~ /arm64/
+              ruby_arch = "arm64"
+            elsif output =~ /Mach-O 64-bit/
               ruby_arch = "x86_64"
             else
               raise "Cannot autodetect the Ruby interpreter's architecture"
@@ -112,26 +114,28 @@ module PhusionPassenger
       if os_name_simple == "macosx"
         # RUBY_PLATFORM gives us the kernel version, but we want
         # the OS X version.
-        os_version_string = `sw_vers -productVersion`.strip
         # sw_vers returns something like "10.6.2". We're only
         # interested in the first two digits (MAJOR.MINOR) since
         # tiny releases tend to be binary compatible with each
-        # other.
-        components = os_version_string.split(".")
-        os_version = "#{components[0]}.#{components[1]}"
-        os_runtime = os_version
-
-        os_arch = cpu_architectures[0]
-        if os_version >= "10.5" && os_arch =~ /^i.86$/
-          # On Snow Leopard, 'uname -m' returns i386 but
-          # we *know* that everything is x86_64 by default.
-          os_arch = "x86_64"
-        end
+        # other. After macOS 10.15 Apple switched to bumping major
+        # versions (like 11.0, 12.0) so we need to look at that.
+        # However, if the env var SYSTEM_VERSION_COMPAT=1 then
+        # macOS 11 reports as 10.16 (and so on), so we need to deal with that too.
+        major, minor, *rest = os_version.split(".").map(&:to_i)
+        os_version_string = if major >= 11
+                       major
+                     elsif minor >= 16
+                       # 10.16 -> 11
+                       # 10.17 -> 12
+                       minor - 5
+                     else
+                       "#{major}.#{minor}"
+                     end
+        os_runtime = os_version_string.to_s
       else
-        os_arch = cpu_architectures[0]
         os_runtime = nil
       end
-
+      os_arch = cpu_architectures[0]
       return [os_arch, os_name_simple, os_runtime].compact.join("-")
     end
     memoize :cxx_binary_compatibility_id

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

@@ -44,6 +44,9 @@ module PhusionPassenger
 
     def self.curl_libs
       result = `(curl-config --libs) 2>/dev/null`.strip
+      if os_name_simple == "macosx"
+        result << ' -framework Foundation -framework SystemConfiguration'
+      end
       if result.empty?
         return nil
       else

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

@@ -187,7 +187,7 @@ module PhusionPassenger
           flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
           flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if os_name_full =~ /solaris2\.9/
         end
-        flags << '-DBOOST_HAS_STDINT_H' unless os_name_full =~ /solaris2\.9/
+        flags << '-DBOOST_HAS_STDINT_H' unless os_name_full =~ /solaris2\.(9|10|11)/
         if send("#{cc_or_cxx}_is_sun_studio?")
           flags << '-xtarget=ultra' if RUBY_PLATFORM =~ /sparc/
         else

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

@@ -115,7 +115,8 @@ define 'pcre-dev' do
   name "PCRE development headers"
   website "http://www.pcre.org/"
   define_checker do
-    check_for_header('pcre.h')
+    check_for_header('pcre.h', :c,
+      PlatformInfo.pcre_extra_cflags)
   end
 
   on :debian do
@@ -124,4 +125,7 @@ define 'pcre-dev' do
   on :redhat do
     yum_install 'pcre-devel'
   end
-end
+  on :macosx do
+    brew_install "pcre"
+  end
+end

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

@@ -54,7 +54,8 @@ module PhusionPassenger
         return [:debian]
       elsif File.exist?("/etc/redhat-release")
         redhat_release = read_file("/etc/redhat-release")
-        if redhat_release =~ /CentOS/
+        if redhat_release =~ /CentOS|AlmaLinux|Rocky Linux/
+          # For now treat all non-RHEL enterprise linux distros the same
           return [:centos, :redhat]
         elsif redhat_release =~ /Fedora/
           return [:fedora, :redhat]

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

@@ -37,6 +37,9 @@ module PhusionPassenger
         elsif File.exist?("/usr/local/opt/openssl/include")
           # Use the one from Homebrew.
           "-I/usr/local/opt/openssl/include"
+        elsif File.exist?("/opt/homebrew/opt/openssl/include")
+          # Use the one from Homebrew on Apple Silicon
+          "-I/opt/homebrew/opt/openssl/include"
         else
           # Use the one from Macports.
           "-I/opt/local/include"
@@ -53,6 +56,8 @@ module PhusionPassenger
           ""
         elsif File.exist?("/usr/local/opt/openssl/include")
           "-L/usr/local/opt/openssl/lib"
+        elsif File.exist?("/opt/homebrew/opt/openssl/include")
+          "-L/opt/homebrew/opt/openssl/lib"
         else
           "-L/opt/local/lib"
         end