passenger 6.1.4 → 6.1.5

data/src/ruby_supportlib/phusion_passenger/ruby_core_io_enhancements.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
 #
@@ -39,14 +40,14 @@ class IO
     #
     #   io.writev(["hello ", "world", "\n"])
     def writev(components)
-      return PhusionPassenger::NativeSupport.writev(fileno, components)
+      PhusionPassenger::NativeSupport.writev(fileno, components)
     end
 
     # Like #writev, but accepts two arrays. The data is written in the given order.
     #
     #   io.writev2(["hello ", "world", "\n"], ["another ", "message\n"])
     def writev2(components, components2)
-      return PhusionPassenger::NativeSupport.writev2(fileno,
+      PhusionPassenger::NativeSupport.writev2(fileno,
         components, components2)
     end
 
@@ -56,22 +57,22 @@ class IO
     #     ["another ", "message\n"],
     #     ["yet ", "another ", "one", "\n"])
     def writev3(components, components2, components3)
-      return PhusionPassenger::NativeSupport.writev3(fileno,
+      PhusionPassenger::NativeSupport.writev3(fileno,
         components, components2, components3)
     end
   else
     def writev(components)
-      return write(components.pack('a*' * components.size))
+      write(components.pack('a*' * components.size))
     end
 
     def writev2(components, components2)
       joined = components + components2
-      return write(joined.pack('a*' * joined.size))
+      write(joined.pack('a*' * joined.size))
     end
 
     def writev3(components, components2, components3)
       joined = components + components2 + components3
-      return write(joined.pack('a*' * joined.size))
+      write(joined.pack('a*' * joined.size))
     end
   end
 

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

@@ -34,10 +34,10 @@ module PhusionPassenger
         "config.ru",
         "passenger_wsgi.py",
         "app.js",
-        ".meteor"
+        ".meteor",
       ]
       WATCH_ENTRIES = [
-        "config", "Passengerfile.json", "passenger-standalone.json"
+        "config", "Passengerfile.json", "passenger-standalone.json",
       ]
 
       attr_accessor :dirs
@@ -61,8 +61,8 @@ module PhusionPassenger
         if single_mode?
           app_root = find_app_root
           apps << {
-            :server_names => ["_"],
-            :root => app_root
+            server_names: [ "_" ],
+            root: app_root,
           }
           watchlist << app_root
           WATCH_ENTRIES.each do |entry|
@@ -78,7 +78,7 @@ module PhusionPassenger
 
         @apps = apps
         @watchlist = watchlist
-        return apps
+        apps
       end
 
       def monitor(termination_pipe)
@@ -120,14 +120,14 @@ module PhusionPassenger
       end
 
       def single_mode?
-        return @mode == :single
+        @mode == :single
       end
 
       def multi_mode?
-        return !single_mode?
+        !single_mode?
       end
 
-      ##################
+    ##################
 
     private
       class ConfigLoadError < StandardError
@@ -135,9 +135,9 @@ module PhusionPassenger
 
       def find_app_root
         if @dirs.empty?
-          return File.absolute_logical_path(".")
+          File.absolute_logical_path(".")
         else
-          return File.absolute_logical_path(@dirs[0])
+          File.absolute_logical_path(@dirs[0])
         end
       end
 
@@ -158,18 +158,18 @@ module PhusionPassenger
 
       def filename_to_server_names(filename)
         basename = File.basename(filename)
-        names = [basename]
+        names = [ basename ]
         if basename !~ /^www\.$/i
           names << "www.#{basename}"
         end
-        return names
+        names
       end
 
       # Wait until the given IO becomes readable, or until the timeout has
       # been reached. Returns true if the IO became readable, false if the
       # timeout has been reached.
       def wait_on_io(io, timeout)
-        return !!select([io], nil, nil, timeout)
+        !!select([ io ], nil, nil, timeout)
       end
 
       def determine_mode_and_execution_root(options, local_options)

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

@@ -33,7 +33,7 @@ module PhusionPassenger
 
     private
       def self.create_default_options
-        return {}
+        {}
       end
 
       def parse_options