passenger 6.1.3 → 6.1.5

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

@@ -29,10 +29,10 @@ module PhusionPassenger
   # Core of the `passenger` command (Passenger Standalone). Dispatches a subcommand to a specific class.
   module Standalone
     KNOWN_COMMANDS = [
-      ["start", "StartCommand"],
-      ["stop", "StopCommand"],
-      ["status", "StatusCommand"],
-      ["version", "VersionCommand"]
+      [ "start", "StartCommand" ],
+      [ "stop", "StopCommand" ],
+      [ "status", "StatusCommand" ],
+      [ "version", "VersionCommand" ],
     ]
 
     def self.run!(argv)
@@ -69,15 +69,15 @@ module PhusionPassenger
 
   private
     def self.help_requested?(argv)
-      return argv.size == 1 && (argv[0] == "--help" || argv[0] == "-h" || argv[0] == "help")
+      argv.size == 1 && (argv[0] == "--help" || argv[0] == "-h" || argv[0] == "help")
     end
 
     def self.version_requested?(argv)
-      return argv.size == 1 && (argv[0] == "--version" || argv[0] == "-v")
+      argv.size == 1 && (argv[0] == "--version" || argv[0] == "-v")
     end
 
     def self.show_version
-      command_class, new_argv = lookup_command_class_by_argv(["version"])
+      command_class, new_argv = lookup_command_class_by_argv([ "version" ])
       command_class.new(new_argv).run
     end
 
@@ -86,18 +86,18 @@ module PhusionPassenger
 
       # Convert "passenger help <COMMAND>" to "passenger <COMMAND> --help".
       if argv.size == 2 && argv[0] == "help"
-        argv = [argv[1], "--help"]
+        argv = [ argv[1], "--help" ]
       end
 
       KNOWN_COMMANDS.each do |props|
         if argv[0] == props[0]
           command_class = lookup_command_class_by_class_name(props[1])
           new_argv = argv[1 .. -1]
-          return [command_class, new_argv]
+          return [ command_class, new_argv ]
         end
       end
 
-      return nil
+      nil
     end
 
     def self.lookup_command_class_by_class_name(class_name)
@@ -107,7 +107,7 @@ module PhusionPassenger
       base_name.sub!(/^_/, '')
       base_name << ".rb"
       PhusionPassenger.require_passenger_lib("standalone/#{base_name}")
-      return PhusionPassenger::Standalone.const_get(class_name)
+      PhusionPassenger::Standalone.const_get(class_name)
     end
   end
 

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2014-2025 Asynchronous B.V.
 #
@@ -34,7 +35,6 @@ PhusionPassenger.require_passenger_lib 'utils/json'
 module PhusionPassenger
   module Standalone
     class StartCommand
-
       module BuiltinEngine
       private
         def start_engine_real
@@ -97,7 +97,7 @@ module PhusionPassenger
             end
           end
 
-          command << "#{@agent_exe} watchdog";
+          command << "#{@agent_exe} watchdog"
           command << " --passenger-root #{Shellwords.escape PhusionPassenger.install_spec}"
           command << " --daemonize"
           command << " --no-user-switching"
@@ -195,27 +195,27 @@ module PhusionPassenger
           command << " --EC --BU"
           add_param(command, :core_file_descriptor_ulimit, "--core-file-descriptor-ulimit")
 
-          return {
-            :identifier    => "#{AGENT_EXE} watchdog",
-            :start_command => command,
-            :ping_command  => ping_spec,
-            :pid_file      => @options[:pid_file],
-            :log_file      => @options[:log_file],
-            :start_timeout => 25,
-            :stop_timeout  => @options[:stop_timeout]
+          {
+            identifier: "#{AGENT_EXE} watchdog",
+            start_command: command,
+            ping_command: ping_spec,
+            pid_file: @options[:pid_file],
+            log_file: @options[:log_file],
+            start_timeout: 25,
+            stop_timeout: @options[:stop_timeout],
           }
         end
 
         def listen_address(options = @options, for_ping_port = false)
           if options[:socket_file]
-            return "unix:#{options[:socket_file]}"
+            "unix:#{options[:socket_file]}"
           else
-            return "tcp://" + compose_ip_and_port(options[:address], options[:port])
+            "tcp://" + compose_ip_and_port(options[:address], options[:port])
           end
         end
 
         def prestart_urls_json
-          PhusionPassenger::Utils::JSON.generate([listen_url(@apps[0])])
+          PhusionPassenger::Utils::JSON.generate([ listen_url(@apps[0]) ])
         end
 
         def add_param(command, option_name, param_name)
@@ -274,7 +274,6 @@ module PhusionPassenger
 
         #####################
       end # module BuiltinEngine
-
     end # module StartCommand
   end # module Standalone
 end # module PhusionPassenger

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

@@ -35,7 +35,6 @@ PhusionPassenger.require_passenger_lib 'utils/json'
 module PhusionPassenger
   module Standalone
     class StartCommand
-
       module NginxEngine
       private
         def start_engine_real
@@ -121,7 +120,7 @@ module PhusionPassenger
               "message returned by the Nginx engine is:\n\n" \
               "#{output}\n\n"
             debug_log_file = Utils::TmpIO.new('passenger-standalone',
-              :suffix => '.log', :binary => true, :unlink_immediately => false)
+              suffix: '.log', binary: true, unlink_immediately: false)
             begin
               File.open(path, 'rb') do |f|
                 debug_log_file.write(f.read)
@@ -149,31 +148,31 @@ module PhusionPassenger
 
         def build_daemon_controller_options
           if @options[:socket_file]
-            ping_spec = [:unix, @options[:socket_file]]
+            ping_spec = [ :unix, @options[:socket_file] ]
           else
-            ping_spec = [:tcp, @options[:address], @options[:port]]
+            ping_spec = [ :tcp, @options[:address], @options[:port] ]
           end
-          return {
-            :identifier    => 'Nginx',
-            :start_command => "#{Shellwords.escape @nginx_binary} " \
+          {
+            identifier: 'Nginx',
+            start_command: "#{Shellwords.escape @nginx_binary} " \
               "-c #{Shellwords.escape nginx_config_path} " \
               "-p #{Shellwords.escape @working_dir}",
-            :stop_command => "#{Shellwords.escape @nginx_binary} " \
+            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],
-            :start_timeout => 25,
-            :stop_timeout  => @options[:stop_timeout],
-            :log_file_activity_timeout => 12,
-            :dont_stop_if_pid_file_invalid => true
+            ping_command: ping_spec,
+            pid_file: @options[:pid_file],
+            log_file: @options[:log_file],
+            start_timeout: 25,
+            stop_timeout: @options[:stop_timeout],
+            log_file_activity_timeout: 12,
+            dont_stop_if_pid_file_invalid: true,
           }
         end
 
         def nginx_config_path
-          return "#{@working_dir}/nginx.conf"
+          "#{@working_dir}/nginx.conf"
         end
 
         def write_nginx_config_file(path)
@@ -200,15 +199,15 @@ module PhusionPassenger
 
         def nginx_config_template_filename
           if @options[:nginx_config_template]
-            return @options[:nginx_config_template]
+            @options[:nginx_config_template]
           else
-            return File.join(PhusionPassenger.resources_dir,
+            File.join(PhusionPassenger.resources_dir,
               "templates", "standalone", "config.erb")
           end
         end
 
         def debugging?
-          return ENV['PASSENGER_DEBUG'] && !ENV['PASSENGER_DEBUG'].empty?
+          ENV['PASSENGER_DEBUG'] && !ENV['PASSENGER_DEBUG'].empty?
         end
 
         def next_eoutvar
@@ -238,7 +237,7 @@ module PhusionPassenger
         def default_group_for(username)
           user = Etc.getpwnam(username)
           group = Etc.getgrgid(user.gid)
-          return group.name
+          group.name
         end
 
         def nginx_http_option(option_name)
@@ -318,7 +317,7 @@ module PhusionPassenger
         def default_group_for(username)
           user = Etc.getpwnam(username)
           group = Etc.getgrgid(user.gid)
-          return group.name
+          group.name
         end
 
         def serialize_strset(*items)
@@ -328,12 +327,11 @@ module PhusionPassenger
           else
             null  = "\0"
           end
-          return [items.join(null)].pack('m*').gsub("\n", "").strip
+          [ items.join(null) ].pack('m*').gsub("\n", "").strip
         end
 
         #####################
       end # module NginxEngine
-
     end # module StartCommand
   end # module Standalone
 end # module PhusionPassenger

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

@@ -235,7 +235,7 @@ module PhusionPassenger
           # quickly switches to a mirror.
           "--connect-timeout", "0",
           "--engine", @options[:engine],
-          "--idle-timeout", "0"
+          "--idle-timeout", "0",
         ]
         if @options[:auto]
           args << "--auto"
@@ -398,13 +398,13 @@ module PhusionPassenger
       end
 
       def touch_temp_dir_in_background
-        command = [@agent_exe,
+        command = [ @agent_exe,
           "temp-dir-toucher",
           @working_dir,
           "--cleanup",
           "--daemonize",
           "--pid-file", "#{@working_dir}/temp_dir_toucher.pid",
-          "--log-file", @options[:log_file]]
+          "--log-file", @options[:log_file] ]
         command << "--user" << @options[:user] unless @options[:user].nil?
         command << "--nginx-pid" << @engine.pid.to_s if @options[:engine] == 'nginx'
         result = system(*command)
@@ -487,7 +487,7 @@ module PhusionPassenger
       end
 
       def should_wait_until_engine_has_exited?
-        return !@options[:daemonize] || @app_finder.multi_mode?
+        !@options[:daemonize] || @app_finder.multi_mode?
       end
 
 

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

@@ -110,11 +110,11 @@ module PhusionPassenger
       def create_controller
         Standalone::ControlUtils.require_daemon_controller
         @controller = DaemonController.new(
-          :identifier    => "#{PROGRAM_NAME} Standalone engine",
-          :start_command => "true", # Doesn't matter
-          :ping_command  => "true", # Doesn't matter
-          :pid_file      => @options[:pid_file],
-          :log_file      => "/dev/null"
+          identifier: "#{PROGRAM_NAME} Standalone engine",
+          start_command: "true", # Doesn't matter
+          ping_command: "true", # Doesn't matter
+          pid_file: @options[:pid_file],
+          log_file: "/dev/null"
         )
       end
     end

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

@@ -126,12 +126,12 @@ module PhusionPassenger
       def create_controller
         Standalone::ControlUtils.require_daemon_controller
         @controller = DaemonController.new(
-          :identifier    => "#{PROGRAM_NAME} Standalone engine",
-          :start_command => "true", # Doesn't matter
-          :ping_command  => "true", # Doesn't matter
-          :pid_file      => @options[:pid_file],
-          :log_file      => "/dev/null",
-          :stop_timeout  => @options[:stop_timeout]
+          identifier: "#{PROGRAM_NAME} Standalone engine",
+          start_command: "true", # Doesn't matter
+          ping_command: "true", # Doesn't matter
+          pid_file: @options[:pid_file],
+          log_file: "/dev/null",
+          stop_timeout: @options[:stop_timeout]
         )
       end
     end

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

@@ -30,7 +30,7 @@ module PhusionPassenger
 
     class VersionCommand < Command
       def run
-        command = PhusionPassenger::Config::AboutCommand.new(['version'])
+        command = PhusionPassenger::Config::AboutCommand.new([ 'version' ])
         command.run
       end
     end

data/src/ruby_supportlib/phusion_passenger/utils/download.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2013-2025 Asynchronous B.V.
 #
@@ -63,8 +64,8 @@ module PhusionPassenger
       #                  Set to nil to disable this timeout. Default: nil.
       def download(url, output, options = {})
         options = {
-          :connect_timeout => 4,
-          :idle_timeout    => 5
+          connect_timeout: 4,
+          idle_timeout: 5,
         }.merge(options)
         logger = options[:logger] || Logger.new(STDERR)
 
@@ -78,22 +79,22 @@ module PhusionPassenger
         end
 
         if PlatformInfo.find_command("curl")
-          return download_with_curl(logger, url, output, options)
+          download_with_curl(logger, url, output, options)
         elsif PlatformInfo.find_command("wget")
-          return download_with_wget(logger, url, output, options)
+          download_with_wget(logger, url, output, options)
         else
           logger.error "Could not download #{url}: no download tool found (curl or wget required)"
-          return false
+          false
         end
       end
 
     private
       def basename_from_url(url)
-        return url.sub(/.*\//, '')
+        url.sub(/.*\//, '')
       end
 
       def download_with_curl(logger, url, output, options)
-        command = ["curl", "-f", "-L", "-o", output]
+        command = [ "curl", "-f", "-L", "-o", output ]
         if options[:show_progress]
           command << "-#"
         else
@@ -167,15 +168,15 @@ module PhusionPassenger
           end
         end
 
-        return result
+        result
       end
 
       def remove_curl_output_prefix(line)
-        return line.gsub(/^curl: (\([0-9]+\) )?/, '')
+        line.gsub(/^curl: (\([0-9]+\) )?/, '')
       end
 
       def download_with_wget(logger, url, output, options)
-        command = ["wget", "--tries=1", "-O", output]
+        command = [ "wget", "--tries=1", "-O", output ]
         if !options[:show_progress]
           command << "-nv"
         end
@@ -219,7 +220,7 @@ module PhusionPassenger
           end
         end
 
-        return result
+        result
       end
     end
 

data/src/ruby_supportlib/phusion_passenger/utils/file_system_watcher.rb

@@ -64,11 +64,11 @@ module PhusionPassenger
           filenames = filenames.map do |filename|
             filename.to_s
           end
-          return _new(filenames, termination_pipe)
+          _new(filenames, termination_pipe)
         end
 
         def self.opens_files?
-          return true
+          true
         end
       end
     else
@@ -76,7 +76,7 @@ module PhusionPassenger
         attr_accessor :poll_interval
 
         def self.opens_files?
-          return false
+          false
         end
 
         def initialize(filenames, termination_pipe = nil)
@@ -107,7 +107,7 @@ module PhusionPassenger
           while true
             if changed?
               return true
-            elsif select([@termination_pipe], nil, nil, @poll_interval)
+            elsif select([ @termination_pipe ], nil, nil, @poll_interval)
               return nil
             end
           end
@@ -151,9 +151,9 @@ module PhusionPassenger
               end
             end
 
-            return count != @subfiles.size
+            count != @subfiles.size
           rescue Errno::EACCES, Errno::ENOENT
-            return true
+            true
           end
         end
 
@@ -170,14 +170,14 @@ module PhusionPassenger
             else
               mtime_changed = false
             end
-            return @stat.ino != new_stat.ino || @stat.ftype != new_stat.ftype || mtime_changed
+            @stat.ino != new_stat.ino || @stat.ftype != new_stat.ftype || mtime_changed
           rescue Errno::EACCES, Errno::ENOENT
-            return true
+            true
           end
         end
 
         def changed?
-          return @dirs.any?  { |dir_info| dir_info.changed? } ||
+          @dirs.any?  { |dir_info| dir_info.changed? } ||
                  @files.any? { |file_info| file_info.changed? }
         end
       end

data/src/ruby_supportlib/phusion_passenger/utils/hosts_file_parser.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -47,24 +48,24 @@ module PhusionPassenger
       end
 
       def ip_count
-        return @ips.size
+        @ips.size
       end
 
       def host_count
-        return @host_names.size
+        @host_names.size
       end
 
       def resolve(host_name)
         if host_name.downcase == "localhost"
-          return "127.0.0.1"
+          "127.0.0.1"
         else
-          return @host_names[host_name.downcase]
+          @host_names[host_name.downcase]
         end
       end
 
       def resolves_to_localhost?(hostname)
         ip = resolve(hostname)
-        return ip == "127.0.0.1" || ip == "::1" || ip == "0.0.0.0"
+        ip == "127.0.0.1" || ip == "::1" || ip == "0.0.0.0"
       end
 
       def add_group_data(marker, data)
@@ -113,7 +114,7 @@ module PhusionPassenger
         line = line.strip
         return nil if line.empty?
         ip, *host_names = line.split(/[ \t]+/)
-        return [ip, host_names]
+        [ ip, host_names ]
       end
 
       def find_line(start_index, content)
@@ -125,7 +126,7 @@ module PhusionPassenger
             i += 1
           end
         end
-        return nil
+        nil
       end
     end
 

data/src/ruby_supportlib/phusion_passenger/utils/json.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #
 ## Stupid small pure Ruby JSON parser & generator.
 #
@@ -55,7 +56,7 @@ class JSON
   def_delegators :scanner, :scan, :matched
   private :s, :scan, :matched
 
-  def initialize data
+  def initialize(data)
     @scanner = PhusionPassenger::Utils::StringScanner.new data.to_s
   end
 
@@ -105,7 +106,7 @@ class JSON
     ary
   end
 
-  SPEC = {'b' => "\b", 'f' => "\f", 'n' => "\n", 'r' => "\r", 't' => "\t"}
+  SPEC = { 'b' => "\b", 'f' => "\f", 'n' => "\n", 'r' => "\r", 't' => "\t" }
   UNI = 'u'; CODE = /[a-fA-F0-9]{4}/
   STR = /"/; STE = '"'
   ESC = '\\'
@@ -133,7 +134,7 @@ class JSON
     raise "parse error at: #{scan(/.{1,20}/m).inspect}"
   end
 
-  def repeat_until reg
+  def repeat_until(reg)
     until scan(reg)
       pos = s.pos
       yield
@@ -157,7 +158,7 @@ class JSON
       end
     end
 
-    ESC_MAP = Hash.new {|h,k| k }.update \
+    ESC_MAP = Hash.new { |h, k| k }.update \
       "\r" => 'r',
       "\n" => 'n',
       "\f" => 'f',
@@ -167,7 +168,7 @@ class JSON
     def quote(str) %("#{str}") end
 
     def generate_String(str)
-      quote str.gsub(/[\r\n\f\t\b"\\]/) { "\\#{ESC_MAP[$&]}"}
+      quote str.gsub(/[\r\n\f\t\b"\\]/) { "\\#{ESC_MAP[$&]}" }
     end
 
     def generate_VersionComparer(vc)
@@ -188,7 +189,7 @@ class JSON
 
     def generate_NilClass(*) 'null' end
 
-    def generate_Array(ary) '[%s]' % ary.map {|o| generate_type(o) }.join(', ') end
+    def generate_Array(ary) '[%s]' % ary.map { |o| generate_type(o) }.join(', ') end
 
     def generate_Hash(hash)
       '{%s}' % hash.map { |key, value|

data/src/ruby_supportlib/phusion_passenger/utils/native_support_utils.rb

@@ -35,12 +35,12 @@ module PhusionPassenger
         # Split the given string into an hash. Keys and values are obtained by splitting the
         # string using the null character as the delimitor.
         def split_by_null_into_hash(data)
-          return PhusionPassenger::NativeSupport.split_by_null_into_hash(data)
+          PhusionPassenger::NativeSupport.split_by_null_into_hash(data)
         end
 
         # Wrapper for getrusage().
         def process_times
-          return PhusionPassenger::NativeSupport.process_times
+          PhusionPassenger::NativeSupport.process_times
         end
       else
         NULL = "\0".freeze
@@ -51,12 +51,12 @@ module PhusionPassenger
         def split_by_null_into_hash(data)
           args = data.split(NULL, -1)
           args.pop
-          return Hash[*args]
+          Hash[*args]
         end
 
         def process_times
           times = Process.times
-          return ProcessTimes.new((times.utime * 1_000_000).to_i,
+          ProcessTimes.new((times.utime * 1_000_000).to_i,
             (times.stime * 1_000_000).to_i)
         end
       end

data/src/ruby_supportlib/phusion_passenger/utils/progress_bar.rb

@@ -25,7 +25,7 @@
 module PhusionPassenger
 
   class ProgressBar
-    THROBBLER = ["-", "\\", "|", "/", "-"]
+    THROBBLER = [ "-", "\\", "|", "/", "-" ]
 
     def initialize(output = STDOUT)
       @output = output

data/src/ruby_supportlib/phusion_passenger/utils/shellwords.rb

@@ -15,7 +15,7 @@ if !Shellwords.respond_to?(:escape)
       # A LF cannot be escaped with a backslash because a backslash + LF
       # combo is regarded as line continuation and simply ignored.
       str.gsub!(/\n/, "'\n'")
-      return str
+      str
     end
   end
 end

data/src/ruby_supportlib/phusion_passenger/utils/strscan.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2024-2025 Asynchronous B.V.
 #

data/src/ruby_supportlib/phusion_passenger/utils/tee_input.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #
 # This file is taken from Unicorn. The following license applies to this file
 # (and this file only, not to the rest of Phusion Passenger):