passenger 6.0.10 → 6.0.13

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/loader_shared_helpers.rb

@@ -310,7 +310,7 @@ 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
@@ -327,6 +327,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/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

@@ -93,6 +93,7 @@ module PhusionPassenger
       '.settings/**/*',
       '.vscode/**/*',
       '.cproject',
+      'compile_commands.json',
       '.gitattributes',
       '.gitignore',
       '.gitmodules',

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 = "arm"
+            elsif output =~ /Mach-O 64-bit/
               ruby_arch = "x86_64"
             else
               raise "Cannot autodetect the Ruby interpreter's architecture"

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

@@ -57,7 +57,7 @@ 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/include"
+          "-L/opt/homebrew/opt/openssl/lib"
         else
           "-L/opt/local/lib"
         end

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

@@ -87,7 +87,7 @@ module PhusionPassenger
         data = read_file('/etc/centos-release')
         data = read_file('/etc/redhat-release') if data.empty?
         if !data.empty?
-          data =~ /^(.+?) (Linux )?(release |version )?(.+?)( |$)/i
+          data =~ /^(.+?) (Linux |Stream )?(release |version )?(.+?)( |$)/i
           return VersionComparer.new($4) if $4
         end
 
@@ -160,8 +160,14 @@ module PhusionPassenger
         # 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.
-          ["x86_64", "arm"]
+          # Since Big Sur aarch64 is supported, and default on m1 macs.
+          if `uname -m` =~ /arm64/
+            ["arm", "x86_64"]
+          elsif `sysctl -in sysctl.proc_translated` == "1"
+            ["arm", "x86_64"]
+          else
+            ["x86_64", "arm"]
+          end
         elsif minor == 15
           # Since Catalina x86 is gone.
           ["x86_64"]
@@ -244,6 +250,14 @@ module PhusionPassenger
       return File.exists?("/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,65 @@
+#  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
+      if PlatformInfo.os_name_simple == "macosx"
+        if File.exist?("/usr/local/opt/pcre/include")
+          # 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"
+        else
+          # Use the one from Macports.
+          "-I/opt/local/include"
+        end
+      else
+        ""
+      end
+    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"
+        else
+          "-L/opt/local/lib"
+        end
+      else
+        ""
+      end
+    end
+    memoize :pcre_extra_ldflags
+  end
+
+end # module PhusionPassenger

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

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

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

@@ -293,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")

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,16 +31,16 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.10'
+  VERSION_STRING = '6.0.13'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
-  PREFERRED_NGINX_VERSION = '1.20.1'
-  NGINX_SHA256_CHECKSUM = 'e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49'
+  PREFERRED_NGINX_VERSION = '1.20.2'
+  NGINX_SHA256_CHECKSUM = '958876757782190a1653e14dc26dfc7ba263de310e04c113e11e97d1bef45a42'
 
   # Packaging may be locked to an older version due to the specific module configuration being
   # incompatible with the version we prefer (latest stable).
-  PACKAGING_PREFERRED_NGINX_VERSION = '1.20.1'
-  PACKAGING_NGINX_SHA256_CHECKSUM = 'e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.20.2'
+  PACKAGING_NGINX_SHA256_CHECKSUM = '958876757782190a1653e14dc26dfc7ba263de310e04c113e11e97d1bef45a42'
 
   # sha256sum of the .tar.gz
   PREFERRED_PCRE_VERSION  = '8.45'