passenger 6.0.13 → 6.0.15

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

@@ -25,7 +25,7 @@
 require 'optparse'
 require 'net/http'
 require 'socket'
-require 'rexml/document'
+require 'json'
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'admin_tools/instance_registry'
 PhusionPassenger.require_passenger_lib 'config/command'
@@ -148,8 +148,8 @@ module PhusionPassenger
       end
 
       def select_app_group_name_exact(name)
-        query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
-          if group.elements["name"].text == name
+        query_pool_json.each do |group|
+          if group[:name] == name
             @groups << group
           end
         end
@@ -161,8 +161,8 @@ module PhusionPassenger
 
       def query_group_names
         result = []
-        query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
-          result << group.elements["name"].text
+        query_pool_json.each do |group|
+          result << group[:name]
         end
         result << "Cancel"
         result
@@ -204,8 +204,8 @@ module PhusionPassenger
           app_root = Dir.pwd
         end
         regex = /^#{Regexp.escape(app_root)}/
-        query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
-          if group.elements["app_root"].text =~ regex
+        query_pool_json.each do |group|
+          if group[:app_root] =~ regex
             @groups << group
           end
         end
@@ -218,7 +218,7 @@ module PhusionPassenger
       def perform_restart
         restart_method = @options[:rolling_restart] ? "rolling" : "blocking"
         @groups.each do |group|
-          group_name = group.elements["name"].text
+          group_name = group[:name]
           puts "Restarting #{group_name}"
           request = Net::HTTP::Post.new("/pool/restart_app_group.json")
           try_performing_full_admin_basic_auth(request, @instance)
@@ -249,15 +249,19 @@ module PhusionPassenger
         end
       end
 
-      def query_pool_xml
-        request = Net::HTTP::Get.new("/pool.xml")
+      def query_pool_json
+        request = Net::HTTP::Get.new("/pool.json")
         try_performing_ro_admin_basic_auth(request, @instance)
         response = @instance.http_request("agents.s/core_api", request)
         if response.code.to_i / 100 == 2
-          REXML::Document.new(response.body)
+          if RUBY_VERSION >= '2.3'
+            JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value.dig(:app_root,0,:value)}}
+          else
+            JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value[:app_root][0][:value]}}
+          end
         elsif response.code.to_i == 401
           if response["pool-empty"] == "true"
-            REXML::Document.new('<?xml version="1.0" encoding="iso8859-1"?><info version="3"></info>')
+            []
           elsif @options[:ignore_app_not_running]
             print_instance_querying_permission_error
             exit

data/src/ruby_supportlib/phusion_passenger/console_text_template.rb

@@ -40,8 +40,13 @@ module PhusionPassenger
         data = input[:text]
       end
       @colors = options[:colors] || AnsiColors.new
-      @template = ERB.new(@colors.ansi_colorize(data),
-        nil, '-', '@buffer')
+
+      if RUBY_VERSION >= '2.6'
+        @template = ERB.new(@colors.ansi_colorize(data), trim_mode: '-', eoutvar: '@buffer')
+      else
+        @template = ERB.new(@colors.ansi_colorize(data), nil, '-', '@buffer')
+      end
+
       @template.filename = filename if filename
       options.each_pair do |name, value|
         self[name] = value

data/src/ruby_supportlib/phusion_passenger/packaging.rb

@@ -104,7 +104,7 @@ module PhusionPassenger
       'Jenkinsfile',
       'Passenger.sublime-project',
       'Vagrantfile',
-      'yarn.lock',
+      'package-lock.json',
       'build/support/vendor/*/.*',
       'build/support/vendor/*/spec/**/*',
       'dev/*/**/*',

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

@@ -187,7 +187,7 @@ module PhusionPassenger
           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/
         end
-        flags << '-DBOOST_HAS_STDINT_H' unless os_name_full =~ /solaris2\.9/
+        flags << '-DBOOST_HAS_STDINT_H' unless os_name_full =~ /solaris2\.(9|10|11)/
         if send("#{cc_or_cxx}_is_sun_studio?")
           flags << '-xtarget=ultra' if RUBY_PLATFORM =~ /sparc/
         else

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

@@ -309,10 +309,10 @@ module PhusionPassenger
 
         # That failed too. Try extracting info from from $LOAD_PATH.
         matching_path = $LOAD_PATH.find_all do |item|
-          item.include?("rvm/gems/")
+          item.include?("rvm/gems/") || item.include?("rvm/rubies/")
         end
         if matching_path && !matching_path.empty?
-          subpath = matching_path.to_s.gsub(/^.*rvm\/gems\//, '')
+          subpath = matching_path.to_s.gsub(/^.*rvm\/(gems|rubies)\//, '')
           result = subpath.split('/').first
           return result if result
         end

data/src/ruby_supportlib/phusion_passenger/rack/thread_handler_extension.rb

@@ -106,6 +106,9 @@ module PhusionPassenger
           begin
             status, headers, body = @app.call(env)
           rescue => e
+            if e.is_a?(Errno::ENOBUFS)
+              raise e
+            end
             if !should_swallow_app_error?(e, socket_wrapper)
               # It's a good idea to catch application exceptions here because
               # otherwise maliciously crafted responses can crash the app,
@@ -155,6 +158,9 @@ module PhusionPassenger
             process_body(env, connection, socket_wrapper, status.to_i, is_head_request,
               headers, body)
           rescue => e
+            if e.is_a?(Errno::ENOBUFS)
+              raise e
+            end
             if !should_swallow_app_error?(e, socket_wrapper)
               print_exception("Rack response body object", e)
             end
@@ -324,6 +330,9 @@ module PhusionPassenger
         begin
           body.close if body && body.respond_to?(:close)
         rescue => e
+          if e.is_a?(Errno::ENOBUFS)
+            raise e
+          end
           if !should_swallow_app_error?(e, socket_wrapper)
             print_exception("Rack response body object's #close method", e)
           end

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

@@ -75,7 +75,7 @@ module PhusionPassenger
           #
           # Connect to the engine's server and wait until it disconnects the socket
           # because of timeout. Keep doing this until we can no longer connect.
-          while true
+          loop do
             if @options[:socket_file]
               socket = UNIXSocket.new(@options[:socket_file])
             else
@@ -110,14 +110,14 @@ module PhusionPassenger
           command = "#{Shellwords.escape @nginx_binary}" \
             " -c #{Shellwords.escape path}" \
             " -p #{Shellwords.escape @working_dir}" \
-            " -t"
+            ' -t'
           output = `#{command} 2>&1`
           if $? && $?.exitstatus != 0
             output.gsub!(path, file)
             output = PlatformInfo.send(:reindent, output, 4)
 
             message = "*** ERROR: the Nginx configuration that #{PROGRAM_NAME}" \
-              " Standalone generated internally contains problems. The error " \
+              ' Standalone generated internally contains problems. The error ' \
               "message returned by the Nginx engine is:\n\n" \
               "#{output}\n\n"
             debug_log_file = Utils::TmpIO.new('passenger-standalone',
@@ -130,16 +130,16 @@ module PhusionPassenger
               debug_log_file.close
             end
             if @options[:nginx_config_template] && file == 'nginx.conf'
-              message << "This probably means that you have a problem in your " \
+              message << 'This probably means that you have a problem in your ' \
                 "Nginx configuration template. Please fix your template.\n\n" \
                 "Tip: to debug your template, re-run #{SHORT_PROGRAM_NAME} " \
-                "Standalone with the `--debug-nginx-config` option. This " \
-                "allows you to see how the final Nginx config file looks like."
+                'Standalone with the `--debug-nginx-config` option. This ' \
+                'allows you to see how the final Nginx config file looks like.'
             else
-              message << "This probably means that you have found a bug in " \
+              message << 'This probably means that you have found a bug in ' \
                 "#{PROGRAM_NAME} Standalone. Please report this bug to our " \
                 "Github issue tracker: https://github.com/phusion/passenger/issues\n\n" \
-                "In the bug report, please include this error message, as " \
+                'In the bug report, please include this error message, as ' \
                 "well as the contents of the file #{debug_log_file.path}"
             end
 
@@ -155,13 +155,13 @@ module PhusionPassenger
           end
           return {
             :identifier    => 'Nginx',
-            :start_command => "#{Shellwords.escape @nginx_binary} " +
-              "-c #{Shellwords.escape nginx_config_path} " +
+            :start_command => "#{Shellwords.escape @nginx_binary} " \
+              "-c #{Shellwords.escape nginx_config_path} " \
               "-p #{Shellwords.escape @working_dir}",
-            :stop_command => "#{Shellwords.escape @nginx_binary} " +
-              "-c #{Shellwords.escape nginx_config_path} " +
-              "-p #{Shellwords.escape @working_dir} " +
-              "-s quit",
+            :stop_command => "#{Shellwords.escape @nginx_binary} " \
+              "-c #{Shellwords.escape nginx_config_path} " \
+              "-p #{Shellwords.escape @working_dir} " \
+              '-s quit',
             :ping_command  => ping_spec,
             :pid_file      => @options[:pid_file],
             :log_file      => @options[:log_file],
@@ -179,8 +179,13 @@ module PhusionPassenger
         def write_nginx_config_file(path)
           File.open(path, 'w') do |f|
             f.chmod(0644)
-            erb = ERB.new(File.read(nginx_config_template_filename), nil,
-              "-", next_eoutvar)
+
+            if RUBY_VERSION >= '2.6'
+              erb = ERB.new(File.read(nginx_config_template_filename), trim_mode: "-", eoutvar: next_eoutvar)
+            else
+              erb = ERB.new(File.read(nginx_config_template_filename), nil, '-', next_eoutvar)
+            end
+
             erb.filename = nginx_config_template_filename
 
             # The template requires some helper methods which are defined in start_command.rb.
@@ -279,7 +284,13 @@ module PhusionPassenger
 
         def include_passenger_internal_template(name, indent = 0, fix_existing_indenting = true, the_binding = get_binding)
           path = "#{PhusionPassenger.resources_dir}/templates/standalone/#{name}"
-          erb = ERB.new(File.read(path), nil, "-", next_eoutvar)
+
+          if RUBY_VERSION >= '2.6'
+            erb = ERB.new(File.read(path), trim_mode: "-", eoutvar: next_eoutvar)
+          else
+            erb = ERB.new(File.read(path), nil, "-", next_eoutvar)
+          end
+
           erb.filename = path
           result = erb.result(the_binding)
 

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.13'
+  VERSION_STRING = '6.0.15'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
   PREFERRED_NGINX_VERSION = '1.20.2'