passenger 6.1.4 → 6.1.6

data/src/ruby_supportlib/phusion_passenger/platform_info.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -32,7 +33,7 @@ module PhusionPassenger
   module PlatformInfo
   private
     @@cache_dir = nil
-    @@verbose   = ['1', 'true', 'on', 'yes'].include?(ENV['VERBOSE'])
+    @@verbose   = [ '1', 'true', 'on', 'yes' ].include?(ENV['VERBOSE'])
     @@log_implementation = lambda do |message|
       message = reindent(message, 3)
       message.sub!(/^   /, '')
@@ -72,10 +73,10 @@ module PhusionPassenger
         metaclass.send(:alias_method, "_unmemoized_#{method}", method)
         variable_name = "@@memoized_#{method}".sub(/\?/, '')
         check_variable_name = "@@has_memoized_#{method}".sub(/\?/, '')
-        eval(%Q{
+        eval(%Q(
           #{variable_name} = nil
           #{check_variable_name} = false
-        })
+        ))
         line = __LINE__ + 1
         source = %Q{
           def self.#{method}(*args)                                           # def self.httpd(*args)
@@ -131,7 +132,7 @@ module PhusionPassenger
           return filename
         end
       end
-      return nil
+      nil
     end
     private_class_method :select_executable
 
@@ -139,16 +140,16 @@ module PhusionPassenger
       str = str.dup
       str.gsub!(/\A([\s\t]*\n)+/, '')
       str.gsub!(/[\s\t\n]+\Z/, '')
-      indent = str.split("\n").select{ |line| !line.strip.empty? }.map{ |line| line.index(/[^\s]/) }.compact.min || 0
+      indent = str.split("\n").select { |line| !line.strip.empty? }.map { |line| line.index(/[^\s]/) }.compact.min || 0
       str.gsub!(/^[[:blank:]]{#{indent}}/, '')
-      return str
+      str
     end
     private_class_method :unindent
 
     def self.reindent(str, level)
       str = unindent(str)
       str.gsub!(/^/, ' ' * level)
-      return str
+      str
     end
     private_class_method :reindent
 
@@ -186,7 +187,7 @@ module PhusionPassenger
     end
 
     def self.cache_dir
-      return @@cache_dir
+      @@cache_dir
     end
 
     def self.verbose=(val)
@@ -194,7 +195,7 @@ module PhusionPassenger
     end
 
     def self.verbose?
-      return @@verbose
+      @@verbose
     end
 
     def self.log_implementation=(impl)
@@ -202,29 +203,29 @@ module PhusionPassenger
     end
 
     def self.log_implementation
-      return @@log_implementation
+      @@log_implementation
     end
 
 
     def self.env_defined?(name)
-      return !ENV[name].nil? && !ENV[name].empty?
+      !ENV[name].nil? && !ENV[name].empty?
     end
 
     def self.string_env(name, default_value = nil)
       value = ENV[name]
       if value.nil? || value.empty?
-        return default_value
+        default_value
       else
-        return value
+        value
       end
     end
 
     def self.read_file(filename)
-      return File.open(filename, "rb") do |f|
+      File.open(filename, "rb") do |f|
         f.read
       end
     rescue
-      return ""
+      ""
     end
 
     # Clears all memoized values. However, the disk cache (if any is configured)
@@ -240,9 +241,9 @@ module PhusionPassenger
     def self.tmpdir
       result = ENV['TMPDIR']
       if result && !result.empty?
-        return result.sub(/\/+\Z/, '')
+        result.sub(/\/+\Z/, '')
       else
-        return '/tmp'
+        '/tmp'
       end
     end
     memoize :tmpdir
@@ -266,15 +267,15 @@ module PhusionPassenger
         if system(filename)
           return dir
         else
-          attempts << { :dir => dir,
-            :error => "This directory's filesystem is mounted with the 'noexec' option." }
+          attempts << { dir: dir,
+            error: "This directory's filesystem is mounted with the 'noexec' option." }
         end
       rescue Errno::ENOENT
-        attempts << { :dir => dir, :error => "This directory doesn't exist." }
+        attempts << { dir: dir, error: "This directory doesn't exist." }
       rescue Errno::EACCES
-        attempts << { :dir => dir, :error => "This program doesn't have permission to write to this directory." }
+        attempts << { dir: dir, error: "This program doesn't have permission to write to this directory." }
       rescue SystemCallError => e
-        attempts << { :dir => dir, :error => e.message }
+        attempts << { dir: dir, error: e.message }
       ensure
         File.unlink(filename) rescue nil
       end
@@ -289,15 +290,15 @@ module PhusionPassenger
         if system(filename)
           return dir
         else
-          attempts << { :dir => dir,
-            :error => "This directory's filesystem is mounted with the 'noexec' option." }
+          attempts << { dir: dir,
+            error: "This directory's filesystem is mounted with the 'noexec' option." }
         end
       rescue Errno::ENOENT
-        attempts << { :dir => dir, :error => "This directory doesn't exist." }
+        attempts << { dir: dir, error: "This directory doesn't exist." }
       rescue Errno::EACCES
-        attempts << { :dir => dir, :error => "This program doesn't have permission to write to this directory." }
+        attempts << { dir: dir, error: "This program doesn't have permission to write to this directory." }
       rescue SystemCallError => e
-        attempts << { :dir => dir, :error => e.message }
+        attempts << { dir: dir, error: e.message }
       ensure
         File.unlink(filename) rescue nil
       end
@@ -331,9 +332,9 @@ module PhusionPassenger
 
     def self.rb_config
       if defined?(::RbConfig)
-        return ::RbConfig::CONFIG
+        ::RbConfig::CONFIG
       else
-        return ::Config::CONFIG
+        ::Config::CONFIG
       end
     end
 
@@ -355,9 +356,9 @@ module PhusionPassenger
       end
       if name =~ /^\//
         if File.executable?(name)
-          return name
+          name
         else
-          return nil
+          nil
         end
       else
         ENV['PATH'].to_s.split(File::PATH_SEPARATOR).each do |directory|
@@ -367,14 +368,14 @@ module PhusionPassenger
             return path
           end
         end
-        return nil
+        nil
       end
     end
 
     def self.find_all_commands(name)
       search_dirs = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
-      search_dirs.concat(%w(/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin))
-      ["/opt/*/bin", "/opt/*/sbin", "/usr/local/*/bin", "/usr/local/*/sbin"].each do |glob|
+      search_dirs.concat(%w[/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin])
+      [ "/opt/*/bin", "/opt/*/sbin", "/usr/local/*/bin", "/usr/local/*/sbin" ].each do |glob|
         search_dirs.concat(Dir[glob])
       end
 
@@ -406,7 +407,7 @@ module PhusionPassenger
           result << path
         end
       end
-      return result
+      result
     end
 
     # Check whether the specified command is in $PATH or in
@@ -416,7 +417,7 @@ module PhusionPassenger
     def self.find_system_command(name)
       result = find_command(name)
       if result.nil?
-        ['/sbin', '/usr/sbin', '/usr/local/sbin'].each do |dir|
+        [ '/sbin', '/usr/sbin', '/usr/local/sbin' ].each do |dir|
           path = File.join(dir, name)
           if File.file?(path) && File.executable?(path)
             return path

data/src/ruby_supportlib/phusion_passenger/plugin.rb

@@ -60,7 +60,7 @@ module PhusionPassenger
           last_result = callback.call(*args, &block)
         end
       end
-      return last_result
+      last_result
     end
 
     def self.register(name, klass)
@@ -76,7 +76,7 @@ module PhusionPassenger
           klass.new(*args, &block)
         end
       else
-        return nil
+        nil
       end
     end
 
@@ -89,7 +89,7 @@ module PhusionPassenger
           end
         end
       end
-      return last_result
+      last_result
     end
   end
 

data/src/ruby_supportlib/phusion_passenger/preloader_shared_helpers.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2011-2025 Asynchronous B.V.
 #
@@ -69,8 +70,8 @@ module PhusionPassenger
         doc = Utils::JSON.parse(line)
       rescue RuntimeError => e
         client.write(Utils::JSON.generate(
-          :result => 'error',
-          :message => "JSON parse error: #{e}"
+          result: 'error',
+          message: "JSON parse error: #{e}"
         ))
       end
 
@@ -78,8 +79,8 @@ module PhusionPassenger
         handle_spawn_command(client, doc, options)
       else
         client.write(Utils::JSON.generate(
-          :result => 'error',
-          :message => "Unknown command #{doc['command'].inspect}"
+          result: 'error',
+          message: "Unknown command #{doc['command'].inspect}"
         ))
         nil
       end
@@ -119,13 +120,13 @@ module PhusionPassenger
             'STEP_PERFORMED', work_dir)
           LoaderSharedHelpers.run_block_and_record_step_progress('PRELOADER_SEND_RESPONSE', work_dir) do
             client.write(Utils::JSON.generate(
-              :result => 'ok',
-              :pid => Process.pid
+              result: 'ok',
+              pid: Process.pid
             ))
           end
           LoaderSharedHelpers.record_journey_step_end('PRELOADER_FINISH',
             'STEP_PERFORMED', work_dir)
-          [:forked, work_dir]
+          [ :forked, work_dir ]
         rescue Exception => e
           STDERR.puts("Error: #{e}\n#{e.backtrace.join("\n")}")
           exit!(1)
@@ -139,14 +140,14 @@ module PhusionPassenger
 
     def advertise_sockets(_options, server)
       json = {
-        :sockets => [
+        sockets: [
           {
-            :name => 'main',
-            :address => "unix:#{server[1]}",
-            :protocol => 'preloader',
-            :concurrency => 1
-          }
-        ]
+            name: 'main',
+            address: "unix:#{server[1]}",
+            protocol: 'preloader',
+            concurrency: 1,
+          },
+        ],
       }
 
       File.open(ENV['PASSENGER_SPAWN_WORK_DIR'] + '/response/properties.json', 'w') do |f|
@@ -162,7 +163,7 @@ module PhusionPassenger
         # We call ::select just in case someone overwrites the global select()
         # function by including ActionView::Helpers in the wrong place.
         # https://code.google.com/p/phusion-passenger/issues/detail?id=915
-        ios = Kernel.select([server_socket, STDIN])[0]
+        ios = Kernel.select([ server_socket, STDIN ])[0]
         if ios.include?(server_socket)
           result, subprocess_work_dir = accept_and_process_next_client(server_socket, options)
           if result == :forked

data/src/ruby_supportlib/phusion_passenger/public_api.rb

@@ -57,7 +57,7 @@ module PhusionPassenger
 
   private
     def callback_list_for_event(name)
-      return case name
+      case name
       when :starting_worker_process
         @@event_starting_worker_process
       when :stopping_worker_process

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

@@ -45,7 +45,7 @@ module PhusionPassenger
 
       private
       def build_args(options)
-        args = ['-e', environment]
+        args = [ '-e', environment ]
         args << '-p' << options[:Port].to_s if options[:Port]
         args << '-a' << options[:Host].to_s if options[:Host]
         args << '-R' << options[:config].to_s if options[:config]

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

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2012-2025 Asynchronous B.V.
 #
@@ -66,7 +67,7 @@ module PhusionPassenger
           raise "Unrecognized Out-Of-Band GC strategy #{@strategy.inspect}"
         end
 
-        [status, headers, body]
+        [ status, headers, body ]
       end
 
     private
@@ -123,9 +124,9 @@ module PhusionPassenger
 
       def initialize_legacy(frequency, logger = nil)
         initialize_with_options(
-          :strategy => :counting,
-          :frequency => frequency,
-          :logger => logger)
+          strategy: :counting,
+          frequency: frequency,
+          logger: logger)
       end
     end
 

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

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -41,7 +42,7 @@ module PhusionPassenger
     module ThreadHandlerExtension
       # Constants which exist to relieve Ruby's garbage collector.
       RACK_VERSION       = "rack.version"        # :nodoc:
-      RACK_VERSION_VALUE = [1, 3]                # :nodoc:
+      RACK_VERSION_VALUE = [ 1, 3 ]                # :nodoc:
       RACK_INPUT         = "rack.input"          # :nodoc:
       RACK_ERRORS        = "rack.errors"         # :nodoc:
       RACK_MULTITHREAD   = "rack.multithread"    # :nodoc:
@@ -56,9 +57,9 @@ module PhusionPassenger
       SCRIPT_NAME        = "SCRIPT_NAME"         # :nodoc:
       REQUEST_METHOD = "REQUEST_METHOD"          # :nodoc:
       TRANSFER_ENCODING_HEADER  = "Transfer-Encoding"   # :nodoc:
-      TRANSFER_ENCODING_HEADERS = ["Transfer-Encoding", "Transfer-encoding", "transfer-encoding"] # :nodoc:
+      TRANSFER_ENCODING_HEADERS = [ "Transfer-Encoding", "Transfer-encoding", "transfer-encoding" ] # :nodoc:
       CONTENT_LENGTH_HEADER     = "Content-Length"      # :nodoc:
-      CONTENT_LENGTH_HEADERS    = ["Content-Length", "Content-length", "content-length"] # :nodoc:
+      CONTENT_LENGTH_HEADERS    = [ "Content-Length", "Content-length", "content-length" ] # :nodoc:
       X_SENDFILE_HEADER         = "X-Sendfile"          # :nodoc:
       X_ACCEL_REDIRECT_HEADER   = "X-Accel-Redirect"    # :nodoc:
       CONTENT_LENGTH_HEADER_AND_SEPARATOR      = "Content-Length: " # :nodoc
@@ -191,7 +192,7 @@ module PhusionPassenger
         # can respond to #each.
         output_body = should_output_body?(status, is_head_request)
         if body.is_a?(String)
-          body = [body]
+          body = [ body ]
         elsif body.nil?
           body = []
         elsif output_body && body.is_a?(Array)
@@ -342,7 +343,7 @@ module PhusionPassenger
 
       def generate_headers_array(status, headers)
         status_str = status.to_s
-        result = ["HTTP/1.1 #{status_str} Whatever\r\n"]
+        result = [ "HTTP/1.1 #{status_str} Whatever\r\n" ]
         headers.each do |key, values|
           if values.is_a?(String)
             values = values.split(NEWLINE)
@@ -362,7 +363,7 @@ module PhusionPassenger
             result << CRLF
           end
         end
-        return result
+        result
       end
 
       def lookup_header(haystack, needles)
@@ -383,7 +384,7 @@ module PhusionPassenger
       end
 
       def chunk_data(data, size)
-        [size.to_s(16), CRLF, data, CRLF]
+        [ size.to_s(16), CRLF, data, CRLF ]
       end
 
       # Called when body is written out successfully. Indicates that we should

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

@@ -31,7 +31,6 @@ PhusionPassenger.require_passenger_lib 'utils/unseekable_socket'
 
 module PhusionPassenger
   class RequestHandler
-
     # This class encapsulates the logic of a single RequestHandler thread.
     class ThreadHandler
       include DebugLogging
@@ -223,14 +222,14 @@ module PhusionPassenger
         if @connect_password && headers[PASSENGER_CONNECT_PASSWORD] != @connect_password
           warn "*** Passenger RequestHandler warning: " <<
                "someone tried to connect with an invalid connect password."
-          return
+          nil
         else
-          return headers
+          headers
         end
       rescue SecurityError => e
         warn("*** Passenger RequestHandler warning: " <<
              "HTTP header size exceeded maximum.")
-        return
+        nil
       end
 
       # Like parse_session_request, but parses an HTTP request. This is a very minimalistic
@@ -274,7 +273,7 @@ module PhusionPassenger
             headers["REMOTE_PORT"],
             headers["REMOTE_ADDR"]     = connection.to_io.is_a?(TCPSocket) ?
                                            connection.to_io.peeraddr(:numeric)[1..2] :
-                                           [nil, '127.0.0.1']
+                                           [ nil, '127.0.0.1' ]
 
           else
             header, value = line.split(/\s*:\s*/, 2)
@@ -291,12 +290,12 @@ 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."
-          return
+          nil
         else
-          return headers
+          headers
         end
       rescue EOFError
-        return
+        nil
       end
 
       def process_ping(env, connection)
@@ -342,13 +341,12 @@ module PhusionPassenger
 
       def should_reraise_error?(e)
         # Stubable by unit tests.
-        return true
+        true
       end
 
       def should_swallow_app_error?(e, socket_wrapper)
-        return socket_wrapper && socket_wrapper.source_of_exception?(e) && [Errno::EPIPE, Errno::ECONNRESET].any?{|er| e.is_a?(er)}
+        socket_wrapper && socket_wrapper.source_of_exception?(e) && [ Errno::EPIPE, Errno::ECONNRESET ].any? { |er| e.is_a?(er) }
       end
     end
-
   end # class RequestHandler
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/request_handler.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -102,19 +103,19 @@ module PhusionPassenger
         @main_socket_address, @main_socket = create_tcp_socket(options)
       end
       @server_sockets[:main] = {
-        :address     => @main_socket_address,
-        :socket      => @main_socket,
-        :protocol    => @force_http_session ? :http : :session,
-        :concurrency => @concurrency,
-        :accept_http_requests => true
+        address: @main_socket_address,
+        socket: @main_socket,
+        protocol: @force_http_session ? :http : :session,
+        concurrency: @concurrency,
+        accept_http_requests: true,
       }
 
       @http_socket_address, @http_socket = create_tcp_socket(options)
       @server_sockets[:http] = {
-        :address     => @http_socket_address,
-        :socket      => @http_socket,
-        :protocol    => :http,
-        :concurrency => 1
+        address: @http_socket_address,
+        socket: @http_socket,
+        protocol: :http,
+        concurrency: 1,
       }
 
       @owner_pipe = owner_pipe
@@ -272,7 +273,7 @@ module PhusionPassenger
       # can easily reactivate the workaround. Or maybe if we just need
       # TCP sockets for some other reason.
 
-      #return RUBY_PLATFORM !~ /darwin/
+      # return RUBY_PLATFORM !~ /darwin/
 
       ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
       # Unix domain socket implementation on JRuby
@@ -282,7 +283,7 @@ module PhusionPassenger
       # 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?
+      !@force_http_session && ruby_engine != "jruby" && !PlatformInfo.windows_subsystem?
     end
 
     def create_unix_socket_on_filesystem(options)
@@ -308,7 +309,7 @@ module PhusionPassenger
         socket.sync = true
         socket.close_on_exec!
         File.chmod(0600, socket_address)
-        ["unix:#{socket_address}", socket]
+        [ "unix:#{socket_address}", socket ]
       end
     end
 
@@ -323,7 +324,7 @@ module PhusionPassenger
       socket.sync = true
       socket.close_on_exec!
       socket_address = "tcp://#{bind_address}:#{socket.addr[1]}"
-      return [socket_address, socket]
+      [ socket_address, socket ]
     end
 
     # Reset signal handlers to their default handler, and install some
@@ -369,22 +370,22 @@ module PhusionPassenger
 
     def start_threads
       common_options = {
-        :app              => @app,
-        :app_group_name   => @app_group_name,
-        :connect_password => @connect_password,
-        :keepalive_enabled  => @keepalive
+        app: @app,
+        app_group_name: @app_group_name,
+        connect_password: @connect_password,
+        keepalive_enabled: @keepalive,
       }
       main_socket_options = common_options.merge(
-        :server_socket => @main_socket,
-        :socket_name => "main socket",
-        :protocol => @server_sockets[:main][:protocol] == :session ?
+        server_socket: @main_socket,
+        socket_name: "main socket",
+        protocol: @server_sockets[:main][:protocol] == :session ?
           :session :
           :http
       )
       http_socket_options = common_options.merge(
-        :server_socket => @http_socket,
-        :socket_name => "HTTP socket",
-        :protocol => :http
+        server_socket: @http_socket,
+        socket_name: "HTTP socket",
+        protocol: :http
       )
 
       # Used for marking threads that have finished initializing,
@@ -470,7 +471,7 @@ module PhusionPassenger
           end
         end
         begin
-          ios = select([owner_pipe_watcher[0], @graceful_termination_pipe[0]])[0]
+          ios = select([ owner_pipe_watcher[0], @graceful_termination_pipe[0] ])[0]
           if ios.include?(owner_pipe_watcher[0])
             trace(2, "Owner pipe closed")
           else
@@ -483,7 +484,7 @@ module PhusionPassenger
           owner_pipe_watcher[1].close if !owner_pipe_watcher[1].closed?
         end
       else
-        ios = select([@owner_pipe, @graceful_termination_pipe[0]])[0]
+        ios = select([ @owner_pipe, @graceful_termination_pipe[0] ])[0]
         if ios.include?(@owner_pipe)
           trace(2, "Owner pipe closed")
         else
@@ -529,7 +530,7 @@ module PhusionPassenger
           debug("Error shutting down HTTP thread (#{address}): #{e} (#{e.class})")
         end
       end
-      return threads
+      threads
     end
 
     def terminate_threads

data/src/ruby_supportlib/phusion_passenger/ruby_core_enhancements.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -55,7 +56,7 @@ class Exception
     if thread_name = current_thread[:name]
       thread_name = "(#{thread_name})"
     end
-    return "*** Exception #{self.class} #{location}" <<
+    "*** Exception #{self.class} #{location}" <<
       "(#{self}) (process #{$$}, thread #{thread_id}#{thread_name}):\n" <<
       "\tfrom " << backtrace.join("\n\tfrom ")
   end
@@ -108,11 +109,11 @@ class File
   # do that too. This method fixes that by using Dir.logical_pwd.
   if File.respond_to?(:absolute_path)
     def self.absolute_logical_path(path, base = Dir.logical_pwd)
-      return File.absolute_path(path, base)
+      File.absolute_path(path, base)
     end
   else
     def self.absolute_logical_path(path, base = Dir.logical_pwd)
-      return File.expand_path(path, base)
+      File.expand_path(path, base)
     end
   end
 end
@@ -152,7 +153,7 @@ module Signal
     # See https://github.com/phusion/passenger/issues/2489 for details.
     result.delete("PROF")
 
-    return result
+    result
   end
 end
 
@@ -161,7 +162,7 @@ module GC
     # Checks whether the current Ruby interpreter's garbage
     # collector is copy-on-write friendly.
     def self.copy_on_write_friendly?
-      return false
+      false
     end
   end
 end