passenger 6.0.12 → 6.0.13

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,

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/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/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.12'
+  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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.0.12
+  version: 6.0.13
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -666,9 +666,19 @@ files:
 - src/cxx_supportlib/vendor-modified/boost/algorithm/string/trim.hpp
 - src/cxx_supportlib/vendor-modified/boost/algorithm/string/trim_all.hpp
 - src/cxx_supportlib/vendor-modified/boost/algorithm/string/yes_no_type.hpp
+- src/cxx_supportlib/vendor-modified/boost/align/align.hpp
 - src/cxx_supportlib/vendor-modified/boost/align/aligned_alloc.hpp
+- src/cxx_supportlib/vendor-modified/boost/align/alignment_of.hpp
+- src/cxx_supportlib/vendor-modified/boost/align/alignment_of_forward.hpp
+- src/cxx_supportlib/vendor-modified/boost/align/detail/align_cxx11.hpp
+- src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc.hpp
 - src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc_posix.hpp
+- src/cxx_supportlib/vendor-modified/boost/align/detail/alignment_of.hpp
+- src/cxx_supportlib/vendor-modified/boost/align/detail/alignment_of_cxx11.hpp
+- src/cxx_supportlib/vendor-modified/boost/align/detail/element_type.hpp
+- src/cxx_supportlib/vendor-modified/boost/align/detail/integral_constant.hpp
 - src/cxx_supportlib/vendor-modified/boost/align/detail/is_alignment.hpp
+- src/cxx_supportlib/vendor-modified/boost/align/detail/min_size.hpp
 - src/cxx_supportlib/vendor-modified/boost/aligned_storage.hpp
 - src/cxx_supportlib/vendor-modified/boost/array.hpp
 - src/cxx_supportlib/vendor-modified/boost/asio.hpp
@@ -4753,12 +4763,10 @@ files:
 - src/nodejs_supportlib/vendor-copy/winston/lib/winston/logger.js
 - src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports.js
 - src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/console.js
-- src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/daily-rotate-file.js
 - src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/file.js
 - src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/http.js
 - src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/memory.js
 - src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/transport.js
-- src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/webhook.js
 - src/nodejs_supportlib/vendor-copy/winston/node_modules/async/LICENSE
 - src/nodejs_supportlib/vendor-copy/winston/node_modules/async/lib/async.js
 - src/nodejs_supportlib/vendor-copy/winston/node_modules/async/package.json
@@ -4786,9 +4794,6 @@ files:
 - src/nodejs_supportlib/vendor-copy/winston/node_modules/isstream/LICENSE.md
 - src/nodejs_supportlib/vendor-copy/winston/node_modules/isstream/isstream.js
 - src/nodejs_supportlib/vendor-copy/winston/node_modules/isstream/package.json
-- src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/LICENSE
-- src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/lib/pkginfo.js
-- src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/package.json
 - src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/License
 - src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/lib/stack-trace.js
 - src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/package.json