passenger 6.1.4 → 6.1.5

data/src/ruby_supportlib/phusion_passenger/apache2/config_utils.rb

@@ -42,7 +42,7 @@ module PhusionPassenger
           options.each do |option|
             option[:context] ||= :application
             if option[:context] == :location
-              option[:htaccess_context] ||= ['OR_OPTIONS']
+              option[:htaccess_context] ||= [ 'OR_OPTIONS' ]
             end
           end
         end

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -48,7 +48,7 @@ class CommonLibraryBuilder
   end
 
   def initialize_copy(other)
-    [:all_components, :all_ordered_components, :selected_components, :namespace, :output_dir].each do |name|
+    [ :all_components, :all_ordered_components, :selected_components, :namespace, :output_dir ].each do |name|
       var_name = "@#{name}"
       instance_variable_set(var_name, other.instance_variable_get(var_name).dup)
     end
@@ -153,43 +153,43 @@ private
       object_file,
       source_file,
       lambda { {
-        :include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
-        :flags => [
+        include_paths: CXX_SUPPORTLIB_INCLUDE_PATHS,
+        flags: [
           libev_cflags,
           libuv_cflags,
           optimize,
-          "#{maybe_eval_lambda(extra_compiler_flags)} #{options[:cflags]}".strip
-        ]
+          "#{maybe_eval_lambda(extra_compiler_flags)} #{options[:cflags]}".strip,
+        ],
       } }
     )
   end
 
   def set_namespace!(namespace)
     @namespace = namespace
-    return self
+    self
   end
 
   def set_output_dir!(dir)
     @output_dir = dir
-    return self
+    self
   end
 
   def only!(*selector)
     new_components = apply_selector(*selector)
     @selected_components = new_components
-    return self
+    self
   end
 
   def exclude!(*selector)
     apply_selector(*selector).each_key do |object_name|
       @selected_components.delete(object_name)
     end
-    return self
+    self
   end
 
   def apply_selector(*selector)
     result = {}
-    selector = [selector].flatten
+    selector = [ selector ].flatten
     selector.each do |condition|
       @selected_components.each do |object_name, options|
         if component_satisfies_condition?(object_name, options, condition)
@@ -197,15 +197,15 @@ private
         end
       end
     end
-    return result
+    result
   end
 
   def component_satisfies_condition?(object_name, options, condition)
     case condition
     when Symbol
-      return condition == :all || options[:category] == condition
+      condition == :all || options[:category] == condition
     when String
-      return object_name == condition
+      object_name == condition
     else
       raise ArgumentError, "Invalid condition #{condition.inspect}"
     end
@@ -216,7 +216,7 @@ private
     @selected_components.each_value do |options|
       categories[options[:category]] = true
     end
-    return categories.keys
+    categories.keys
   end
 
   def category_complete?(category)
@@ -232,7 +232,7 @@ private
         actual += 1
       end
     end
-    return expected == actual
+    expected == actual
   end
 
   def selected_objects_belonging_to_category(category)
@@ -242,11 +242,11 @@ private
         result << object_name
       end
     end
-    return result
+    result
   end
 
   def object_filenames_for(object_names)
-    return object_names.map { |name| "#{@output_dir}/#{name}" }
+    object_names.map { |name| "#{@output_dir}/#{name}" }
   end
 
   def group_all_components_by_category
@@ -257,7 +257,7 @@ private
       categories[category] ||= []
       categories[category] << object_name
     end
-    return categories
+    categories
   end
 
   def locate_source_file(path)
@@ -268,131 +268,131 @@ end
 
 COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'LoggingKit.o',
-    :source   => 'LoggingKit/Implementation.cpp',
-    :category => :base,
-    :optimize => :very_heavy
+    source: 'LoggingKit/Implementation.cpp',
+    category: :base,
+    optimize: :very_heavy
   define_component 'Exceptions.o',
-    :source   => 'Exceptions.cpp',
-    :category => :base
+    source: 'Exceptions.cpp',
+    category: :base
   define_component 'FileTools/PathManip.o',
-    :source   => 'FileTools/PathManip.cpp',
-    :category => :base
+    source: 'FileTools/PathManip.cpp',
+    category: :base
   define_component 'FileTools/FileManip.o',
-    :source   => 'FileTools/FileManip.cpp',
-    :category => :base
+    source: 'FileTools/FileManip.cpp',
+    category: :base
   define_component 'FileTools/PathSecurityCheck.o',
-    :source   => 'FileTools/PathSecurityCheck.cpp',
-    :category => :base
+    source: 'FileTools/PathSecurityCheck.cpp',
+    category: :base
   define_component 'ProcessManagement/Spawn.o',
-    :source   => 'ProcessManagement/Spawn.cpp',
-    :category => :base
+    source: 'ProcessManagement/Spawn.cpp',
+    category: :base
   define_component 'ProcessManagement/Utils.o',
-    :source   => 'ProcessManagement/Utils.cpp',
-    :category => :base
+    source: 'ProcessManagement/Utils.cpp',
+    category: :base
   define_component 'SystemTools/UserDatabase.o',
-    :source   => 'SystemTools/UserDatabase.cpp',
-    :category => :base
+    source: 'SystemTools/UserDatabase.cpp',
+    category: :base
   define_component 'Utils/SystemTime.o',
-    :source   => 'SystemTools/SystemTime.cpp',
-    :category => :base
+    source: 'SystemTools/SystemTime.cpp',
+    category: :base
   define_component 'StrIntTools/StrIntUtils.o',
-    :source   => 'StrIntTools/StrIntUtils.cpp',
-    :category => :base,
-    :optimize => :very_heavy
+    source: 'StrIntTools/StrIntUtils.cpp',
+    category: :base,
+    optimize: :very_heavy
   define_component 'StrIntTools/StrIntUtilsNoStrictAliasing.o',
-    :source   => 'StrIntTools/StrIntUtilsNoStrictAliasing.cpp',
-    :category => :base,
-    :optimize => :very_heavy,
+    source: 'StrIntTools/StrIntUtilsNoStrictAliasing.cpp',
+    category: :base,
+    optimize: :very_heavy,
     # Compiling with SSE2 causes segfaults on Amazon Linux 2
-    :cflags => RbConfig::CONFIG['host_cpu'] == 'x86_64' && RbConfig::CONFIG['host_os'].include?('linux') ? ' -mno-sse2' : '',
-    :strict_aliasing => false
+    cflags: RbConfig::CONFIG['host_cpu'] == 'x86_64' && RbConfig::CONFIG['host_os'].include?('linux') ? ' -mno-sse2' : '',
+    strict_aliasing: false
   define_component 'IOTools/IOUtils.o',
-    :source   => 'IOTools/IOUtils.cpp',
-    :optimize => :light,
-    :category => :base
+    source: 'IOTools/IOUtils.cpp',
+    optimize: :light,
+    category: :base
   define_component 'Algorithms/Hasher.o',
-    :source   => 'Algorithms/Hasher.cpp',
-    :category => :base,
-    :optimize => :very_heavy
+    source: 'Algorithms/Hasher.cpp',
+    category: :base,
+    optimize: :very_heavy
   define_component 'Utils.o',
-    :source   => 'Utils.cpp',
-    :category => :base
+    source: 'Utils.cpp',
+    category: :base
   define_component 'jsoncpp.o',
-    :source   => 'vendor-modified/jsoncpp/jsoncpp.cpp',
-    :category => :base,
-    :optimize => true
+    source: 'vendor-modified/jsoncpp/jsoncpp.cpp',
+    category: :base,
+    optimize: true
 
   define_component 'SecurityKit/Crypto.o',
-    :source   => 'SecurityKit/Crypto.cpp',
-    :category => :other,
-    :cflags   => PhusionPassenger::PlatformInfo.crypto_extra_cflags
+    source: 'SecurityKit/Crypto.cpp',
+    category: :other,
+    cflags: PhusionPassenger::PlatformInfo.crypto_extra_cflags
   define_component 'Utils/CachedFileStat.o',
-    :source   => 'Utils/CachedFileStat.cpp',
-    :category => :other
+    source: 'Utils/CachedFileStat.cpp',
+    category: :other
   define_component 'WatchdogLauncher.o',
-    :source   => 'WatchdogLauncher.cpp',
-    :category => :other
+    source: 'WatchdogLauncher.cpp',
+    category: :other
   define_component 'MemoryKit/mbuf.o',
-    :source   => 'MemoryKit/mbuf.cpp',
-    :category => :other,
-    :optimize => true
+    source: 'MemoryKit/mbuf.cpp',
+    category: :other,
+    optimize: true
   define_component 'MemoryKit/palloc.o',
-    :source   => 'MemoryKit/palloc.cpp',
-    :category => :other,
-    :optimize => true
+    source: 'MemoryKit/palloc.cpp',
+    category: :other,
+    optimize: true
   define_component 'ServerKit/url_parser.o',
-    :source   => 'ServerKit/url_parser.c',
-    :category => :other,
-    :optimize => :very_heavy
+    source: 'ServerKit/url_parser.c',
+    category: :other,
+    optimize: :very_heavy
   define_component 'ServerKit/llhttp.o',
-    :source   => 'ServerKit/llhttp.c',
-    :category => :other,
-    :optimize => :very_heavy
+    source: 'ServerKit/llhttp.c',
+    category: :other,
+    optimize: :very_heavy
   define_component 'ServerKit/llhttp_http.o',
-    :source   => 'ServerKit/llhttp_http.c',
-    :category => :other,
-    :optimize => :very_heavy
+    source: 'ServerKit/llhttp_http.c',
+    category: :other,
+    optimize: :very_heavy
   define_component 'ServerKit/llhttp_api.o',
-    :source   => 'ServerKit/llhttp_api.c',
-    :category => :other,
-    :optimize => :very_heavy
+    source: 'ServerKit/llhttp_api.c',
+    category: :other,
+    optimize: :very_heavy
   define_component 'ServerKit/Implementation.o',
-    :source   => 'ServerKit/Implementation.cpp',
-    :category => :other,
-    :optimize => true
+    source: 'ServerKit/Implementation.cpp',
+    category: :other,
+    optimize: true
   define_component 'DataStructures/LString.o',
-    :source   => 'DataStructures/LString.cpp',
-    :category => :other
+    source: 'DataStructures/LString.cpp',
+    category: :other
   define_component 'AppTypeDetector/CBindings.o',
-    :source   => 'AppTypeDetector/CBindings.cpp',
-    :category => :other
+    source: 'AppTypeDetector/CBindings.cpp',
+    category: :other
   define_component 'WrapperRegistry/CBindings.o',
-    :source   => 'WrapperRegistry/CBindings.cpp',
-    :category => :other
+    source: 'WrapperRegistry/CBindings.cpp',
+    category: :other
 
   define_component 'vendor-modified/modp_b64.o',
-    :source   => 'vendor-modified/modp_b64.cpp',
-    :category => :base64,
-    :optimize => true,
-    :strict_aliasing => false
+    source: 'vendor-modified/modp_b64.cpp',
+    category: :base64,
+    optimize: true,
+    strict_aliasing: false
   define_component 'vendor-modified/modp_b64_strict_aliasing.o',
-    :source   => 'vendor-modified/modp_b64_strict_aliasing.cpp',
-    :category => :base64,
-    :optimize => true
+    source: 'vendor-modified/modp_b64_strict_aliasing.cpp',
+    category: :base64,
+    optimize: true
 
   define_component 'JsonTools/CBindings.o',
-    :source   => 'JsonTools/CBindings.cpp',
-    :category => :json_tools
+    source: 'JsonTools/CBindings.cpp',
+    category: :json_tools
   define_component 'FileTools/PathManipCBindings.o',
-    :source   => 'FileTools/PathManipCBindings.cpp',
-    :category => :file_tools_path_manip_cbindings
+    source: 'FileTools/PathManipCBindings.cpp',
+    category: :file_tools_path_manip_cbindings
   define_component 'ProcessManagement/Ruby.o',
-    :source   => 'ProcessManagement/Ruby.cpp',
-    :category => :process_management_ruby
+    source: 'ProcessManagement/Ruby.cpp',
+    category: :process_management_ruby
 end
 
 # A subset of the objects are linked to the Nginx binary. This defines
 # what those objects are.
-NGINX_LIBS_SELECTOR = [:base, 'WatchdogLauncher.o', 'AppTypeDetector/CBindings.o',
+NGINX_LIBS_SELECTOR = [ :base, 'WatchdogLauncher.o', 'AppTypeDetector/CBindings.o',
   'WrapperRegistry/CBindings.o', 'Utils/CachedFileStat.o', 'JsonTools/CBindings.o',
-  'FileTools/PathManipCBindings.o']
+  'FileTools/PathManipCBindings.o' ]

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

@@ -39,9 +39,9 @@ module PhusionPassenger
         puts "  ruby-libdir              Show #{PROGRAM_NAME}'s Ruby library directory."
         puts "  includedir               Show the Nginx runtime library headers directory."
         puts "  nginx-addon-dir          Show #{PROGRAM_NAME}'s Nginx addon directory."
-        puts "  nginx-libs               Show paths to #{PROGRAM_NAME}'s libraries" 
+        puts "  nginx-libs               Show paths to #{PROGRAM_NAME}'s libraries"
         puts "                           for static linking to Nginx runtime."
-        puts "  nginx-dynamic-libs       Show paths to #{PROGRAM_NAME}'s libraries" 
+        puts "  nginx-dynamic-libs       Show paths to #{PROGRAM_NAME}'s libraries"
         puts "                           for dynamic linking to Nginx runtime."
         puts "  nginx-dynamic-compiled   Check whether runtime libraries for dynamic"
         puts "                           linking to Nginx are compiled."
@@ -214,14 +214,14 @@ module PhusionPassenger
     private
       def common_library
         PhusionPassenger.require_passenger_lib 'common_library'
-        return COMMON_LIBRARY.
+        COMMON_LIBRARY.
           only(*NGINX_LIBS_SELECTOR).
           set_output_dir("#{PhusionPassenger.lib_dir}/common/libpassenger_common")
       end
-      
+
       def common_dynamic_library
         PhusionPassenger.require_passenger_lib 'common_library'
-        return COMMON_LIBRARY.
+        COMMON_LIBRARY.
           only(*NGINX_LIBS_SELECTOR).
           set_output_dir("#{PhusionPassenger.lib_dir}/nginx_dynamic/module_libpassenger_common")
       end

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

@@ -1,4 +1,5 @@
 #  encoding: utf-8
+
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2025 Asynchronous B.V.
@@ -44,7 +45,7 @@ module PhusionPassenger
           'depcheck_specs/ruby',
           'depcheck_specs/gems',
           'depcheck_specs/libs',
-          'depcheck_specs/utilities'
+          'depcheck_specs/utilities',
         ]
         ids = [
           'cc',
@@ -52,9 +53,9 @@ module PhusionPassenger
           'rake',
           'libcurl-dev',
           'openssl-dev',
-          'zlib-dev'
+          'zlib-dev',
         ].compact
-        return [specs, ids]
+        [ specs, ids ]
       end
 
       def install_doc_url
@@ -121,7 +122,7 @@ module PhusionPassenger
           else
             new_screen
             render_template 'config/agent_compiler/confirm_enable_optimizations',
-              :total_ram => total_ram_gb
+              total_ram: total_ram_gb
             puts
             @optimize = prompt_confirmation('Compile with optimizations?')
             puts
@@ -158,11 +159,11 @@ module PhusionPassenger
         begin
           meminfo = File.read("/proc/meminfo")
           if meminfo =~ /^MemTotal: *(\d+) kB$/
-            return sprintf("%.1f", $1.to_i / 1024 / 1024)
+            sprintf("%.1f", $1.to_i / 1024 / 1024)
           end
         rescue Errno::ENOENT, Errno::EACCES
           # Don't do anything on systems without memory information.
-          return nil
+          nil
         end
       end
     end

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

@@ -38,7 +38,7 @@ module PhusionPassenger
       include PhusionPassenger::Config::Utils
 
       def self.create_default_options
-        { :agent_name => "core_api" }
+        { agent_name: "core_api" }
       end
 
       def run

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

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

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

@@ -35,7 +35,7 @@ module PhusionPassenger
       include InstallationUtils
 
       def run
-        @options = { :auto => !STDIN.tty? || !STDOUT.tty?, :colorize => :auto, :force_tip => true }
+        @options = { auto: !STDIN.tty? || !STDOUT.tty?, colorize: :auto, force_tip: true }
         parse_options
         initialize_objects
         sanity_check

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

@@ -36,11 +36,11 @@ module PhusionPassenger
 
       def run
         @options = {
-          :colorize => :auto,
-          :force_tip => true,
-          :connect_timeout => 30,
-          :idle_timeout => 30,
-          :address_sanitizer => false,
+          colorize: :auto,
+          force_tip: true,
+          connect_timeout: 30,
+          idle_timeout: 30,
+          address_sanitizer: false,
         }
         parse_options
         initialize_objects

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

@@ -92,7 +92,7 @@ module PhusionPassenger
         request = Net::HTTP::Post.new("/pool/detach_process.json")
         try_performing_full_admin_basic_auth(request, @instance)
         request.content_type = "application/json"
-        request.body = PhusionPassenger::Utils::JSON.generate(:pid => @pid)
+        request.body = PhusionPassenger::Utils::JSON.generate(pid: @pid)
         response = @instance.http_request("agents.s/core_api", request)
         if response.code.to_i / 100 == 2
           body = PhusionPassenger::Utils::JSON.parse(response.body)

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

@@ -44,15 +44,15 @@ module PhusionPassenger
 
       def run
         @options = {
-          :log_level => Logger::INFO,
-          :colors => :auto,
-          :error_colors => true,
-          :show_download_progress => STDOUT.tty?,
-          :compilation_tip => true,
-          :force_tip => true,
-          :use_cache => true,
-          :connect_timeout => 30,
-          :idle_timeout => 30
+          log_level: Logger::INFO,
+          colors: :auto,
+          error_colors: true,
+          show_download_progress: STDOUT.tty?,
+          compilation_tip: true,
+          force_tip: true,
+          use_cache: true,
+          connect_timeout: 30,
+          idle_timeout: 30,
         }
         parse_options
         initialize_objects
@@ -149,7 +149,7 @@ module PhusionPassenger
 
       def initialize_objects
         if @options[:url_root]
-          @sites = [{ :url => @options[:url_root] }]
+          @sites = [ { url: @options[:url_root] } ]
         else
           @sites = PhusionPassenger.binaries_sites
         end
@@ -250,7 +250,7 @@ module PhusionPassenger
             @logger.warn "Trying next mirror..."
           end
         end
-        return false
+        false
       end
 
       def real_download_support_file(site, name, output)
@@ -260,9 +260,9 @@ module PhusionPassenger
           url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
         end
         options = {
-          :cacert => site[:cacert],
-          :logger => @logger,
-          :use_cache => @options[:use_cache]
+          cacert: site[:cacert],
+          logger: @logger,
+          use_cache: @options[:use_cache],
         }
         # connect_timeout and idle_timeout may be nil or 0, which means
         # that the default Utils::Download timeouts should be used.
@@ -272,12 +272,12 @@ module PhusionPassenger
         if @options[:idle_timeout] && @options[:idle_timeout] != 0
           options[:idle_timeout] = @options[:idle_timeout]
         end
-        return PhusionPassenger::Utils::Download.download(url, output, options)
+        PhusionPassenger::Utils::Download.download(url, output, options)
       end
 
       def test_binary(filename)
         output = `env LD_BIND_NOW=1 DYLD_BIND_AT_LAUNCH=1 #{Shellwords.escape(filename)} test-binary`
-        return $? && $?.exitstatus == 0 && output == "PASS\n"
+        $? && $?.exitstatus == 0 && output == "PASS\n"
       end
 
       def compile_tip_message
@@ -292,7 +292,7 @@ module PhusionPassenger
           result << "organization who packaged #{PROGRAM_NAME} for help on this "
           result << "problem."
         end
-        return result
+        result
       end
 
       # Override InstallationUtils

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

@@ -44,15 +44,15 @@ module PhusionPassenger
 
       def run
         @options = {
-          :log_level => Logger::INFO,
-          :colors => :auto,
-          :error_colors => true,
-          :show_download_progress => STDOUT.tty?,
-          :compilation_tip => true,
-          :force_tip => true,
-          :use_cache => true,
-          :connect_timeout => 30,
-          :idle_timeout => 30
+          log_level: Logger::INFO,
+          colors: :auto,
+          error_colors: true,
+          show_download_progress: STDOUT.tty?,
+          compilation_tip: true,
+          force_tip: true,
+          use_cache: true,
+          connect_timeout: 30,
+          idle_timeout: 30,
         }
         parse_options
         initialize_objects
@@ -152,7 +152,7 @@ module PhusionPassenger
 
       def initialize_objects
         if @options[:url_root]
-          @sites = [{ :url => @options[:url_root] }]
+          @sites = [ { url: @options[:url_root] } ]
         else
           @sites = PhusionPassenger.binaries_sites
         end
@@ -254,7 +254,7 @@ module PhusionPassenger
             @logger.warn "Trying next mirror..."
           end
         end
-        return false
+        false
       end
 
       def real_download_support_file(site, name, output)
@@ -264,10 +264,10 @@ module PhusionPassenger
           url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
         end
         options = {
-          :cacert => site[:cacert],
-          :logger => @logger,
-          :use_cache => @options[:use_cache],
-          :show_progress   => @options[:show_download_progress]
+          cacert: site[:cacert],
+          logger: @logger,
+          use_cache: @options[:use_cache],
+          show_progress: @options[:show_download_progress],
         }
         # connect_timeout and idle_timeout may be nil or 0, which means
         # that the default Utils::Download timeouts should be used.
@@ -277,12 +277,12 @@ module PhusionPassenger
         if @options[:idle_timeout] && @options[:idle_timeout] != 0
           options[:idle_timeout] = @options[:idle_timeout]
         end
-        return PhusionPassenger::Utils::Download.download(url, output, options)
+        PhusionPassenger::Utils::Download.download(url, output, options)
       end
 
       def test_binary(filename)
         output = `env LD_BIND_NOW=1 DYLD_BIND_AT_LAUNCH=1 #{Shellwords.escape(filename)} -v 2>&1`
-        return $? && $?.exitstatus == 0 && output =~ /nginx version:/
+        $? && $?.exitstatus == 0 && output =~ /nginx version:/
       end
 
       def compile_tip_message
@@ -297,7 +297,7 @@ module PhusionPassenger
           result << "organization who packaged #{PROGRAM_NAME} for help on this "
           result << "problem."
         end
-        return result
+        result
       end
     end