passenger 6.1.4 → 6.1.5

data/src/ruby_supportlib/phusion_passenger/config/validate_install_command.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2014-2025 Asynchronous B.V.
 #
@@ -75,11 +76,11 @@ module PhusionPassenger
 
     private
       def self.create_default_options
-        return {
-          :auto => !STDIN.tty?,
-          :validate_passenger => true,
-          :colors => STDOUT.tty?,
-          :summary => true
+        {
+          auto: !STDIN.tty?,
+          validate_passenger: true,
+          colors: STDOUT.tty?,
+          summary: true,
         }
       end
 
@@ -180,7 +181,7 @@ module PhusionPassenger
 
         menu = Utils::TerminalChoiceMenu.new([
           "#{SHORT_PROGRAM_NAME} itself",
-          "Apache"
+          "Apache",
         ])
         menu["#{SHORT_PROGRAM_NAME} itself"].checked = @options[:validate_passenger]
         menu["Apache"].checked = @options[:validate_apache2]
@@ -213,7 +214,7 @@ module PhusionPassenger
           check_ok
         else
           check_warning
-          suggest %Q{
+          suggest %Q(
             Please add #{PhusionPassenger.bin_dir} to PATH.
             Otherwise you will get "command not found" errors upon running
             any Passenger commands.
@@ -221,7 +222,7 @@ module PhusionPassenger
             Learn more at about PATH at:
 
               https://www.phusionpassenger.com/library/indepth/environment_variables.html#the-path-environment-variable
-          }
+          )
         end
       end
 
@@ -267,7 +268,7 @@ module PhusionPassenger
           check_ok
         else
           check_warning
-          suggest %Q{
+          suggest %Q(
             You are currently validating against #{PROGRAM_NAME} #{VERSION_STRING}, located in:
 
               #{PhusionPassenger.bin_dir}/passenger
@@ -279,7 +280,7 @@ module PhusionPassenger
 
             Please uninstall these other #{SHORT_PROGRAM_NAME} installations to avoid
             confusion or conflicts.
-          }
+          )
         end
       end
 
@@ -324,7 +325,7 @@ module PhusionPassenger
               exit(INTERNAL_ERROR_CODE)
             end
           elsif detector.results.size > 1
-            other_installs = detector.results - [apache2]
+            other_installs = detector.results - [ apache2 ]
 
             log "<yellow>Multiple Apache installations detected!</yellow>"
             log ""
@@ -398,7 +399,7 @@ module PhusionPassenger
               next_step = "When done, please re-run this program."
             end
 
-            suggest %Q{
+            suggest %Q(
               Unable to validate your Apache installation: more software required
 
               This program requires the <b>apxs2</b> tool in order to be able to validate your
@@ -408,7 +409,7 @@ module PhusionPassenger
               #{install_instructions}
 
               #{next_step}
-            }
+            )
 
             false
           end
@@ -419,11 +420,11 @@ module PhusionPassenger
           dep = PlatformInfo::Depcheck.find("apache2")
           install_instructions = dep.install_instructions.split("\n").join("\n            ")
 
-          suggest %Q{
+          suggest %Q(
             Apache is not installed. You can solve this as follows:
 
             #{install_instructions}
-          }
+          )
 
           false
         end
@@ -435,7 +436,7 @@ module PhusionPassenger
         if PlatformInfo.httpd_default_config_file.nil?
           check_error
           passenger_config = "#{PhusionPassenger.bin_dir}/passenger-config"
-          suggest %Q{
+          suggest %Q(
             Your Apache installation might be broken
 
             You are about to validate #{PROGRAM_NAME} against the following
@@ -453,7 +454,7 @@ module PhusionPassenger
                #{sudo_s_e}
                export PATH="$ORIG_PATH"
                #{ruby_command} #{passenger_config} --detect-apache2
-          }
+          )
           return
         end
 
@@ -463,7 +464,7 @@ module PhusionPassenger
           check_error
 
           if Process.uid == 0
-            suggest %Q{
+            suggest %Q(
               Permission problems
 
               This program must be able to analyze your Apache installation. But it can't
@@ -479,13 +480,13 @@ module PhusionPassenger
               systems, SELinux and AppArmor might be responsible.
 
               When you've solved the problem, please re-run this program.
-            }
+            )
           else
             whoami = `whoami`.strip
             sudo = PhusionPassenger::PlatformInfo.ruby_sudo_command
             selfcommand = "#{PhusionPassenger.bin_dir}/passenger-config validate-install #{@orig_argv.join(' ')}"
 
-            suggest %Q{
+            suggest %Q(
               Permission problems
 
               This program must be able to analyze your Apache installation. But it can't
@@ -500,7 +501,7 @@ module PhusionPassenger
                  #{sudo_s_e}
                  export PATH=\"$ORIG_PATH\"
                  #{ruby_command} #{selfcommand}
-            }
+            )
           end
           return
         end
@@ -538,7 +539,7 @@ module PhusionPassenger
             check_ok
           else
             check_error
-            suggest %Q{
+            suggest %Q(
               Incorrect #{SHORT_PROGRAM_NAME} module path detected
 
               #{PROGRAM_NAME} for Apache requires a 'LoadModule passenger_module'
@@ -554,28 +555,28 @@ module PhusionPassenger
               Please edit the config file and change the directive to this instead:
 
                  LoadModule passenger_module #{PhusionPassenger.apache2_module_path}
-            }
+            )
           end
         elsif occurrences == 0
           if @options[:invoked_from_installer]
             check_warning
-            suggest %Q{
+            suggest %Q(
               You did not specify 'LoadModule passenger_module' in any of your Apache
               configuration files. Please paste the configuration snippet that this
               installer printed earlier, into one of your Apache configuration files, such
               as #{PlatformInfo.httpd_default_config_file}.
-            }
+            )
           else
             check_error
             installer_command = "#{PhusionPassenger.bin_dir}/passenger-install-apache2-module"
-            suggest %Q{
+            suggest %Q(
               You did not specify 'LoadModule passenger_module' in any of your
               Apache configuration files. This means that #{PROGRAM_NAME}
               for Apache is not installed or not active. Please run the
               #{PROGRAM_NAME} Apache module installer:
 
                  #{ruby_command} #{installer_command} --apxs2=#{PlatformInfo.apxs2 || 'none'}
-            }
+            )
           end
         else
           check_error
@@ -614,18 +615,18 @@ module PhusionPassenger
            PhusionPassenger.originally_packaged? &&
            PhusionPassenger.build_system_dir =~ /^#{Regexp.escape Gem.dir}\// &&
            File.exist?("#{Gem.bindir}/passenger-config")
-          return Gem.bindir
+          Gem.bindir
         else
-          return nil
+          nil
         end
       end
 
       # Returns the Homebrew bin dir, if Phusion Passenger is installed through Homebrew.
       def homebrew_bindir
         if PhusionPassenger.packaging_method == "homebrew"
-          return "/usr/local/bin"
+          "/usr/local/bin"
         else
-          return nil
+          nil
         end
       end
 
@@ -721,11 +722,11 @@ module PhusionPassenger
       end
 
       def unindent(text)
-        return PlatformInfo.send(:unindent, text)
+        PlatformInfo.send(:unindent, text)
       end
 
       def reindent(text, level)
-        return PlatformInfo.send(:reindent, text, level)
+        PlatformInfo.send(:reindent, text, level)
       end
 
       def sudo_s_e

data/src/ruby_supportlib/phusion_passenger/console_text_template.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -55,11 +56,11 @@ module PhusionPassenger
 
     def []=(name, value)
       instance_variable_set("@#{name}".to_sym, value)
-      return self
+      self
     end
 
     def result
-      return @template.result(binding)
+      @template.result(binding)
     end
   end
 

data/src/ruby_supportlib/phusion_passenger/debug_logging.rb

@@ -42,7 +42,7 @@ module PhusionPassenger
     end
 
     def self.log_level
-      return @@log_level
+      @@log_level
     end
 
     def self.log_level=(level)
@@ -60,7 +60,7 @@ module PhusionPassenger
     end
 
     def self._log_device
-      return @@log_device
+      @@log_device
     end
 
     def self.stderr_evaluator=(block)

data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2011-2025 Asynchronous B.V.
 #
@@ -77,7 +78,7 @@ module PhusionPassenger
 
     def check_rvm_using_wrapper_script(options)
       ruby = options["ruby"]
-      if ruby =~ %r(/\.?rvm/) && ruby =~ %r(/bin/ruby$)
+      if ruby =~ %r{/\.?rvm/} && ruby =~ %r{/bin/ruby$}
         case options["integration_mode"] || DEFAULT_INTEGRATION_MODE
         when "nginx"
           passenger_ruby = "passenger_ruby"
@@ -91,16 +92,14 @@ module PhusionPassenger
         end
 
         log_error_to_response_dir(
-          :summary => "#{passenger_ruby} must be set to an RVM wrapper script instead of a raw Ruby binary",
+          summary: "#{passenger_ruby} must be set to an RVM wrapper script instead of a raw Ruby binary",
 
-          :problem_description_html =>
-            "You've set the <code>#{h passenger_ruby}</code> option to <code>#{h ruby}</code>. " \
+          problem_description_html:             "You've set the <code>#{h passenger_ruby}</code> option to <code>#{h ruby}</code>. " \
             'However, because you are using RVM, this is not allowed: the option must point to ' \
             'an RVM wrapper script, not a raw Ruby binary. This is because RVM is implemented ' \
             "through various environment variables, which are set through the wrapper script.\n",
 
-          :solution_description_html =>
-            "To find out the correct value for <code>#{h passenger_ruby}</code>, please read " \
+          solution_description_html:             "To find out the correct value for <code>#{h passenger_ruby}</code>, please read " \
             "<a href=\"#{h passenger_ruby_doc}\">its documentation entry</a>."
         )
         abort
@@ -267,15 +266,15 @@ module PhusionPassenger
     end
 
     def advertise_sockets(_options, request_handler)
-      json = { :sockets => [] }
+      json = { sockets: [] }
       request_handler.server_sockets.each_pair do |name, options|
         concurrency = PhusionPassenger.advertised_concurrency_level || options[:concurrency]
         json[:sockets] << {
-          :name => name,
-          :address => options[:address],
-          :protocol => options[:protocol],
-          :concurrency => concurrency,
-          :accept_http_requests => !!options[:accept_http_requests]
+          name: name,
+          address: options[:address],
+          protocol: options[:protocol],
+          concurrency: concurrency,
+          accept_http_requests: !!options[:accept_http_requests],
         }
       end
 
@@ -581,7 +580,7 @@ module PhusionPassenger
 
         problem_description = String.new
 
-        problem_description << %Q{
+        problem_description << %Q(
           <h2>Bundler was unable to find one of the gems defined in the Gemfile</h2>
           <table class="table table-bordered table-hover problem-causes">
             <thead>
@@ -591,7 +590,7 @@ module PhusionPassenger
               </tr>
             </thead>
             <tbody>
-        }
+        )
 
         problem_description << %Q{
           <tr class="cause">
@@ -617,17 +616,17 @@ module PhusionPassenger
           </tr>
         }
 
-        problem_description << %Q{
+        problem_description << %Q(
           <tr class="cause">
             <td>
               If the necessary gems are installed, but Bundler may not have
               permissions to access them.
-        }
+        )
         if bundle_path
-          problem_description << %Q{
+          problem_description << %Q(
             <br>
             <small>Bundler tried to load the gems from <code>#{h bundle_path}</code>.</small>
-          }
+          )
         end
         problem_description << %Q{
             </td>
@@ -737,7 +736,7 @@ module PhusionPassenger
           }
         end
 
-        if ruby =~ %r(^/usr/local/rvm/)
+        if ruby =~ %r{^/usr/local/rvm/}
           problem_description << %Q{
             <tr class="cause">
               <td>
@@ -769,14 +768,14 @@ module PhusionPassenger
                     <li>Login as #{h whoami}.</li>
           }
           if PlatformInfo.rvm_installation_mode == :multi
-            problem_description << %Q{
+            problem_description << %Q(
                     <li>
                       Enable RVM mixed mode by running:
                       <pre>rvm user gemsets</pre>
                     </li>
-            }
+            )
           end
-          problem_description << %Q{
+          problem_description << %Q(
                     <li>
                       Run this to find out what to set
                       <a href="#{h passenger_ruby_doc}">#{h passenger_ruby}</a> to:
@@ -786,11 +785,11 @@ module PhusionPassenger
                 </div>
               </td>
             </tr>
-          }
+          )
         end
 
         if PlatformInfo.in_rvm?
-          problem_description << %Q{
+          problem_description << %Q(
             <tr class="cause">
               <td>
                 The RVM gemset may be broken.
@@ -801,7 +800,7 @@ module PhusionPassenger
                 </a>
               </td>
             </tr>
-          }
+          )
         end
 
         problem_description << %Q{
@@ -868,7 +867,7 @@ module PhusionPassenger
             " setting. The documentation for that setting will teach you how to refer" \
             " to the proper gemset.</p>"
         end
-        if ruby =~ %r(^/usr/local/rvm/)
+        if ruby =~ %r{^/usr/local/rvm/}
           solution_description <<
             "<h3>Is your gem bundle installed to the home directory, while at the same" \
             " time you are using a Ruby that is installed by RVM in a system-wide manner?</h3>" \
@@ -906,7 +905,7 @@ module PhusionPassenger
 
     def check_execution_environment_solution_description(passenger_user, passenger_user_doc, bundle_path)
       result = String.new
-      result << %Q{
+      result << %Q(
         <h3>Check the application process's execution environment</h3>
         <p>
           Is the application running under the expected execution environment?
@@ -916,27 +915,27 @@ module PhusionPassenger
           &raquo; 'Subprocess' tab and double check all information there &mdash; is
           everything as expected?
         </p>
-      }
+      )
       if passenger_user
-        result << %Q{
+        result << %Q(
           <p>
             If the application is not supposed to run as <code>#{h whoami}</code>,
             then you can configure this via the
             <a href="#{h passenger_user_doc}">#{h passenger_user}</a>
             setting.
           </p>
-        }
+        )
       end
-      result << %Q{
+      result << %Q(
         <h3>Check that the application has permissions to access the directory from which Bundler loads gems</h3>
         <p>
           Please check whether the application, which is running as the
           <code>#{h whoami}</code> user, has permissions to access
-      }
+      )
       if bundle_path
-        result << %Q{
+        result << %Q(
           <code>#{h bundle_path}</code>.
-        }
+        )
       else
         result << %Q{
           the directory that Bundler tries to load gems from. Unfortunately
@@ -946,9 +945,9 @@ module PhusionPassenger
           can figure out the path for you).
         }
       end
-      result << %Q{
+      result << %Q(
         </p>
-      }
+      )
       result
     end
 

data/src/ruby_supportlib/phusion_passenger/message_channel.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -93,9 +94,9 @@ module PhusionPassenger
         offset = delimiter_pos + 1
         delimiter_pos = buffer.index(DELIMITER, offset)
       end
-      return message
+      message
     rescue Errno::ECONNRESET
-      return nil
+      nil
     end
 
     # Read an array message from the underlying file descriptor and return the
@@ -156,9 +157,9 @@ module PhusionPassenger
         offset = delimiter_pos + 1
         delimiter_pos = buffer.index(DELIMITER, offset)
       end
-      return result
+      result
     rescue Errno::ECONNRESET
-      return nil
+      nil
     end
 
     # Read a scalar message from the underlying IO object. Returns the
@@ -190,7 +191,7 @@ module PhusionPassenger
       size = buffer.unpack(UINT32_PACK_FORMAT)[0]
       if size == 0
         buffer.replace('')
-        return buffer
+        buffer
       else
         if !max_size.nil? && size > max_size
           raise SecurityError, "Scalar message size (#{size}) " <<
@@ -209,10 +210,10 @@ module PhusionPassenger
             end
           end
         end
-        return buffer
+        buffer
       end
     rescue Errno::ECONNRESET
-      return nil
+      nil
     end
 
     # Send an array message, which consists of the given elements, over the underlying
@@ -237,7 +238,7 @@ module PhusionPassenger
         raise ArgumentError, 'Message size too large'
       end
 
-      @io.write([message.size].pack('n') << message)
+      @io.write([ message.size ].pack('n') << message)
       @io.flush
     end
 
@@ -246,7 +247,7 @@ module PhusionPassenger
     # Might raise SystemCallError, IOError or SocketError when something
     # goes wrong.
     def write_scalar(data)
-      @io.write([data.size].pack('N') << data)
+      @io.write([ data.size ].pack('N') << data)
       @io.flush
     end
 
@@ -260,7 +261,7 @@ module PhusionPassenger
       write("pass IO") if negotiate
       io = @io.recv_io(klass)
       write("got IO") if negotiate
-      return io
+      io
     end
 
     # Send an IO object (a file descriptor) over the channel. The other
@@ -293,7 +294,7 @@ module PhusionPassenger
       result = read
       if !result
         raise EOFError, "End of stream"
-      elsif result != ["pass IO"]
+      elsif result != [ "pass IO" ]
         raise IOError, "IO passing pre-negotiation header expected"
       else
         @io.send_io(io)
@@ -306,7 +307,7 @@ module PhusionPassenger
         result = read
         if !result
           raise EOFError, "End of stream"
-        elsif result != ["got IO"]
+        elsif result != [ "got IO" ]
           raise IOError, "IO passing post-negotiation header expected"
         end
       end
@@ -314,7 +315,7 @@ module PhusionPassenger
 
     # Return the file descriptor of the underlying IO object.
     def fileno
-      return @io.fileno
+      @io.fileno
     end
 
     # Close the underlying IO stream. Might raise SystemCallError or
@@ -325,7 +326,7 @@ module PhusionPassenger
 
     # Checks whether the underlying IO stream is closed.
     def closed?
-      return @io.closed?
+      @io.closed?
     end
 
   private
@@ -337,11 +338,11 @@ module PhusionPassenger
 
     if defined?(ByteString)
       def new_buffer
-        return ByteString.new
+        ByteString.new
       end
     else
       def new_buffer
-        return ""
+        ""
       end
     end
   end

data/src/ruby_supportlib/phusion_passenger/message_client.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -84,13 +85,13 @@ module PhusionPassenger
     end
 
     def connected?
-      return !!@channel
+      !!@channel
     end
 
     ### Low level I/O methods ###
 
     def read
-      return @channel.read
+      @channel.read
     rescue
       auto_disconnect
       raise
@@ -111,14 +112,14 @@ module PhusionPassenger
     end
 
     def read_scalar
-      return @channel.read_scalar
+      @channel.read_scalar
     rescue
       auto_disconnect
       raise
     end
 
     def recv_io(klass = IO, negotiate = true)
-      return @channel.recv_io(klass, negotiate)
+      @channel.recv_io(klass, negotiate)
     rescue
       auto_disconnect
       raise