passenger 6.1.0 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8ecd4a23bcace3afe038c69160ef4696adea410390f6802e34c0ec659af25e0
-  data.tar.gz: 77d6784d2f2b1f1e09c136890323f9008edcc1de74bec1a6dcd4c2b54e358213
+  metadata.gz: d8b463432f9160f9b746009db0faf286890b2ea8bcf7d8aa0aab5746fb90ea5e
+  data.tar.gz: 654da8b64ddfcd4da7f06bf437befd72a0a5646b778657c2ee7e6abc497426a7
 SHA512:
-  metadata.gz: 4d9b403739e985baa1e668cb5b0ae1356253a5734ac491d754cc330fa68d3afbfe277c658b04564adb0cfac4fbdccb6c1a3389db6c1b2991644148be77d041df
-  data.tar.gz: 5220f1aa9dd6d9e61258b00b9cfe1a3368e97e6b79c8373ce114a9c58cf0ba4d7e8bc8936be779450d44a33e9fb21fdd6ea4bf6d66fa1c444950ac403477421f
+  metadata.gz: 75af1cc0616d3b9250013dfbfec2093d0476620a54a826e7f234aca3542d5fae37cafc0143c79849ba24dd74cf4236b0d8104020656a14a372746eef569b853f
+  data.tar.gz: 535252005eca991e2001dfdb5739494f2f67775e8090eb1e2edbe15e11dda6e486bf78d133a34ee858c0007c293e7ebf9bae70f2bbf289fe1df8a0ad9d89a465

data/CHANGELOG

@@ -1,15 +1,59 @@
-Release 6.1.0 (Not yet released)
+Release 6.1.2 (Not yet released)
+-------------
+ * [Ruby] logger is now a “bundled” but not “default” gem, so it must be added to gemspec. Closes GH-2642.
+ * [Ruby] Fix Ruby < 2.3 support. Closes GH-2641.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - cmake: 4.2.1 -> 4.2.2
+   - curl: 8.17.0 -> 8.18.0
+   - gnupg: 2.4.8 -> 2.5.16
+   - rubygems: 4.0.2 -> 4.0.4
+   - rubys:
+     - 3.2.9 -> 3.2.10
+     - added 4.0.1
+
+
+Release 6.1.1
+-------------
+ * [Ruby] Improve support for Ruby 4 and Frozen String Literals. Closes GH-2619.
+ * [Ubuntu] Add packages for Ubuntu 25.10 "questing", remove packages for Ubuntu 25.04 "plucky".
+ * Upgrade Boost from 1.87 -> 1.90.
+ * [Nginx] Fixes bug with unbuffered uploads. Closes GH-2575.
+ * [Nginx] Upgrades preferred Nginx to 1.28.0 from 1.26.3.
+ * [Nginx] The preferred PCRE2 version is now 10.46 (previously 10.45).
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - ccache: 4.11.2 -> 4.12.2
+   - cmake: 4.0.0 -> 4.2.1
+   - curl: 8.12.1 -> 8.17.0
+   - git: 2.49.0 -> 2.52.0
+   - gnupg:2.4.7 -> 2.4.8
+   - libffi:3.4.7 -> 3.5.2
+   - libgcrypt:1.11.0 -> 1.11.2
+   - libgpg_error:1.51 -> 1.58
+   - libreadline:8.2 -> 8.3
+   - openssl:3.4.1 -> 3.6.0
+   - pcre2:10.45 -> 10.47
+   - pinentry:1.3.1 -> 1.3.2
+   - rubygems: 3.6.6 -> 4.0.2
+   - rubys:
+     - dropped 3.1.7
+     - 3.2.8 -> 3.2.9
+     - 3.3.7 -> 3.3.10
+     - 3.4.2 -> 3.4.8
+
+
+Release 6.1.0
 -------------
  * [Ruby] Fix compatibility with Rackup while maintaining compatibility with Rack 3. Closes GH-2602.
  * A C++14 compiler is now required to compile Passenger.
  * Add rpm packages for EL10 (RHEL, Rocky, Alma).
  * [Standalone] Fixes security update checker with builtin engine.
  * [Debian] Add Debian 13 Trixie packages. Closes GH-2622.
+ * [Ubuntu] Add packages for Ubuntu 25.04 "plucky".
 
 
 Release 6.0.27
 -------------
- * Upgrade Boost from 1.86 → 1.87.
+ * Upgrade Boost from 1.86 -> 1.87.
  * Remove Passenger admin panel (Fuse).
  * Fix compilation on FreeBSD.
  * [Ruby] Fix compatibility with Rack 2 While maintaining compatibility with Rack 3. Closes GH-2595.

data/Rakefile

@@ -26,22 +26,15 @@ $LOAD_PATH.unshift("#{SOURCE_ROOT}/src/ruby_supportlib")
 # Otherwise all Ruby commands will take slightly longer to start, which messes up
 # timing-sensitive tests like those in the C++ test suite.
 if defined?(Bundler)
-  clean_env = nil
-
-  if Bundler.respond_to?(:with_original_env)
-    Bundler.with_original_env do
-      clean_env = ENV.to_hash.dup
-    end
-  elsif Bundler.respond_to?(:with_unbundled_env)
-    Bundler.with_unbundled_env do
-      clean_env = ENV.to_hash.dup
-    end
+  if Bundler.respond_to?(:original_env)
+    clean_env = Bundler.original_env
+  elsif Bundler.respond_to?(:unbundled_env)
+    clean_env = Bundler.unbundled_env
   else
-    Bundler.with_clean_env do
-      clean_env = ENV.to_hash.dup
-    end
+    clean_env = Bundler.clean_env
   end
   ENV.replace(clean_env)
+
   ARGV.each do |arg|
     if arg =~ /^(\w+)=(.*)$/m
       ENV[$1] = $2

data/bin/passenger-install-apache2-module

@@ -421,7 +421,7 @@ private
         # Running apache2:clean deletes some object files needed
         # by passenger-install-nginx-module, so we ensure those
         # object files are compiled.
-        command << " nginx"
+        command += " nginx"
       end
       return sh(command)
     else
@@ -435,14 +435,14 @@ private
   end
 
   def config_snippet
-    result = "<IfModule mod_passenger.c>\n" +
-      "  PassengerRoot #{PhusionPassenger.install_spec}\n" +
-      "  PassengerDefaultRuby #{PlatformInfo.ruby_command}\n"
+    result = ["<IfModule mod_passenger.c>",
+      "  PassengerRoot #{PhusionPassenger.install_spec}",
+      "  PassengerDefaultRuby #{PlatformInfo.ruby_command}"]
     if PhusionPassenger.packaging_method == "rpm"
-      result << "  PassengerInstanceRegistryDir /var/run/passenger-instreg\n"
+      result << "  PassengerInstanceRegistryDir /var/run/passenger-instreg"
     end
     result << "</IfModule>"
-    result
+    result.join("\n")
   end
 
   def apache2_config_snippets
@@ -574,18 +574,14 @@ private
   end
 
   def remove_duplicate_comment_blocks(filename, begin_marker, end_marker)
-    contents = File.open(filename, "rb") do |f|
-      f.read
-    end
+    contents = File.binread(filename)
     regexp = /#{Regexp.escape begin_marker}.*?#{Regexp.escape end_marker}\n?/m
     if m = regexp.match(contents)
       offset = m.end(0)
-      rest = contents.slice!(m.end(0) .. -1)
+      rest = contents.slice!(offset .. -1)
       rest.gsub!(regexp, '')
       contents << rest
-      File.open(filename, "wb") do |f|
-        f.write(contents)
-      end
+      File.binwrite(filename, contents)
     end
   end
 
@@ -916,9 +912,9 @@ parser = OptionParser.new do |opts|
 
   indent = ' ' * 37
   opts.separator "Options:"
-  opts.on("-a", "--auto", String, "Automatically build the Apache module,\n" <<
-          "#{indent}without interactively asking for user\n" <<
-          "#{indent}input.") do
+  opts.on("-a", "--auto", String, ["Automatically build the Apache module,",
+          "#{indent}without interactively asking for user",
+          "#{indent}input."].join("\n")) do
     options[:auto] = true
   end
   opts.on("--apxs2-path PATH", String, "Path to 'apxs2' command.") do |value|
@@ -927,9 +923,9 @@ parser = OptionParser.new do |opts|
   opts.on("--apr-config-path PATH", String, "Path to 'apr-config' command.") do |value|
     ENV['APR_CONFIG'] = value
   end
-  opts.on("--languages NAMES", "Comma-separated list of interested\n" <<
-      "#{indent}languages (e.g.\n" <<
-      "#{indent}'ruby,python,nodejs,meteor')") do |value|
+  opts.on("--languages NAMES", ["Comma-separated list of interested",
+      "#{indent}languages (e.g.",
+      "#{indent}'ruby,python,nodejs,meteor')"].join("\n")) do |value|
     options[:languages] = value.split(",")
   end
   opts.on("--no-compile", "Skip compilation.") do

data/bin/passenger-install-nginx-module

@@ -525,10 +525,7 @@ private
   def insert_passenger_config_snippets(prefix)
     config_file = locate_nginx_config_file(prefix)
     contents = File.read(config_file)
-    contents.sub!(/^http \{/,
-      "http {\n" <<
-      "    passenger_root #{PhusionPassenger.install_spec};\n" <<
-      "    passenger_ruby #{PlatformInfo.ruby_command};\n")
+    contents.sub!(/^http \{/, "http {\n    passenger_root #{PhusionPassenger.install_spec};\n    passenger_ruby #{PlatformInfo.ruby_command};\n")
     File.open(config_file, 'w') do |f|
       f.write(contents)
     end
@@ -556,20 +553,20 @@ private
     ].compact.join(" ").strip
 
     command = "sh ./configure --prefix='#{prefix}' "
-    command << "--with-http_ssl_module "
-    command << "--with-http_v2_module "
-    command << "--with-http_realip_module "
-    command << "--with-http_gzip_static_module "
-    command << "--with-http_stub_status_module "
-    command << "--with-http_addition_module "
-    command << "--with-cc-opt=#{Shellwords.escape extra_cflags} "
-    command << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
+    command += "--with-http_ssl_module "
+    command += "--with-http_v2_module "
+    command += "--with-http_realip_module "
+    command += "--with-http_gzip_static_module "
+    command += "--with-http_stub_status_module "
+    command += "--with-http_addition_module "
+    command += "--with-cc-opt=#{Shellwords.escape extra_cflags} "
+    command += "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
     if @pcre_source_dir
-      command << "--with-pcre='#{@pcre_source_dir}' "
+      command += "--with-pcre='#{@pcre_source_dir}' "
     elsif !pcre_is_installed?
-      command << "--without-http_rewrite_module "
+      command += "--without-http_rewrite_module "
     end
-    command << "--add-module='#{PhusionPassenger.nginx_module_source_dir}' #{extra_configure_flags}"
+    command += "--add-module='#{PhusionPassenger.nginx_module_source_dir}' #{extra_configure_flags}"
     command.strip!
     return command
   end
@@ -583,11 +580,15 @@ private
           end
           Dir.chdir("#{safe_tmpdir}") do
             # Nginx checks for PCRE in multiple places...
-            system("(gcc -I/usr/local/include -I/usr/include/pcre2 " <<
-              "-I/usr/pkg/include -I/opt/local/include " <<
-              "-I/opt/homebrew/include " <<
-              "-DPCRE2_CODE_UNIT_WIDTH=8 " <<
-              "-c passenger-check.c) >/dev/null 2>/dev/null")
+            system(["gcc",
+                    "-I/usr/local/include",
+                    "-I/usr/include/pcre2",
+                    "-I/usr/pkg/include",
+                    "-I/opt/local/include",
+                    "-I/opt/homebrew/include",
+                    "-DPCRE2_CODE_UNIT_WIDTH=8",
+                    "-c", "passenger-check.c",
+                    ">/dev/null", "2>/dev/null"].join(' '))
           end
         ensure
           File.unlink("#{safe_tmpdir}/passenger-check.c") rescue nil
@@ -602,8 +603,12 @@ private
     # We do this instead of using #file, for Ruby 1.8.5 support.
     digest = Digest::SHA256.new
     File.open(path, "rb") do |f|
-      buf = ''
-      buf.force_encoding('binary') if buf.respond_to?(:force_encoding)
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
+        buf = String.new(encoding: Encoding::BINARY)
+      else
+        buf = ""
+        buf.force_encoding('binary') if buf.respond_to?(:force_encoding)
+      end
       while !f.eof?
         f.read(1024 * 16, buf)
         digest.update(buf)
@@ -625,33 +630,31 @@ parser = OptionParser.new do |opts|
 
   indent = ' ' * 37
   opts.separator "Options:"
-  opts.on("--auto", "Automatically confirm 'Press ENTER to\n" <<
-          "#{indent}continue' prompts.") do
+  opts.on("--auto", "Automatically confirm 'Press ENTER to\n#{indent}continue' prompts.") do
     options[:auto] = true
   end
-  opts.on("--prefix=DIR", String, "Use the given Nginx install prefix instead\n" <<
-          "#{indent}of asking for it interactively.") do |dir|
+  opts.on("--prefix=DIR", String, "Use the given Nginx install prefix instead\n#{indent}of asking for it interactively.") do |dir|
     options[:prefix] = dir
   end
-  opts.on("--auto-download", "Download and install Nginx automatically,\n" <<
-          "#{indent}instead of asking interactively whether to\n" <<
-          "#{indent}download+install or to use an existing\n" <<
-          "#{indent}Nginx source directory.") do
+  opts.on("--auto-download", ["Download and install Nginx automatically,",
+          "#{indent}instead of asking interactively whether to",
+          "#{indent}download+install or to use an existing",
+          "#{indent}Nginx source directory."].join("\n")) do
     options[:auto_download] = true
   end
-  opts.on("--nginx-source-dir=DIR", String, "Compile and install Nginx using the given\n" <<
-          "#{indent}Nginx source directory, instead of\n" <<
-          "#{indent}interactively asking to download+install\n" <<
-          "#{indent}or to use an existing Nginx source\n" <<
-          "#{indent}directory. Conflicts with --auto-download.") do |dir|
+  opts.on("--nginx-source-dir=DIR", String, ["Compile and install Nginx using the given",
+          "#{indent}Nginx source directory, instead of",
+          "#{indent}interactively asking to download+install",
+          "#{indent}or to use an existing Nginx source",
+          "#{indent}directory. Conflicts with --auto-download."].join("\n")) do |dir|
     options[:nginx_source_dir] = dir
   end
-  opts.on("--extra-configure-flags=STRING", String, "Pass these extra flags to Nginx's\n" <<
-          "#{indent}'configure' script, instead of asking for\n" <<
-          "#{indent}it interactively. Specify 'none' if you\n" <<
-          "#{indent}do not want to pass additional flags but do\n" <<
-          "#{indent}not want this installer to ask\n" <<
-          "#{indent}interactively either.") do |flags|
+  opts.on("--extra-configure-flags=STRING", String, ["Pass these extra flags to Nginx's",
+          "#{indent}'configure' script, instead of asking for",
+          "#{indent}it interactively. Specify 'none' if you",
+          "#{indent}do not want to pass additional flags but do",
+          "#{indent}not want this installer to ask",
+          "#{indent}interactively either."].join("\n")) do |flags|
     options[:extra_configure_flags] = flags
   end
   opts.on("--rake-command COMMAND", String, "Customize Rake command to use") do |value|
@@ -660,9 +663,9 @@ parser = OptionParser.new do |opts|
   opts.on("--make-concurrency N", Integer, "Use N parallel jobs when running 'make'.") do |n|
     options[:make_concurrency] = n
   end
-  opts.on("--languages NAMES", "Comma-separated list of interested\n" <<
-      "#{indent}languages (e.g.\n" <<
-      "#{indent}'ruby,python,nodejs,meteor')") do |value|
+  opts.on("--languages NAMES", ["Comma-separated list of interested",
+      "#{indent}languages (e.g.",
+      "#{indent}'ruby,python,nodejs,meteor')"].join("\n")) do |value|
     options[:languages] = value.split(",")
   end
   opts.on("--force-colors", "Display colors even if stdout is not a TTY") do

data/bin/passenger-status

@@ -258,8 +258,7 @@ end
 
 def print_permission_error_message
   PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-  STDERR.puts "*** ERROR: You are not authorized to query the status for this " <<
-    "#{PROGRAM_NAME} instance. Please try again with '#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
+  STDERR.puts "*** ERROR: You are not authorized to query the status for this #{PROGRAM_NAME} instance. Please try again with '#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
 end
 
 def format_with_xmllint(xml)
@@ -302,7 +301,7 @@ end
 
 def create_option_parser(options)
   return OptionParser.new do |opts|
-    nl = "\n" << " " * 37
+    nl = "\n#{" " * 37}"
     opts.banner = "Usage: passenger-status [options] [instance name]"
     opts.separator ""
     opts.separator "Tool for inspecting Phusion Passenger's internal status."
@@ -310,10 +309,10 @@ def create_option_parser(options)
 
     opts.separator "Options:"
     opts.on("--show=pool|server|backtraces|xml|json|union_station", String,
-            "Whether to show the pool's contents,#{nl}" <<
-            "the currently running requests,#{nl}" <<
-            "the backtraces of all threads or an XML#{nl}" <<
-            "or JSON description of the pool.") do |what|
+            ["Whether to show the pool's contents,",
+            "the currently running requests,",
+            "the backtraces of all threads or an XML",
+            "or JSON description of the pool."].join(nl)) do |what|
       if what !~ /\A(pool|server|requests|backtraces|xml|json|union_station)\Z/
         STDERR.puts "Invalid argument for --show."
         exit 1
@@ -321,9 +320,9 @@ def create_option_parser(options)
         options[:show] = what
       end
     end
-    opts.on("--no-header", "Do not display an informative header#{nl}" <<
-            "containing the timestamp, version number,#{nl}" <<
-            "etc.") do
+    opts.on("--no-header", ["Do not display an informative header",
+            "containing the timestamp, version number,",
+            "etc."].join(nl)) do
       options[:noheader] = true
     end
     opts.on("--force-colors", "Display colors even if stdout is not a TTY") do

data/build/common_library.rb

@@ -40,7 +40,7 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
   if OPTIMIZE
     optimize = "-O2"
     if LTO
-      optimize << " -flto"
+      optimize += " -flto"
     end
   end
 
@@ -109,8 +109,8 @@ if USE_VENDORED_LIBEV
   let(:libev_cflags) do
     result = '-Isrc/cxx_supportlib/vendor-modified/libev'
     # Apple Clang 4.2 complains about ambiguous member templates in ev++.h.
-    result << ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
-    result << ' -DUSE_VENDORED_LIBEV'
+    result += ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
+    result += ' -DUSE_VENDORED_LIBEV'
     result
   end
 
@@ -167,7 +167,7 @@ else
   let(:libev_cflags) do
     result = string_option('LIBEV_CFLAGS', '-I/usr/include/libev')
     # Apple Clang 4.2 complains about ambiguous member templates in ev++.h.
-    result << ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
+    result += ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
     result
   end
 

data/build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder/builder.rb

@@ -56,7 +56,7 @@ module CxxCodeBuilder
     def initialize(&block)
       @indent_string = "\t"
       @indent_level = 0
-      @code = ""
+      @code = String.new
 
       if block
         instance_eval(&block)

data/build/test_basics.rb

@@ -46,7 +46,7 @@ end
 
 desc "Install developer dependencies"
 task 'test:install_deps' do
-  gem_install = PlatformInfo.gem_command + " install --no-rdoc --no-ri"
+  gem_install = PlatformInfo.gem_command + " install --no-document"
   gem_install = "#{PlatformInfo.ruby_sudo_command} #{gem_install}" if boolean_option('SUDO')
   default = boolean_option('DEVDEPS_DEFAULT', true)
   install_base_deps = boolean_option('BASE_DEPS', default)
@@ -82,13 +82,14 @@ end
 
 def bundler_version
   `bundle --version` =~ /version (.+)/
+  `gem info --quiet --remote --exact bundler`.lines.first =~ /bundler \((.+)\)/ if $1.nil?
   Gem::Version.new($1)
 end
 
 def bundler_too_old?
-  Gem::Version.new(bundler_version) < Gem::Version.new("1.1.10")
+  bundler_version < Gem::Version.new("1.1.10")
 end
 
 def bundler_too_new?
-  Gem::Version.new(bundler_version) >= Gem::Version.new("2.1.0")
+  bundler_version >= Gem::Version.new("2.1.0")
 end

data/dev/copy_boost_headers

@@ -220,34 +220,34 @@ def copy_dependencies(cflags)
   else
     openssl_path = '/usr/include/openssl'
   end
-  done = false
-  while !done
+
+  loop do
     compiler_output = `c++ test.cpp -c -I#{openssl_path}/include -I. -I.. #{cflags.join(" ")} 2>&1`
     File.unlink('test.o') if File.exist?('test.o')
-    missing_headers = compiler_output.
-                        split("\n").
-                        grep(/(error: .*: No such file|fatal error: '.*' file not found)/).
-                        reject{|s| s =~ /\/usr\/include\// }.
-                        map do |line|
-      if line =~ /error: (.*): No such file/
-        file = $1
-      elsif line =~ /fatal error: '(.*)' file not found/
-        file = $1
-      else
-        abort "Bug"
-      end
-      if file =~ /^boost\//
-        file
-      else
-        line =~ /(.*?):/
-        source = $1
-        File.dirname(source) + "/" + file
+    missing_headers = compiler_output.lines.
+      grep(/(error: .*: No such file|fatal error: '.*' file not found)/).
+      reject{|s| s =~ /\/usr\/include\// }.
+      map do |line|
+        if line =~ /error: (.*): No such file/
+          file = $1
+        elsif line =~ /fatal error: '(.*)' file not found/
+          file = $1
+        else
+          abort "Bug"
+        end
+
+        if file =~ /^boost\//
+          file
+        else
+          line =~ /(.*?):/
+          source = $1
+          File.dirname(source) + "/" + file
+        end
       end
-    end
     missing_headers.each do |header|
       install("#{BOOST_DIR}/#{header}", header)
     end
-    done = missing_headers.empty?
+    break if missing_headers.empty?
   end
 end
 
@@ -265,27 +265,41 @@ def start
     prepare
     copy_essential_files
     [
-      "-std=c++98",
-      "-std=c++03",
-      "-std=gnu++98",
-      "-std=gnu++03",
-      "-std=c++11",
-      "-std=gnu++11",
-      "-std=c++14",
-      "-std=gnu++14",
-      "-std=c++17",
-      "-std=gnu++17",
-      "-std=c++20",
-      "-std=gnu++20",
-      "-std=c++0x",
-      "-std=gnu++0x",
-      ""
-    ].product(["-m32","-m64",""]).each do |flags|
-      copy_dependencies(flags)
-    end
+      14,
+      17,
+      20,
+      23,
+      26,
+    ].product(['c++', 'gnu++'])
+      .map{|v,l| "-std=#{l}#{v}" }
+      .push("")
+      .product(["-m64",""])
+      .each do |flags|
+    copy_dependencies(flags)
+  end
   ensure
     cleanup
   end
 end
 
 start
+
+#### Magic bash editing buffer #################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################
+################################################

data/dev/ruby_server.rb

@@ -135,7 +135,12 @@ private
   def handle_next_client(forward_connection)
     client = @server.accept
     begin
-      buffer = "".force_encoding("binary")
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
+        buffer = String.new(encoding: Encoding::BINARY)
+      else
+        buffer = ""
+        buffer.force_encoding('binary') if buffer.respond_to?(:force_encoding)
+      end
       while true
         begin
           read_header(client, buffer)

data/passenger.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rake', '>= 12.3.3'
   s.add_dependency 'rack', '>= 1.6.13'
   s.add_dependency 'rackup', '>= 1.0.1'
+  s.add_dependency 'logger', '>= 1.7.0'
 
   s.files = Dir[*PhusionPassenger::Packaging::GLOB] -
     Dir[*PhusionPassenger::Packaging::EXCLUDE_GLOB]

data/src/agent/Core/Config.h

@@ -149,7 +149,7 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/6.1.0")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.1.2")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_start_command                               string             -          read_only

data/src/agent/Core/Controller/Config.h

@@ -118,7 +118,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   old_routing                                         boolean            -          default(false),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/6.1.0")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.1.2")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

data/src/agent/Watchdog/Config.h

@@ -139,7 +139,7 @@ using namespace std;
  *   security_update_checker_interval                                         unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                                        string             -          -
  *   security_update_checker_url                                              string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                          string             -          default("Phusion_Passenger/6.1.0")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.1.2")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/cxx_supportlib/Constants.h

@@ -84,7 +84,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.1.0"
+#define PASSENGER_VERSION "6.1.2"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"