passenger 6.1.4 → 6.1.5

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2013-2025 Asynchronous B.V.
 #
@@ -35,9 +36,9 @@ module PhusionPassenger
 
         def self.create(choice)
           if choice.is_a?(Choice)
-            return choice
+            choice
           else
-            return Choice.new(choice)
+            Choice.new(choice)
           end
         end
 
@@ -74,7 +75,7 @@ module PhusionPassenger
               clear_screen if !done
             end
             if @mode == :single_choice
-              [@pointer, @choices[@pointer].name]
+              [ @pointer, @choices[@pointer].name ]
             else
               nil
             end
@@ -91,11 +92,11 @@ module PhusionPassenger
       end
 
       def [](name)
-        return @index[name]
+        @index[name]
       end
 
       def selected_choices
-        @choices.find_all{ |c| c.checked? }.map{ |c| c.name }
+        @choices.find_all { |c| c.checked? }.map { |c| c.name }
       end
 
     private
@@ -106,7 +107,7 @@ module PhusionPassenger
         @choices.each do |choice|
           index[choice.name] = choice
         end
-        return index
+        index
       end
 
       def process_input
@@ -133,9 +134,9 @@ module PhusionPassenger
         if getchar(STDIN) == "["
           case getchar(STDIN)
           when "A" # up
-            @pointer = [@pointer - 1, 0].max
+            @pointer = [ @pointer - 1, 0 ].max
           when "B" # down
-            @pointer = [@pointer + 1, @choices.size - 1].min
+            @pointer = [ @pointer + 1, @choices.size - 1 ].min
           end
         end
       end
@@ -190,9 +191,9 @@ module PhusionPassenger
 
       def maybe_utf8(utf8, plain)
         if ENV['UTF8_MENUS'] == '0'
-          return plain
+          plain
         else
-          return utf8
+          utf8
         end
       end
 
@@ -205,13 +206,13 @@ module PhusionPassenger
       end
 
       def move_up
-        return "\x1b[0A"
+        "\x1b[0A"
       end
 
       def getchar(io)
         char = io.getc
         char = char.chr if char.is_a?(Integer)
-        return char
+        char
       end
 
       if JRUBY

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

@@ -8,7 +8,6 @@ module Utils
 # well with unlinked files.  This one is much shorter, easier
 # to understand, and slightly faster.
 class TmpIO < File
-
   # creates and returns a new File object.  The File is unlinked
   # immediately, switched to binary mode, and userspace output
   # buffering is disabled
@@ -25,7 +24,7 @@ class TmpIO < File
       unlink_immediately = true
     end
     fp = begin
-      super("#{Dir::tmpdir}/#{namespace}-#{rand(0x100000000).to_s(36)}#{suffix}", mode | CREAT | EXCL, 0600)
+      super("#{Dir.tmpdir}/#{namespace}-#{rand(0x100000000).to_s(36)}#{suffix}", mode | CREAT | EXCL, 0600)
     rescue Errno::EEXIST
       retry
     end
@@ -42,7 +41,7 @@ class TmpIO < File
 end
 
 # Like Dir.mktmpdir, but creates shorter filenames.
-def self.mktmpdir(prefix_suffix=nil, tmpdir=nil)
+def self.mktmpdir(prefix_suffix = nil, tmpdir = nil)
   case prefix_suffix
   when nil
     prefix = "d"

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

@@ -47,7 +47,7 @@ module PhusionPassenger
     # from the wrapped socket by calling #source_of_exception?
     class UnseekableSocket
       def self.wrap(socket)
-        return new.wrap(socket)
+        new.wrap(socket)
       end
 
       def wrap(socket)
@@ -77,7 +77,7 @@ module PhusionPassenger
 
         @socket = socket
 
-        return self
+        self
       end
 
       # Don't allow disabling of sync.
@@ -276,17 +276,17 @@ module PhusionPassenger
       end
 
       def source_of_exception?(exception)
-        return exception.instance_variable_get(:"@from_unseekable_socket") == @socket.object_id
+        exception.instance_variable_get(:"@from_unseekable_socket") == @socket.object_id
       end
 
       def to_hash
-        { :socket => "Not JSON Encodable", :eof => @simulate_eof }
+        { socket: "Not JSON Encodable", eof: @simulate_eof }
       end
 
     private
       def annotate(exception)
         exception.instance_variable_set(:"@from_unseekable_socket", @socket.object_id)
-        return exception
+        exception
       end
 
       def raise_error_because_activity_disallowed!
@@ -295,11 +295,11 @@ module PhusionPassenger
 
       if ''.respond_to?(:force_encoding)
         def binary_string(str)
-          return ''.force_encoding('binary')
+          ''.force_encoding('binary')
         end
       else
         def binary_string(str)
-          return ''
+          ''
         end
       end
     end

data/src/ruby_supportlib/phusion_passenger/utils.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -49,9 +50,9 @@ module PhusionPassenger
         data.gsub!("+", '')
         data.gsub!("/", '')
         data.gsub!(/==$/, '')
-        return data
+        data
       when :hex
-        return data.unpack('H*')[0]
+        data.unpack('H*')[0]
       else
         raise ArgumentError, "Invalid method #{method.inspect}"
       end
@@ -121,22 +122,22 @@ module PhusionPassenger
 
     def get_socket_address_type(address)
       if address =~ %r{^unix:.}
-        return :unix
+        :unix
       elsif address =~ %r{^tcp://.}
-        return :tcp
+        :tcp
       else
-        return :unknown
+        :unknown
       end
     end
 
     def connect_to_server(address)
       case get_socket_address_type(address)
       when :unix
-        return UNIXSocket.new(address.sub(/^unix:/, ''))
+        UNIXSocket.new(address.sub(/^unix:/, ''))
       when :tcp
         host, port = address.sub(%r{^tcp://}, '').split(':', 2)
         port = port.to_i
-        return TCPSocket.new(host, port)
+        TCPSocket.new(host, port)
       else
         raise ArgumentError, "Unknown socket address type for '#{address}'."
       end
@@ -145,10 +146,10 @@ module PhusionPassenger
     def local_socket_address?(address)
       case get_socket_address_type(address)
       when :unix
-        return true
+        true
       when :tcp
         host, port = address.sub(%r{^tcp://}, '').split(':', 2)
-        return host == "127.0.0.1" || host == "::1" || host == "localhost"
+        host == "127.0.0.1" || host == "::1" || host == "localhost"
       else
         raise ArgumentError, "Unknown socket address type for '#{address}'."
       end
@@ -158,17 +159,17 @@ 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
 
     def require_option(hash, key)
       if hash.has_key?(key)
-        return hash[key]
+        hash[key]
       else
         raise ArgumentError, "Option #{key.inspect} required"
       end
@@ -184,7 +185,7 @@ module PhusionPassenger
     # Like Base64.strict_encode64, but without a dependency on the
     # 'base64' library/gem.
     def base64(data)
-      [data].pack("m0")
+      [ data ].pack("m0")
     end
 
     # Returns a string which reports the backtraces for all threads,
@@ -205,7 +206,7 @@ module PhusionPassenger
           if thread_name = thread[:name]
             thread_name = "(#{thread_name})"
           end
-          stack ||= ["(empty)"]
+          stack ||= [ "(empty)" ]
           output << ("-" * 60) << "\n"
           output << "# Thread: #{thread.inspect}#{thread_name}, "
           if thread == Thread.main
@@ -225,7 +226,7 @@ module PhusionPassenger
         output << ("-" * 60) << "\n"
         output << "    " << caller.join("\n    ")
       end
-      return output
+      output
     end
 
     ####################################

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/app.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #
 # Copyright (c) 2010-2025 Asynchronous B.V.
 #

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/gdb_controller.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #
 # Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -66,7 +67,7 @@ module CrashWatch
       result = String.new
       while !done
         begin
-          if select([@out], nil, nil, timeout)
+          if select([ @out ], nil, nil, timeout)
             line = @out.readline
             puts "gdb read #{line.inspect}" if @debug
             if line == "#{END_OF_RESPONSE_MARKER}\n"
@@ -249,7 +250,7 @@ module CrashWatch
         # Look for a newer one that's installed from ports.
         puts "#{result} is broken on FreeBSD. Looking for an alternative..."
         result = nil
-        ["/usr/local/bin/gdb76", "/usr/local/bin/gdb66"].each do |candidate|
+        [ "/usr/local/bin/gdb76", "/usr/local/bin/gdb66" ].each do |candidate|
           if File.executable?(candidate)
             result = candidate
             break

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/lldb_controller.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #
 # Copyright (c) 2016-2025 Asynchronous B.V.
 #
@@ -65,7 +66,7 @@ module CrashWatch
       result = []
       while !done
         begin
-          if select([@out], nil, nil, timeout)
+          if select([ @out ], nil, nil, timeout)
             line = @out.readline.chomp
             line.sub!(/^LLDB:/, '')
             puts "lldb read #{line.inspect}" if @debug

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/utils.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #
 # Copyright (c) 2016-2025 Asynchronous B.V.
 #
@@ -62,7 +63,7 @@ module CrashWatch
           STDIN  => a,
           STDOUT => d,
           STDERR => d,
-          :close_others => true
+          :close_others => true,
         }
         pid = Process.spawn(*args)
       else
@@ -79,7 +80,7 @@ module CrashWatch
       d.close
       b.binmode
       c.binmode
-      [pid, b, c]
+      [ pid, b, c ]
     end
 
     def find_signal_name(signo)

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller.rb

@@ -34,9 +34,9 @@ module PhusionPassenger
 
 # Main daemon controller object. See the README for an introduction and tutorial.
 class DaemonController
-  ALLOWED_CONNECT_EXCEPTIONS = [Errno::ECONNREFUSED, Errno::ENETUNREACH,
+  ALLOWED_CONNECT_EXCEPTIONS = [ Errno::ECONNREFUSED, Errno::ENETUNREACH,
     Errno::ETIMEDOUT, Errno::ECONNRESET, Errno::EINVAL,
-    Errno::EADDRNOTAVAIL]
+    Errno::EADDRNOTAVAIL ]
 
   SPAWNER_FILE = File.expand_path(File.join(File.dirname(__FILE__),
     "daemon_controller", "spawn.rb"))
@@ -194,7 +194,7 @@ class DaemonController
   #  This must be a Hash.  The hash will contain the environment variables available
   #  to be made available to the daemon. Hash keys must be strings, not symbols.
   def initialize(options)
-    [:identifier, :start_command, :ping_command, :pid_file, :log_file].each do |option|
+    [ :identifier, :start_command, :ping_command, :pid_file, :log_file ].each do |option|
       if !options.has_key?(option)
         raise ArgumentError, "The ':#{option}' option is mandatory."
       end
@@ -642,7 +642,7 @@ private
       path == "/dev/stderr" ||
       path == "/dev/fd/1" ||
       path == "/dev/fd/2" ||
-      path =~ %r(\A/proc/([0-9]+|self)/fd/[12]\Z)
+      path =~ %r{\A/proc/([0-9]+|self)/fd/[12]\Z}
   end
 
   def run_command_while_capturing_output(command)
@@ -655,10 +655,10 @@ private
     if self.class.fork_supported? || self.class.spawn_supported?
       if Process.respond_to?(:spawn)
         options = {
-          :in  => "/dev/null",
-          :out => tempfile_path,
-          :err => tempfile_path,
-          :close_others => true
+          in: "/dev/null",
+          out: tempfile_path,
+          err: tempfile_path,
+          close_others: true,
         }
         @keep_ios.each do |io|
           options[io] = io
@@ -745,10 +745,10 @@ private
     if self.class.fork_supported? || self.class.spawn_supported?
       if Process.respond_to?(:spawn)
         options = {
-          :in  => "/dev/null",
-          :out => :out,
-          :err => :err,
-          :close_others => true
+          in: "/dev/null",
+          out: :out,
+          err: :err,
+          close_others: true,
         }
         @keep_ios.each do |io|
           options[io] = io
@@ -911,7 +911,7 @@ private
         begin
           socket.connect_nonblock(sockaddr)
         rescue Errno::ENOENT, Errno::EINPROGRESS, Errno::EAGAIN, Errno::EWOULDBLOCK
-          if select(nil, [socket], nil, 0.1)
+          if select(nil, [ socket ], nil, 0.1)
             begin
               socket.connect_nonblock(sockaddr)
             rescue Errno::EISCONN

data/src/ruby_supportlib/phusion_passenger.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -31,7 +32,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.1.4'
+  VERSION_STRING = '6.1.5'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha256 <VERSION>
   PREFERRED_NGINX_VERSION = '1.30.2'
@@ -61,7 +62,7 @@ module PhusionPassenger
   PLUGIN_DIRS = [
     "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME_}/plugins",
     "/usr/local/share/#{GLOBAL_NAMESPACE_DIRNAME_}/plugins",
-    "~/#{USER_NAMESPACE_DIRNAME_}/plugins"
+    "~/#{USER_NAMESPACE_DIRNAME_}/plugins",
   ]
 
   REQUIRED_LOCATIONS_INI_FIELDS = [
@@ -88,14 +89,14 @@ module PhusionPassenger
     # Directory containing the source code of our Ruby extension
     :ruby_extension_source_dir,
     # Directory containing the source code of our Nginx module
-    :nginx_module_source_dir
+    :nginx_module_source_dir,
   ].freeze
   OPTIONAL_LOCATIONS_INI_FIELDS = [
     # Directory which contains the main Phusion Passenger Rakefile. Only
     # available when originally packaged,
     :build_system_dir,
     # Directory in which downloaded Phusion Passenger binaries are cached.
-    :download_cache_dir
+    :download_cache_dir,
   ].freeze
 
   # Follows the logic of src/cxx_supportlib/ResourceLocator.h, so don't forget to modify that too.
@@ -146,18 +147,18 @@ module PhusionPassenger
   # Returns whether this Phusion Passenger installation is in the 'originally packaged'
   # configuration (as opposed to the 'custom packaged' configuration.
   def self.originally_packaged?
-    return !@custom_packaged
+    !@custom_packaged
   end
 
   def self.custom_packaged?
-    return @custom_packaged
+    @custom_packaged
   end
 
   # If Phusion Passenger is custom packaged, returns which packaging
   # method was used. Can be 'deb', 'rpm', 'homebrew', 'test'
   # or 'unknown'.
   def self.packaging_method
-    return @packaging_method
+    @packaging_method
   end
 
   def self.packaging_method_description
@@ -183,28 +184,28 @@ module PhusionPassenger
 
   # The installation specification string, as passed to #locate_directories.
   def self.install_spec
-    return @install_spec
+    @install_spec
   end
 
   # Generate getters for the directory types in locations.ini.
   getters_code = String.new
   (REQUIRED_LOCATIONS_INI_FIELDS + OPTIONAL_LOCATIONS_INI_FIELDS).each do |field|
-    getters_code << %Q{
+    getters_code << %Q(
       def self.#{field}
         return @#{field}
       end
-    }
+    )
   end
   eval(getters_code, binding, __FILE__, __LINE__)
 
   def self.user_support_binaries_dir
-    return "#{home_dir}/#{USER_NAMESPACE_DIRNAME_}/support-binaries/#{VERSION_STRING}"
+    "#{home_dir}/#{USER_NAMESPACE_DIRNAME_}/support-binaries/#{VERSION_STRING}"
   end
 
   def self.find_support_binary(name)
     all_support_binary_dirs = [
       support_binaries_dir,
-      user_support_binaries_dir
+      user_support_binaries_dir,
     ]
     all_support_binary_dirs.each do |dir|
       result = "#{dir}/#{name}"
@@ -212,7 +213,7 @@ module PhusionPassenger
         return result
       end
     end
-    return nil
+    nil
   end
 
 
@@ -220,9 +221,9 @@ module PhusionPassenger
 
   def self.binaries_sites
     [
-      { :url => "https://github.com/phusion/passenger/releases/download/release-{{VERSION}}".freeze },
-      { :url => "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release".freeze },
-      { :url => "https://s3.amazonaws.com/phusion-passenger/binaries/passenger/by_release".freeze }
+      { url: "https://github.com/phusion/passenger/releases/download/release-{{VERSION}}".freeze },
+      { url: "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release".freeze },
+      { url: "https://s3.amazonaws.com/phusion-passenger/binaries/passenger/by_release".freeze },
     ]
   end
 
@@ -281,7 +282,7 @@ module PhusionPassenger
     filename = "/etc/#{GLOBAL_NAMESPACE_DIRNAME_}/locations.ini"
     return filename if File.exist?(filename)
 
-    return nil
+    nil
   end
 
   def self.parse_ini_file(filename)
@@ -300,23 +301,23 @@ module PhusionPassenger
         end
       end
     end
-    return options
+    options
   end
 
   def self.get_option(filename, options, key, required = true)
     value = options[key]
     if value
-      return value
+      value
     elsif required
       raise "Option '#{key}' missing in file '#{filename}'"
     else
-      return nil
+      nil
     end
   end
 
   def self.get_bool_option(filename, options, key)
     value = get_option(filename, options, key)
-    return value == 'yes' || value == 'true' || value == 'on' || value == '1'
+    value == 'yes' || value == 'true' || value == 'on' || value == '1'
   end
 
   # The HOME environment variable is often unreliable, because for
@@ -335,6 +336,6 @@ module PhusionPassenger
         home = ENV['HOME']
       end
     end
-    return home
+    home
   end
 end if !defined?(PhusionPassenger::VERSION_STRING)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.1.4
+  version: 6.1.5
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-01 00:00:00.000000000 Z
+date: 2026-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake