passenger 6.0.27 → 6.1.1

data/src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb

@@ -101,58 +101,58 @@ module PhusionPassenger
     private_class_method :check_hash_map
 
     def self.default_extra_c_or_cxxflags(cc_or_cxx)
-      flags = ["-D_REENTRANT", "-I/usr/local/include"]
+      flags = %w[-D_REENTRANT -I/usr/local/include]
 
       if !send("#{cc_or_cxx}_is_sun_studio?")
-        flags << "-Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long"
+        flags.concat %w[-Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long]
         if send("#{cc_or_cxx}_supports_wno_missing_field_initializers_flag?")
-          flags << "-Wno-missing-field-initializers"
+          flags << '-Wno-missing-field-initializers'
         end
         if send("#{cc_or_cxx}_supports_wno_unknown_pragmas_flag?")
-          flags << "-Wno-unknown-pragmas"
+          flags << '-Wno-unknown-pragmas'
         end
         if requires_no_tls_direct_seg_refs? && send("#{cc_or_cxx}_supports_no_tls_direct_seg_refs_option?")
-          flags << "-mno-tls-direct-seg-refs"
+          flags << '-mno-tls-direct-seg-refs'
         end
         # Work around Clang warnings in ev++.h.
         if send("#{cc_or_cxx}_is_clang?") && compiler_supports_wno_ambiguous_member_template?
-          flags << "-Wno-ambiguous-member-template"
+          flags << '-Wno-ambiguous-member-template'
         end
       end
 
       if !send("#{cc_or_cxx}_is_sun_studio?")
         if send("#{cc_or_cxx}_supports_feliminate_unused_debug?")
-          flags << "-feliminate-unused-debug-symbols -feliminate-unused-debug-types"
+          flags.concat %w[-feliminate-unused-debug-symbols -feliminate-unused-debug-types]
         end
         if send("#{cc_or_cxx}_supports_visibility_flag?")
-          flags << "-fvisibility=hidden -DVISIBILITY_ATTRIBUTE_SUPPORTED"
+          flags.concat %w[-fvisibility=hidden -DVISIBILITY_ATTRIBUTE_SUPPORTED]
           if send("#{cc_or_cxx}_visibility_flag_generates_warnings?") &&
              send("#{cc_or_cxx}_supports_wno_attributes_flag?")
-            flags << "-Wno-attributes"
+            flags << '-Wno-attributes'
           end
         end
       end
 
       flags << '-DHAVE_ACCEPT4' if has_accept4?
-      flags << "-DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
+      flags.concat %w[-DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS]
 
       if cc_or_cxx == :cxx
         flags << debugging_cxxflags
-        flags << cxx_11_flag if cxx_11_flag
+        flags << cxx_14_flag if cxx_14_flag
 
         if cxx_supports_wno_unused_local_typedefs_flag?
           # Avoids some compilaton warnings with Boost on Ubuntu 14.04.
-          flags << "-Wno-unused-local-typedefs"
+          flags << '-Wno-unused-local-typedefs'
         end
 
         if cxx_supports_wno_vla_cxx_extension_flag?
-          flags << "-Wno-vla-cxx-extension"
+          flags << '-Wno-vla-cxx-extension'
         end
       else
         flags << debugging_cflags
       end
 
-      if os_name_simple == "solaris"
+      if os_name_simple == 'solaris'
         if send("#{cc_or_cxx}_is_sun_studio?")
           flags << '-mt'
         else
@@ -160,10 +160,10 @@ module PhusionPassenger
         end
         if os_name_full =~ /solaris2\.11/
           # skip the _XOPEN_SOURCE and _XPG4_2 definitions in later versions of Solaris / OpenIndiana
-          flags << '-D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
+          flags.concat %w[-D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64]
         else
-          flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
-          flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if os_name_full =~ /solaris2\.9/
+          flags.concat %w[-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64]
+          flags.concat %w[-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED] if os_name_full =~ /solaris2\.9/
         end
         flags << '-DBOOST_HAS_STDINT_H' unless os_name_full =~ /solaris2\.(9|10|11)/
         if send("#{cc_or_cxx}_is_sun_studio?")
@@ -171,9 +171,9 @@ module PhusionPassenger
         else
           flags << '-mcpu=ultrasparc' if RUBY_PLATFORM =~ /sparc/
         end
-      elsif os_name_simple == "openbsd"
-        flags << '-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS'
-      elsif os_name_simple == "aix"
+      elsif os_name_simple == 'openbsd'
+        flags.concat %w[-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS]
+      elsif os_name_simple == 'aix'
         flags << '-pthread'
         flags << '-DOXT_DISABLE_BACKTRACES'
       elsif RUBY_PLATFORM =~ /(sparc-linux|arm-linux|^arm.*-linux|sh4-linux)/
@@ -181,28 +181,27 @@ module PhusionPassenger
         # http://groups.google.com/group/phusion-passenger/t/6b904a962ee28e5c
         # http://groups.google.com/group/phusion-passenger/browse_thread/thread/aad4bd9d8d200561
         flags << '-DBOOST_SP_USE_PTHREADS'
-      elsif linux_distro == :centos && os_version >= "8"
+      elsif linux_distro == :centos && os_version >= '8'
         # _FORTIFY_SOURCE requires compiling with optimization (-O)
         flags << '-O'
       end
 
-      return flags.compact.map{ |str| str.strip }.join(" ").strip
+      return flags.join(' ')
     end
     private_class_method :default_extra_c_or_cxxflags
 
     def self.portability_c_or_cxx_ldflags(cc_or_cxx)
-      result = ''
-      result << cxx_11_flag if cc_or_cxx == :cxx && cxx_11_flag
-      if os_name_simple == "solaris"
-        result << ' -lxnet -lsocket -lnsl -lpthread'
+      result = []
+      result << cxx_14_flag if cc_or_cxx == :cxx && cxx_14_flag
+      if os_name_simple == 'solaris'
+        result.concat %w[-lxnet -lsocket -lnsl -lpthread]
       else
-        result << ' -lpthread'
+        result << '-lpthread'
       end
-      result << ' -lrt' if has_rt_library?
-      result << ' -lmath' if has_math_library?
-      result << ' -ldl' if has_dl_library?
-      result.strip!
-      return result
+      result << '-lrt' if has_rt_library?
+      result << '-lmath' if has_math_library?
+      result << '-ldl' if has_dl_library?
+      return result.join(' ')
     end
     private_class_method :portability_c_or_cxx_ldflags
   end

data/src/ruby_supportlib/phusion_passenger/rack_handler.rb

@@ -41,7 +41,7 @@ require 'rbconfig'
 require 'rackup' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
 
 # Rackup was removed in Rack 3, it is now a separate gem
-if Object.const_defined? :Rackup
+if Object.const_defined?(:Rackup) && ::Rackup.const_defined?(:Handler)
   module Rackup
     module Handler
       module PhusionPassenger
@@ -57,7 +57,7 @@ if Object.const_defined? :Rackup
       register :passenger, PhusionPassenger
     end
   end
-elsif Object.const_defined?(:Rack) && Rack.release < '3'
+elsif Object.const_defined?(:Rack) && ::Rack.release < '3'
   module Rack
     module Handler
       module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/request_handler/thread_handler.rb

@@ -101,8 +101,7 @@ module PhusionPassenger
       def main_loop(finish_callback)
         socket_wrapper = Utils::UnseekableSocket.new
         channel        = MessageChannel.new
-        buffer         = ''
-        buffer.force_encoding('binary') if buffer.respond_to?(:force_encoding)
+        buffer         = String.new(encoding: Encoding::BINARY)
 
         begin
           finish_callback.call
@@ -235,7 +234,7 @@ module PhusionPassenger
       def parse_http_request(connection, channel, buffer)
         headers = {}
 
-        data = ""
+        data = String.new
         while data !~ /\r\n\r\n/ && data.size < MAX_HEADER_SIZE
           data << connection.readpartial(16 * 1024)
         end

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

@@ -89,6 +89,8 @@ module PhusionPassenger
 
         begin
           config = PhusionPassenger::Utils::JSON.parse(data)
+        rescue FrozenError => e
+          raise ConfigLoadError, "cannot parse config file #{filename} (#{e}): #{e.backtrace.join("\n")}"
         rescue => e
           raise ConfigLoadError, "cannot parse config file #{filename} (#{e})"
         end

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb

@@ -88,7 +88,7 @@ module PhusionPassenger
               File.stat(report_file_path).size > 0
           end
 
-          command = ""
+          command = String.new
 
           if !@options[:envvars].empty?
             command = "env "

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

@@ -112,7 +112,7 @@ class JSON
 
   def string
     if scan(STR)
-      str, esc = '', false
+      str, esc = String.new, false
       while c = s.getch
         if esc
           str << (c == UNI ? (s.scan(CODE) || error).to_i(16).chr : SPEC[c] || c)

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

@@ -149,7 +149,7 @@ module PhusionPassenger
       end
 
       def render_to_string
-        str = ""
+        str = String.new
         @choices.each_with_index do |choice, i|
           pointer = render_pointer(i)
           checkbox = render_checkbox(choice.checked)

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

@@ -63,7 +63,7 @@ module CrashWatch
       @in.puts(command_string)
       @in.puts("echo \\n#{END_OF_RESPONSE_MARKER}\\n")
       done = false
-      result = ""
+      result = String.new
       while !done
         begin
           if select([@out], nil, nil, timeout)

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,20 +31,20 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.27'
+  VERSION_STRING = '6.1.1'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha256 <VERSION>
-  PREFERRED_NGINX_VERSION = '1.26.3'
-  NGINX_SHA256_CHECKSUM = '69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa'
+  PREFERRED_NGINX_VERSION = '1.28.0'
+  NGINX_SHA256_CHECKSUM = 'c6b5c6b086c0df9d3ca3ff5e084c1d0ef909e6038279c71c1c3e985f576ff76a'
 
   # Packaging may be locked to an older version due to the specific module configuration being
   # incompatible with the version we prefer (latest stable).
-  PACKAGING_PREFERRED_NGINX_VERSION = '1.26.3'
-  PACKAGING_NGINX_SHA256_CHECKSUM = '69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.28.0'
+  PACKAGING_NGINX_SHA256_CHECKSUM = 'c6b5c6b086c0df9d3ca3ff5e084c1d0ef909e6038279c71c1c3e985f576ff76a'
 
   # sha256sum of the .tar.gz
-  PREFERRED_PCRE_VERSION  = '10.45'
-  PCRE_SHA256_CHECKSUM = '0e138387df7835d7403b8351e2226c1377da804e0737db0e071b48f07c9d12ee'
+  PREFERRED_PCRE_VERSION  = '10.46'
+  PCRE_SHA256_CHECKSUM = '8d28d7f2c3b970c3a4bf3776bcbb5adfc923183ce74bc8df1ebaad8c1985bd07'
 
   STANDALONE_INTERFACE_VERSION  = 1
 
@@ -187,7 +187,7 @@ module PhusionPassenger
   end
 
   # Generate getters for the directory types in locations.ini.
-  getters_code = ""
+  getters_code = String.new
   (REQUIRED_LOCATIONS_INI_FIELDS + OPTIONAL_LOCATIONS_INI_FIELDS).each do |field|
     getters_code << %Q{
       def self.#{field}