passenger 6.1.4 → 6.1.5

data/src/ruby_native_extension/extconf.rb

@@ -25,7 +25,7 @@
 # Apple has a habit of getting their Ruby headers wrong, so if we are building using system ruby we need to patch things up, sierra & mojave both did this.
 # eg https://openradar.appspot.com/46465917
 if RUBY_PLATFORM =~ /darwin/ && !File.exist?(RbConfig::CONFIG["rubyarchhdrdir"])
-  RbConfig::CONFIG["rubyarchhdrdir"].sub!(RUBY_PLATFORM.split('-').last, Dir.entries(File.dirname(RbConfig::CONFIG["rubyarchhdrdir"])).reject{|d|d.start_with?(".","ruby")}.first.split('-').last)
+  RbConfig::CONFIG["rubyarchhdrdir"].sub!(RUBY_PLATFORM.split('-').last, Dir.entries(File.dirname(RbConfig::CONFIG["rubyarchhdrdir"])).reject { |d|d.start_with?(".", "ruby") }.first.split('-').last)
 end
 
 require 'mkmf'
@@ -34,12 +34,12 @@ $LIBS << " -lpthread" if $LIBS !~ /-lpthread/
 $CFLAGS << " -g"
 
 if RUBY_PLATFORM =~ /solaris/
-	have_library('xnet')
-	$CFLAGS << " -D_XPG4_2"
-	$CFLAGS << " -D__EXTENSIONS__"
-	if RUBY_PLATFORM =~ /solaris2.9/
-		$CFLAGS << " -D__SOLARIS9__"
-	end
+  have_library('xnet')
+  $CFLAGS << " -D_XPG4_2"
+  $CFLAGS << " -D__EXTENSIONS__"
+  if RUBY_PLATFORM =~ /solaris2.9/
+    $CFLAGS << " -D__SOLARIS9__"
+  end
 end
 
 have_header('alloca.h')
@@ -51,25 +51,24 @@ have_func('rb_thread_io_blocking_region', 'ruby/io.h')
 have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
 
 with_cflags($CFLAGS) do
-	create_makefile('passenger_native_support')
-	if RUBY_PLATFORM =~ /solaris/
-		# Fix syntax error in Solaris /usr/ccs/bin/make.
-		# https://code.google.com/p/phusion-passenger/issues/detail?id=999
-		makefile = File.read("Makefile")
-		makefile.sub!(/^ECHO = .*/, "ECHO = echo")
-		File.open("Makefile", "w") do |f|
-			f.write(makefile)
-		end
-	elsif RUBY_PLATFORM =~ /darwin/
-		# The OS X Clang 503.0.38 update (circa March 15 2014) broke
-		# /usr/bin/ruby's mkmf. mkmf inserts -multiply_definedsuppress
-		# into the Makefile, but that flag is no longer supported by
-		# Clang. We remove this manually.
-		makefile = File.read("Makefile")
-		makefile.sub!(/-multiply_definedsuppress/, "")
-		File.open("Makefile", "w") do |f|
-			f.write(makefile)
-		end
-	end
+  create_makefile('passenger_native_support')
+  if RUBY_PLATFORM =~ /solaris/
+    # Fix syntax error in Solaris /usr/ccs/bin/make.
+    # https://code.google.com/p/phusion-passenger/issues/detail?id=999
+    makefile = File.read("Makefile")
+    makefile.sub!(/^ECHO = .*/, "ECHO = echo")
+    File.open("Makefile", "w") do |f|
+      f.write(makefile)
+    end
+  elsif RUBY_PLATFORM =~ /darwin/
+    # The OS X Clang 503.0.38 update (circa March 15 2014) broke
+    # /usr/bin/ruby's mkmf. mkmf inserts -multiply_definedsuppress
+    # into the Makefile, but that flag is no longer supported by
+    # Clang. We remove this manually.
+    makefile = File.read("Makefile")
+    makefile.sub!(/-multiply_definedsuppress/, "")
+    File.open("Makefile", "w") do |f|
+      f.write(makefile)
+    end
+  end
 end
-

data/src/ruby_supportlib/phusion_passenger/abstract_installer.rb

@@ -72,10 +72,10 @@ module PhusionPassenger
     def run
       before_install
       run_steps
-      return true
+      true
     rescue Abort
       puts
-      return false
+      false
     rescue SignalException, SystemExit
       raise
     rescue PlatformInfo::RuntimeError => e
@@ -100,11 +100,11 @@ module PhusionPassenger
 
 
     def interactive?
-      return !@auto
+      !@auto
     end
 
     def non_interactive?
-      return !interactive?
+      !interactive?
     end
 
 
@@ -130,7 +130,7 @@ module PhusionPassenger
     end
 
     def dependencies
-      return [[], []]
+      [ [], [] ]
     end
 
     def check_dependencies(show_new_screen = true)
@@ -150,7 +150,7 @@ module PhusionPassenger
       end
 
       if runner.check_all
-        return true
+        true
       else
         puts
         puts "<red>Some required software is not installed.</red>"
@@ -176,7 +176,7 @@ module PhusionPassenger
         puts
         puts "  <yellow>#{install_doc_url}</yellow>"
         puts "  <yellow>#{troubleshooting_doc_url}</yellow>"
-        return false
+        false
       end
     end
 
@@ -198,9 +198,9 @@ module PhusionPassenger
          File.stat(PhusionPassenger.build_system_dir).uid == 0
         new_screen
         render_template 'installer_common/gem_install_permission_problems'
-        return false
+        false
       else
-        return true
+        true
       end
     end
 
@@ -215,7 +215,7 @@ module PhusionPassenger
       if !inaccessible_directories.empty?
         new_screen
         render_template 'installer_common/world_inaccessible_directories',
-          :directories => inaccessible_directories
+          directories: inaccessible_directories
         wait
       end
     end
@@ -239,11 +239,11 @@ module PhusionPassenger
       if ram_mb && swap_mb && ram_mb + swap_mb < required
         new_screen
         render_template 'installer_common/low_amount_of_memory_warning',
-          :required => required,
-          :current => ram_mb + swap_mb,
-          :ram => ram_mb,
-          :swap => swap_mb,
-          :install_doc_url => install_doc_url
+          required: required,
+          current: ram_mb + swap_mb,
+          ram: ram_mb,
+          swap: swap_mb,
+          install_doc_url: install_doc_url
         wait
       end
     end
@@ -301,8 +301,8 @@ module PhusionPassenger
     end
 
     def render_template(name, options = {})
-      options.merge!(:colors => @colors)
-      puts ConsoleTextTemplate.new({ :file => name }, options).result
+      options.merge!(colors: @colors)
+      puts ConsoleTextTemplate.new({ file: name }, options).result
     end
 
     def new_screen
@@ -342,7 +342,7 @@ module PhusionPassenger
           done = !block_given? || yield(result)
         end
       end
-      return result
+      result
     rescue Interrupt
       raise Abort
     end
@@ -356,7 +356,7 @@ module PhusionPassenger
           false
         end
       end
-      return result.downcase == 'y'
+      result.downcase == 'y'
     rescue Interrupt
       raise Abort
     end
@@ -378,9 +378,9 @@ module PhusionPassenger
         end
       end
       if result.empty?
-        return default
+        default
       else
-        return result.downcase == 'y'
+        result.downcase == 'y'
       end
     rescue Interrupt
       raise Abort
@@ -406,7 +406,7 @@ module PhusionPassenger
     end
 
     def home_dir
-      return PhusionPassenger.home_dir
+      PhusionPassenger.home_dir
     end
 
 
@@ -414,11 +414,11 @@ module PhusionPassenger
       puts "# #{args.join(' ')}"
       result = system(*args)
       if result
-        return true
+        true
       elsif $?.signaled? && $?.termsig == Signal.list["INT"]
         raise Interrupt
       else
-        return false
+        false
       end
     end
 
@@ -454,7 +454,7 @@ module PhusionPassenger
         logger.formatter = proc { |severity, datetime, progname, msg| "*** #{msg}\n" }
         logger
       end
-      return PhusionPassenger::Utils::Download.download(url, output, options)
+      PhusionPassenger::Utils::Download.download(url, output, options)
     end
 
     def list_parent_directories(dir)
@@ -464,7 +464,7 @@ module PhusionPassenger
       components.size.times do |i|
         dirs << File::SEPARATOR + components[0 .. i].join(File::SEPARATOR)
       end
-      return dirs.reverse
+      dirs.reverse
     end
 
     def world_executable?(dir)
@@ -473,7 +473,7 @@ module PhusionPassenger
       rescue Errno::EACCESS
         return false
       end
-      return stat.mode & 0000001 != 0
+      stat.mode & 0000001 != 0
     end
   end
 

data/src/ruby_supportlib/phusion_passenger/admin_tools/instance.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2014-2025 Asynchronous B.V.
 #
@@ -108,7 +109,7 @@ module PhusionPassenger
           sock.close
         end
 
-        return response
+        response
       end
 
       def watchdog_pid
@@ -229,11 +230,11 @@ module PhusionPassenger
       def process_is_alive?(pid)
         begin
           Process.kill(0, pid)
-          return true
+          true
         rescue Errno::ESRCH
-          return false
+          false
         rescue SystemCallError => e
-          return true
+          true
         end
       end
     end

data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2014-2025 Asynchronous B.V.
 #
@@ -31,12 +32,12 @@ module PhusionPassenger
 
     class InstanceRegistry
       def initialize(paths = nil)
-        @paths = [paths || default_paths].flatten.uniq
+        @paths = [ paths || default_paths ].flatten.uniq
       end
 
       def list(options = {})
         options = {
-          :clean_stale_or_corrupted => true
+          clean_stale_or_corrupted: true,
         }.merge(options)
 
         instances = []
@@ -69,16 +70,16 @@ module PhusionPassenger
       end
 
       def find_by_name(name, options = {})
-        return list(options).find { |instance| instance.name == name }
+        list(options).find { |instance| instance.name == name }
       end
 
       def find_by_name_prefix(name, options = {})
         prefix = /^#{Regexp.escape name}/
         results = list(options).find_all { |instance| instance.name =~ prefix }
         if results.size <= 1
-          return results.first
+          results.first
         else
-          return :ambiguous
+          :ambiguous
         end
       end
 
@@ -87,13 +88,13 @@ module PhusionPassenger
       # return: the matching instance, if found; nil otherwise.
       #
       def find_by_watchdog_pid(pid, options = {})
-        return list(options).detect { |instance| instance.watchdog_pid == pid }
+        list(options).detect { |instance| instance.watchdog_pid == pid }
       end
 
     private
       def default_paths
         if result = string_env("PASSENGER_INSTANCE_REGISTRY_DIR")
-          return [result]
+          return [ result ]
         end
 
         # On OSX, TMPDIR is set to a different value per-user. But Apache
@@ -106,7 +107,7 @@ module PhusionPassenger
         # systemd's PrivateTmp feature works like an inverted OSX, apache gets its own
         # TMPDIR and users use /tmp, however the path is often too long because socket paths can
         # only be up to 108 characters long.
-        [string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg",*Dir['/tmp/systemd-private-*-{httpd,nginx,apache2}.service-*/tmp']].compact
+        [ string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg", *Dir['/tmp/systemd-private-*-{httpd,nginx,apache2}.service-*/tmp'] ].compact
       end
 
       def string_env(name)

data/src/ruby_supportlib/phusion_passenger/admin_tools/memory_stats.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -42,23 +43,23 @@ module PhusionPassenger
         attr_accessor :private_dirty_rss    # in KB
 
         def vm_size_in_mb
-          return sprintf("%.1f MB", vm_size / 1024.0)
+          sprintf("%.1f MB", vm_size / 1024.0)
         end
 
         def rss_in_mb
-          return sprintf("%.1f MB", rss / 1024.0)
+          sprintf("%.1f MB", rss / 1024.0)
         end
 
         def private_dirty_rss_in_mb
           if private_dirty_rss.is_a?(Numeric)
-            return sprintf("%.1f MB", private_dirty_rss / 1024.0)
+            sprintf("%.1f MB", private_dirty_rss / 1024.0)
           else
-            return "?"
+            "?"
           end
         end
 
         def to_a
-          return [pid, ppid, vm_size_in_mb, private_dirty_rss_in_mb, rss_in_mb, name]
+          [ pid, ppid, vm_size_in_mb, private_dirty_rss_in_mb, rss_in_mb, name ]
         end
       end
 
@@ -67,11 +68,11 @@ module PhusionPassenger
       def apache_processes
         @apache_processes ||= begin
           if PlatformInfo.httpd
-            processes = list_processes(:exe => PlatformInfo.httpd)
+            processes = list_processes(exe: PlatformInfo.httpd)
             if processes.empty?
               # On some Linux distros, the Apache worker processes
               # are called "httpd.worker"
-              processes = list_processes(:exe => "#{PlatformInfo.httpd}.worker")
+              processes = list_processes(exe: "#{PlatformInfo.httpd}.worker")
             end
             processes
           else
@@ -83,14 +84,13 @@ module PhusionPassenger
       # Returns a list of Nginx processes, which may be the empty list if
       # Nginx is not running.
       def nginx_processes
-        @nginx_processes ||= list_processes(:exe => "nginx")
+        @nginx_processes ||= list_processes(exe: "nginx")
       end
 
       # Returns a list of Phusion Passenger processes, which may be the empty list if
       # Phusion Passenger is not running.
       def passenger_processes
-        @passenger_processes ||= list_processes(:match =>
-          /((^| )Passenger|(^| )Rails:|(^| )Rack:|wsgi-loader.py|(.*)PassengerAgent|rack-loader.rb)/)
+        @passenger_processes ||= list_processes(match:           /((^| )Passenger|(^| )Rails:|(^| )Rack:|wsgi-loader.py|(.*)PassengerAgent|rack-loader.rb)/)
       end
 
       # Returns the sum of the memory usages of all given processes.
@@ -108,28 +108,28 @@ module PhusionPassenger
               accurate = true
             end
           end
-          return [total, accurate]
+          [ total, accurate ]
         else
           processes.each do |p|
             total += p.rss
           end
-          return [total, true]
+          [ total, true ]
         end
       end
 
       def platform_provides_private_dirty_rss_information?
-        return os_name_simple == "linux"
+        os_name_simple == "linux"
       end
 
       # Returns whether root privileges are required in order to measure private dirty RSS.
       # Only meaningful if #platform_provides_private_dirty_rss_information? returns true.
       def root_privileges_required_for_private_dirty_rss?
         all_processes = (apache_processes || []) + nginx_processes + passenger_processes
-        return all_processes.any?{ |p| p.private_dirty_rss.nil? }
+        all_processes.any? { |p| p.private_dirty_rss.nil? }
       end
 
       def should_show_private_dirty_rss?
-        return platform_provides_private_dirty_rss_information? &&
+        platform_provides_private_dirty_rss_information? &&
           (::Process.euid == 0 || root_privileges_required_for_private_dirty_rss?)
       end
 
@@ -150,7 +150,7 @@ module PhusionPassenger
             line = $1.strip
             used = line.split(/ +/).first.to_i
 
-            [total, used]
+            [ total, used ]
           when "macosx"
             vm_stat = `vm_stat`
             vm_stat =~ /page size of (\d+) bytes/
@@ -172,7 +172,7 @@ module PhusionPassenger
               wired = wired.to_i * page_size / 1024
 
               used = active + wired
-              [free + inactive + used, used]
+              [ free + inactive + used, used ]
             else
               nil
             end
@@ -193,7 +193,7 @@ module PhusionPassenger
               free = to_kb.call($7, $8)
 
               used = active + wired
-              [free + inactive + used, used]
+              [ free + inactive + used, used ]
             else
               nil
             end
@@ -203,7 +203,7 @@ module PhusionPassenger
 
     private
       def os_name_simple
-        return PlatformInfo.os_name_simple
+        PlatformInfo.os_name_simple
       end
 
       # Returns a list of Process objects that match the given search criteria.
@@ -266,7 +266,7 @@ module PhusionPassenger
           p.name.sub!(/ \(ruby\)\Z/, '')
           if p.name !~ /^ps/ && (!options[:match] || p.name.match(options[:match]))
             # Convert some values to integer.
-            [:pid, :ppid, :vm_size, :rss].each do |attr|
+            [ :pid, :ppid, :vm_size, :rss ].each do |attr|
               p.send("#{attr}=", p.send(attr).to_i)
             end
             p.threads = p.threads.to_i if threads_known
@@ -277,7 +277,7 @@ module PhusionPassenger
             processes << p
           end
         end
-        return processes
+        processes
       end
 
       # Returns the private dirty RSS for the given process, in KB.
@@ -290,12 +290,12 @@ module PhusionPassenger
           end
         end
         if total == 0
-          return nil
+          nil
         else
-          return total
+          total
         end
       rescue Errno::EACCES, Errno::ENOENT, Errno::ESRCH
-        return nil
+        nil
       end
 
       if ''.respond_to?(:force_encoding)

data/src/ruby_supportlib/phusion_passenger/admin_tools.rb

@@ -26,22 +26,22 @@ module PhusionPassenger
 
   module AdminTools
     def self.tmpdir
-      ["PASSENGER_INSTANCE_REGISTRY_DIR", "TMPDIR"].each do |name|
+      [ "PASSENGER_INSTANCE_REGISTRY_DIR", "TMPDIR" ].each do |name|
         if ENV.has_key?(name) && !ENV[name].empty?
           return ENV[name]
         end
       end
-      return Dir['/tmp/systemd-private-*-{httpd,nginx}.service-*/tmp'].first || "/tmp"
+      Dir['/tmp/systemd-private-*-{httpd,nginx}.service-*/tmp'].first || "/tmp"
     end
 
     def self.process_is_alive?(pid)
       begin
         Process.kill(0, pid)
-        return true
+        true
       rescue Errno::ESRCH
-        return false
+        false
       rescue SystemCallError => e
-        return true
+        true
       end
     end
   end # module AdminTools