passenger 6.0.6 → 6.0.22

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

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

@@ -23,11 +23,18 @@
 #  THE SOFTWARE.
 
 require 'rbconfig'
+require 'rubygems'
 PhusionPassenger.require_passenger_lib 'platform_info'
 
 module PhusionPassenger
 
   module PlatformInfo
+    class VersionComparer < String
+      def <=>(other)
+        Gem::Version.new(self) <=> Gem::Version.new(other.to_s)
+      end
+    end
+
     # Returns the operating system's name in as simple a form as possible. For example,
     # Linux is always identified as "linux". OS X is always identified as "macosx" (despite
     # the actual os name being something like "darwin"). This is useful as a stable indicator
@@ -67,25 +74,26 @@ module PhusionPassenger
     def self.os_version
       case os_name_simple
       when 'macosx'
-        `/usr/bin/sw_vers -productVersion`.strip.split.last
+        VersionComparer.new(`/usr/bin/sw_vers -productVersion`.strip.split.last)
 
       when 'linux'
         # Parse LSB (applicable to e.g. Ubuntu)
         if read_file('/etc/lsb-release') =~ /DISTRIB_RELEASE=(.+)/
-          version = $1.gsub(/["']/, '')
-          return version if !version.empty?
+          version = $1.delete(%q['"])
+          return VersionComparer.new(version) if !version.empty?
         end
 
         # Parse CentOS/RedHat
         data = read_file('/etc/centos-release')
         data = read_file('/etc/redhat-release') if data.empty?
         if !data.empty?
-          data =~ /^(.+?) (Linux )?(release |version )?(.+?)( |$)/i
-          return $4 if $4
+          data =~ /^(.+?) (Linux |Stream )?(release |version )?(.+?)( |$)/i
+          return VersionComparer.new($4) if $4
         end
 
+        # Parse Debian
         if File.exist?('/etc/debian_version')
-          return read_file('/etc/debian_version').strip
+          return VersionComparer.new(read_file('/etc/debian_version').strip)
         end
 
         nil
@@ -142,34 +150,37 @@ module PhusionPassenger
     # system are thus be x86_64. It is guaranteed that the OS can run x86_64
     # executables, but not x86 executables per se.
     #
-    # Another example: on MacOS X this function can return either
-    # ["x86_64", "x86"] or ["x86", "x86_64"]. The former result indicates
-    # OS X 10.6 (Snow Leopard) and beyond because starting from that version
-    # everything is 64-bit by default. The latter result indicates an OS X
-    # version older than 10.6.
+    # Another example: on MacOS X this function will return some subset of
+    # "x86_64", "x86", and "arm".
     def self.cpu_architectures
-      uname = uname_command
-      raise "The 'uname' command cannot be found" if !uname
       if os_name_simple == "macosx"
-        arch = `#{uname} -p`.strip
-        if arch == "i386"
-          # Macs have been x86 since around 2007. I think all of them come with
-          # a recent enough Intel CPU that supports both x86 and x86_64, and I
-          # think every OS X version has both the x86 and x86_64 runtime installed.
-          major, minor, *rest = `sw_vers -productVersion`.strip.split(".")
-          major = major.to_i
-          minor = minor.to_i
-          if major >= 10 || (major == 10 && minor >= 6)
-            # Since Snow Leopard x86_64 is the default.
-            ["x86_64", "x86"]
+        # Macs were intel from around 2006 until 2022.
+        # All but the first 3 Intel Macs' CPUs supported both x86_64 and x86,
+        # and every OS X version from 10.4 to 10.14 had both x86 and x86_64 runtimes installed,
+        # from 10.15 on x86 was dropped, and from (11/10.16) on arm (aarch64) was added.
+        major, minor, *rest = os_version.split(".").map(&:to_i)
+        if major >= 11 || (major == 10 && minor >= 16)
+          # Since Big Sur aarch64 is supported, and default on m1 macs.
+          if `#{uname_command} -m` =~ /arm64/
+            ["arm64", "x86_64"]
+          elsif `sysctl -in sysctl.proc_translated` == "1"
+            ["arm64", "x86_64"]
           else
-            # Before Snow Leopard x86 was the default.
-            ["x86", "x86_64"]
+            ["x86_64", "arm64"]
           end
+        elsif minor == 15
+          # Since Catalina x86 is gone.
+          ["x86_64"]
+        elsif minor >= 6
+          # Since Snow Leopard x86_64 is the default on intel macs.
+          ["x86_64", "x86"]
         else
-          arch
+          # Before Snow Leopard x86 was the default.
+          ["x86", "x86_64"]
         end
       else
+        uname = uname_command
+        raise "The 'uname' command cannot be found" if !uname
         arch = `#{uname} -p`.strip
         # On some systems 'uname -p' returns something like
         # 'Intel(R) Pentium(R) M processor 1400MHz' or
@@ -236,9 +247,17 @@ module PhusionPassenger
     memoize :supports_lfence_instruction?, true
 
     def self.requires_no_tls_direct_seg_refs?
-      return File.exists?("/proc/xen/capabilities") && cpu_architectures[0] == "x86"
+      return File.exist?("/proc/xen/capabilities") && cpu_architectures[0] == "x86"
     end
     memoize :requires_no_tls_direct_seg_refs?, true
+
+    # Returns true if the current os is running in Windows Subsystem for Linux
+    def self.windows_subsystem?
+      uname = uname_command
+      raise "The 'uname' command cannot be found" if !uname
+      `#{uname} -r`.include?("Microsoft")
+    end
+    memoize :windows_subsystem?, true
   end
 
 end # module PhusionPassenger

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

@@ -0,0 +1,64 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2021 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.
+
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+
+module PhusionPassenger
+
+  module PlatformInfo
+    def self.pcre_extra_cflags
+      cflags = ""
+      if PlatformInfo.os_name_simple == "macosx"
+        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.
+          cflags = "-I#{brew_path}"
+        else
+          # Use the one from Macports.
+          cflags = "-I/opt/local/include"
+        end
+      end
+      return "#{cflags} -DPCRE2_CODE_UNIT_WIDTH=8"
+    end
+    memoize :pcre_extra_cflags
+
+    def self.pcre_extra_ldflags
+      if PlatformInfo.os_name_simple == "macosx"
+        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
+        ""
+      end
+    end
+    memoize :pcre_extra_ldflags
+  end
+
+end # module PhusionPassenger

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

@@ -309,10 +309,10 @@ module PhusionPassenger
 
         # That failed too. Try extracting info from from $LOAD_PATH.
         matching_path = $LOAD_PATH.find_all do |item|
-          item.include?("rvm/gems/")
+          item.include?("rvm/gems/") || item.include?("rvm/rubies/")
         end
         if matching_path && !matching_path.empty?
-          subpath = matching_path.to_s.gsub(/^.*rvm\/gems\//, '')
+          subpath = matching_path.to_s.gsub(/^.*rvm\/(gems|rubies)\//, '')
           result = subpath.split('/').first
           return result if result
         end

data/src/ruby_supportlib/phusion_passenger/public_api.rb

@@ -30,6 +30,7 @@ module PhusionPassenger
     @@event_credentials = []
     @@event_after_installing_signal_handlers = []
     @@event_oob_work = []
+    @@event_unhandled_exception_before_exit = []
     @@advertised_concurrency_level = nil
 
     def on_event(name, &block)
@@ -69,6 +70,8 @@ module PhusionPassenger
         @@event_after_installing_signal_handlers
       when :oob_work
         @@event_oob_work
+      when :unhandled_exception_before_exit
+        @@event_unhandled_exception_before_exit
       else
         raise ArgumentError, "Unknown event name '#{name}'"
       end

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

@@ -41,7 +41,7 @@ module PhusionPassenger
     module ThreadHandlerExtension
       # Constants which exist to relieve Ruby's garbage collector.
       RACK_VERSION       = "rack.version"        # :nodoc:
-      RACK_VERSION_VALUE = [1, 2]                # :nodoc:
+      RACK_VERSION_VALUE = [1, 3]                # :nodoc:
       RACK_INPUT         = "rack.input"          # :nodoc:
       RACK_ERRORS        = "rack.errors"         # :nodoc:
       RACK_MULTITHREAD   = "rack.multithread"    # :nodoc:
@@ -106,6 +106,9 @@ module PhusionPassenger
           begin
             status, headers, body = @app.call(env)
           rescue => e
+            if e.is_a?(Errno::ENOBUFS)
+              raise e
+            end
             if !should_swallow_app_error?(e, socket_wrapper)
               # It's a good idea to catch application exceptions here because
               # otherwise maliciously crafted responses can crash the app,
@@ -155,6 +158,9 @@ module PhusionPassenger
             process_body(env, connection, socket_wrapper, status.to_i, is_head_request,
               headers, body)
           rescue => e
+            if e.is_a?(Errno::ENOBUFS)
+              raise e
+            end
             if !should_swallow_app_error?(e, socket_wrapper)
               print_exception("Rack response body object", e)
             end
@@ -324,6 +330,9 @@ module PhusionPassenger
         begin
           body.close if body && body.respond_to?(:close)
         rescue => e
+          if e.is_a?(Errno::ENOBUFS)
+            raise e
+          end
           if !should_swallow_app_error?(e, socket_wrapper)
             print_exception("Rack response body object's #close method", e)
           end
@@ -340,6 +349,8 @@ module PhusionPassenger
         headers.each do |key, values|
           if values.is_a?(String)
             values = values.split(NEWLINE)
+          elsif values.is_a?(Array)
+            # values already array
           elsif key == RACK_HIJACK
             # We do not check for this key name in every loop
             # iteration as an optimization.

data/src/ruby_supportlib/phusion_passenger/request_handler/thread_handler.rb

@@ -68,10 +68,10 @@ module PhusionPassenger
         @protocol          = Utils.require_option(options, :protocol)
         @app_group_name    = Utils.require_option(options, :app_group_name)
         Utils.install_options_as_ivars(self, options,
-          :app,
-          :connect_password,
-          :keepalive_enabled
-        )
+                                       :app,
+                                       :connect_password,
+                                       :keepalive_enabled
+                                      )
 
         @stats_mutex   = Mutex.new
         @interruptable = false
@@ -118,7 +118,7 @@ module PhusionPassenger
         @stats_mutex.synchronize { @interruptable = true }
       end
 
-    private
+      private
       # Returns true if the socket has been hijacked, false otherwise.
       def accept_and_process_next_request(socket_wrapper, channel, buffer)
         @stats_mutex.synchronize do
@@ -176,8 +176,8 @@ module PhusionPassenger
         raise
       rescue => e
         if socket_wrapper && socket_wrapper.source_of_exception?(e)
-          # EPIPE is harmless, it just means that the client closed the connection.
-          if !e.is_a?(Errno::EPIPE)
+          # EPIPE and ECONNRESET are harmless, it just means that the client closed the connection.
+          if !should_swallow_app_error?(e, socket_wrapper)
             print_exception("Passenger RequestHandler's client socket", e)
           end
         else
@@ -218,14 +218,14 @@ module PhusionPassenger
         headers = Utils::NativeSupportUtils.split_by_null_into_hash(headers_data)
         if @connect_password && headers[PASSENGER_CONNECT_PASSWORD] != @connect_password
           warn "*** Passenger RequestHandler warning: " <<
-            "someone tried to connect with an invalid connect password."
+               "someone tried to connect with an invalid connect password."
           return
         else
           return headers
         end
       rescue SecurityError => e
         warn("*** Passenger RequestHandler warning: " <<
-          "HTTP header size exceeded maximum.")
+             "HTTP header size exceeded maximum.")
         return
       end
 
@@ -241,7 +241,7 @@ module PhusionPassenger
         end
         if data.size >= MAX_HEADER_SIZE
           warn("*** Passenger RequestHandler warning: " <<
-            "HTTP header size exceeded maximum.")
+               "HTTP header size exceeded maximum.")
           return
         end
 
@@ -255,7 +255,7 @@ module PhusionPassenger
             protocol       = $3
             if request_method.nil?
               warn("*** Passenger RequestHandler warning: " <<
-                "Invalid HTTP request.")
+                   "Invalid HTTP request.")
               return
             end
             path_info, query_string    = request_uri.split("?", 2)
@@ -286,7 +286,7 @@ module PhusionPassenger
 
         if @connect_password && headers["HTTP_X_PASSENGER_CONNECT_PASSWORD"] != @connect_password
           warn "*** Passenger RequestHandler warning: " <<
-            "someone tried to connect with an invalid connect password."
+               "someone tried to connect with an invalid connect password."
           return
         else
           return headers
@@ -304,16 +304,16 @@ module PhusionPassenger
         connection.write("oobw done")
       end
 
-    # def process_request(env, connection, socket_wrapper, full_http_response)
-    #   raise NotImplementedError, "Override with your own implementation!"
-    # end
+      # def process_request(env, connection, socket_wrapper, full_http_response)
+      #   raise NotImplementedError, "Override with your own implementation!"
+      # end
 
       def prepare_request(connection, headers)
         transfer_encoding = headers[HTTP_TRANSFER_ENCODING]
         content_length = headers[CONTENT_LENGTH]
         @can_keepalive = @keepalive_enabled &&
-          !transfer_encoding &&
-          !content_length
+                         !transfer_encoding &&
+                         !content_length
         @keepalive_performed = false
 
         if !transfer_encoding && !content_length
@@ -342,7 +342,7 @@ module PhusionPassenger
       end
 
       def should_swallow_app_error?(e, socket_wrapper)
-        return socket_wrapper && socket_wrapper.source_of_exception?(e) && e.is_a?(Errno::EPIPE)
+        return socket_wrapper && socket_wrapper.source_of_exception?(e) && [Errno::EPIPE, Errno::ECONNRESET].any?{|er| e.is_a?(er)}
       end
     end
 

data/src/ruby_supportlib/phusion_passenger/request_handler.rb

@@ -99,7 +99,7 @@ module PhusionPassenger
       if should_use_unix_sockets?
         @main_socket_address, @main_socket = create_unix_socket_on_filesystem(options)
       else
-        @main_socket_address, @main_socket = create_tcp_socket
+        @main_socket_address, @main_socket = create_tcp_socket(options)
       end
       @server_sockets[:main] = {
         :address     => @main_socket_address,
@@ -109,7 +109,7 @@ module PhusionPassenger
         :accept_http_requests => true
       }
 
-      @http_socket_address, @http_socket = create_tcp_socket
+      @http_socket_address, @http_socket = create_tcp_socket(options)
       @server_sockets[:http] = {
         :address     => @http_socket_address,
         :socket      => @http_socket,
@@ -279,7 +279,10 @@ module PhusionPassenger
       # is still bugged as of version 1.7.0. They can
       # cause unexplicable freezes when used in combination
       # with threading.
-      return !@force_http_session && ruby_engine != "jruby"
+      # It's also bugged in Windows Subsystem for Linux
+      # as of Windows 10, version 1803 (Fall Creators Update)
+      # You will get "Address In Use" errors even if the port is unused.
+      return !@force_http_session && ruby_engine != "jruby" && !PlatformInfo.windows_subsystem?
     end
 
     def create_unix_socket_on_filesystem(options)
@@ -309,16 +312,17 @@ module PhusionPassenger
       end
     end
 
-    def create_tcp_socket
-      # We use "0.0.0.0" as address in order to force
+    def create_tcp_socket(options)
+      # We default to "127.0.0.1" as address in order to force
       # TCPv4 instead of TCPv6.
-      socket = TCPServer.new('0.0.0.0', 0)
+      bind_address = options.fetch('bind_address', '127.0.0.1')
+      socket = TCPServer.new(bind_address, 0)
       socket.listen(BACKLOG_SIZE)
       socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       socket.binmode
       socket.sync = true
       socket.close_on_exec!
-      socket_address = "tcp://127.0.0.1:#{socket.addr[1]}"
+      socket_address = "tcp://#{bind_address}:#{socket.addr[1]}"
       return [socket_address, socket]
     end
 

data/src/ruby_supportlib/phusion_passenger/ruby_core_enhancements.rb

@@ -147,6 +147,11 @@ module Signal
     result.delete("KILL")
     result.delete("EXIT")
 
+    # Profilers such as ddtrace and stackprof use this signal, so removing the
+    # the handler causes the Ruby process to crash when profilers are operating.
+    # See https://github.com/phusion/passenger/issues/2489 for details.
+    result.delete("PROF")
+
     return result
   end
 end

data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb

@@ -258,6 +258,13 @@ module PhusionPassenger
         :default   => PlatformInfo.ruby_supports_fork? ? DEFAULT_SPAWN_METHOD : 'direct',
         :desc      => 'The spawn method to use. Default: see docs'
       },
+      {
+        :name      => :direct_instance_request_address,
+        :type      => :hostname,
+        :type_desc => 'HOST',
+        :default   => '127.0.0.1',
+        :desc      => "The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.\nDefault: %DEFAULT%"
+      },
       {
         :name      => :static_files_dir,
         :type      => :path,
@@ -286,13 +293,19 @@ module PhusionPassenger
         :name      => :load_shell_envvars,
         :type      => :boolean,
         # The Standalone mode is primarily used for serving a single app (except
-        # when in mass deployment mode), so load_shell_envvars id disabled by
+        # when in mass deployment mode), so load_shell_envvars is disabled by
         # default. However, it's enabled by default in the Core, so we need to
         # explicitly set it to disabled here.
         :default   => false,
         :desc      => "Load shell startup files before loading\n" \
                       'application'
       },
+      {
+        :name      => :preload_bundler,
+        :type      => :boolean,
+        :default   => false,
+        :desc      => "Tell Ruby to load the bundler gem before loading the application"
+      },
       {
         :name      => :app_file_descriptor_ulimit,
         :type      => :integer,

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb

@@ -159,6 +159,7 @@ module PhusionPassenger
           end
           add_param(command, :force_max_concurrent_requests_per_process, "--force-max-concurrent-requests-per-process")
           add_flag_param(command, :load_shell_envvars, "--load-shell-envvars")
+          add_flag_param(command, :preload_bundler, "--preload-bundler")
           add_param(command, :max_pool_size, "--max-pool-size")
           add_param(command, :min_instances, "--min-instances")
           add_param(command, :pool_idle_time, "--pool-idle-time")
@@ -231,7 +232,7 @@ module PhusionPassenger
             abort "The '#{option_name}' feature is only available in #{PROGRAM_NAME} " +
               "Enterprise. You are currently running the open source #{PROGRAM_NAME}. " +
               "Please learn more about and/or buy #{PROGRAM_NAME} Enterprise at " +
-              "https://www.phusionpassenger.com/enterprise"
+              "https://www.phusionpassenger.com/features#premium-features"
           end
         end
 
@@ -240,7 +241,7 @@ module PhusionPassenger
             abort "The '#{option_name}' feature is only available in #{PROGRAM_NAME} " +
               "Enterprise. You are currently running the open source #{PROGRAM_NAME}. " +
               "Please learn more about and/or buy #{PROGRAM_NAME} Enterprise at " +
-              "https://www.phusionpassenger.com/enterprise"
+              "https://www.phusionpassenger.com/features#premium-features"
           end
         end
 

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb

@@ -75,7 +75,7 @@ module PhusionPassenger
           #
           # Connect to the engine's server and wait until it disconnects the socket
           # because of timeout. Keep doing this until we can no longer connect.
-          while true
+          loop do
             if @options[:socket_file]
               socket = UNIXSocket.new(@options[:socket_file])
             else
@@ -110,14 +110,14 @@ module PhusionPassenger
           command = "#{Shellwords.escape @nginx_binary}" \
             " -c #{Shellwords.escape path}" \
             " -p #{Shellwords.escape @working_dir}" \
-            " -t"
+            ' -t'
           output = `#{command} 2>&1`
           if $? && $?.exitstatus != 0
             output.gsub!(path, file)
             output = PlatformInfo.send(:reindent, output, 4)
 
             message = "*** ERROR: the Nginx configuration that #{PROGRAM_NAME}" \
-              " Standalone generated internally contains problems. The error " \
+              ' Standalone generated internally contains problems. The error ' \
               "message returned by the Nginx engine is:\n\n" \
               "#{output}\n\n"
             debug_log_file = Utils::TmpIO.new('passenger-standalone',
@@ -130,16 +130,16 @@ module PhusionPassenger
               debug_log_file.close
             end
             if @options[:nginx_config_template] && file == 'nginx.conf'
-              message << "This probably means that you have a problem in your " \
+              message << 'This probably means that you have a problem in your ' \
                 "Nginx configuration template. Please fix your template.\n\n" \
                 "Tip: to debug your template, re-run #{SHORT_PROGRAM_NAME} " \
-                "Standalone with the `--debug-nginx-config` option. This " \
-                "allows you to see how the final Nginx config file looks like."
+                'Standalone with the `--debug-nginx-config` option. This ' \
+                'allows you to see how the final Nginx config file looks like.'
             else
-              message << "This probably means that you have found a bug in " \
+              message << 'This probably means that you have found a bug in ' \
                 "#{PROGRAM_NAME} Standalone. Please report this bug to our " \
                 "Github issue tracker: https://github.com/phusion/passenger/issues\n\n" \
-                "In the bug report, please include this error message, as " \
+                'In the bug report, please include this error message, as ' \
                 "well as the contents of the file #{debug_log_file.path}"
             end
 
@@ -155,13 +155,13 @@ module PhusionPassenger
           end
           return {
             :identifier    => 'Nginx',
-            :start_command => "#{Shellwords.escape @nginx_binary} " +
-              "-c #{Shellwords.escape nginx_config_path} " +
+            :start_command => "#{Shellwords.escape @nginx_binary} " \
+              "-c #{Shellwords.escape nginx_config_path} " \
               "-p #{Shellwords.escape @working_dir}",
-            :stop_command => "#{Shellwords.escape @nginx_binary} " +
-              "-c #{Shellwords.escape nginx_config_path} " +
-              "-p #{Shellwords.escape @working_dir} " +
-              "-s quit",
+            :stop_command => "#{Shellwords.escape @nginx_binary} " \
+              "-c #{Shellwords.escape nginx_config_path} " \
+              "-p #{Shellwords.escape @working_dir} " \
+              '-s quit',
             :ping_command  => ping_spec,
             :pid_file      => @options[:pid_file],
             :log_file      => @options[:log_file],
@@ -179,8 +179,13 @@ module PhusionPassenger
         def write_nginx_config_file(path)
           File.open(path, 'w') do |f|
             f.chmod(0644)
-            erb = ERB.new(File.read(nginx_config_template_filename), nil,
-              "-", next_eoutvar)
+
+            if RUBY_VERSION >= '2.6'
+              erb = ERB.new(File.read(nginx_config_template_filename), trim_mode: "-", eoutvar: next_eoutvar)
+            else
+              erb = ERB.new(File.read(nginx_config_template_filename), nil, '-', next_eoutvar)
+            end
+
             erb.filename = nginx_config_template_filename
 
             # The template requires some helper methods which are defined in start_command.rb.
@@ -279,7 +284,13 @@ module PhusionPassenger
 
         def include_passenger_internal_template(name, indent = 0, fix_existing_indenting = true, the_binding = get_binding)
           path = "#{PhusionPassenger.resources_dir}/templates/standalone/#{name}"
-          erb = ERB.new(File.read(path), nil, "-", next_eoutvar)
+
+          if RUBY_VERSION >= '2.6'
+            erb = ERB.new(File.read(path), trim_mode: "-", eoutvar: next_eoutvar)
+          else
+            erb = ERB.new(File.read(path), nil, "-", next_eoutvar)
+          end
+
           erb.filename = path
           result = erb.result(the_binding)
 

data/src/ruby_supportlib/phusion_passenger/standalone/start_command.rb

@@ -355,7 +355,7 @@ module PhusionPassenger
       end
 
       def show_intro_message
-        puts "=============== Phusion Passenger Standalone web server started ==============="
+        puts "=============== #{PROGRAM_NAME} Standalone web server started ==============="
         puts "PID file: #{@options[:pid_file]}"
         puts "Log file: #{@options[:log_file]}"
         puts "Environment: #{@options[:environment]}"

data/src/ruby_supportlib/phusion_passenger/utils.rb

@@ -115,6 +115,7 @@ module PhusionPassenger
           raise
         rescue Exception => e
           print_exception(nil, e)
+          PhusionPassenger.call_event(:unhandled_exception_before_exit, e)
           exit(1)
         end
       end

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]