passenger 6.0.22 → 6.0.24

data/src/ruby_supportlib/phusion_passenger/rack_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2016-2017 Phusion Holding B.V.
 #
@@ -30,73 +32,45 @@ begin
 rescue LoadError
 end
 require 'phusion_passenger'
+require_relative 'rack/handler'
 ## Magic comment: end bootstrap ##
 
 PhusionPassenger.locate_directories
 
 require 'rbconfig'
+require 'rackup' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
 
-module Rack
-  module Handler
-    class PhusionPassenger
-      class << self
-        def run(app, options = {})
-          result = system(ruby_executable, '-S', find_passenger_standalone,
-            'start', *build_args(options))
-          if !result
-            raise "Error starting Passenger"
-          end
-        end
-
-        def environment
-          ENV['RAILS_ENV'] || 'development'
-        end
-
-        def to_s
-          'Passenger application server'
-        end
-
-      private
-        def build_args(options)
-          args = ['-e', environment]
-          if options[:Port]
-            args << '-p'
-            args << options[:Port].to_s
-          end
-          if options[:Host]
-            args << '-a'
-            args << options[:Host].to_s
-          end
-          if options[:config]
-            args << '-R'
-            args << options[:config].to_s
-          end
-          args
-        end
-
-        def rb_config
-          if defined?(::RbConfig)
-            ::RbConfig::CONFIG
-          else
-            ::Config::CONFIG
-          end
+# Rackup was removed in Rack 3, it is now a separate gem
+if Object.const_defined? :Rackup
+  module Rackup
+    module Handler
+      module PhusionPassenger
+        class << self
+          include ::PhusionPassenger::Rack::Handler
         end
+      end
 
-        def ruby_executable
-          @ruby_executable ||= rb_config['bindir'] + '/' +
-            rb_config['RUBY_INSTALL_NAME'] + rb_config['EXEEXT']
-        end
+      def self.default(options = {})
+        ::Rackup::Handler::PhusionPassenger
+      end
 
-        def find_passenger_standalone
-          ::File.join(::PhusionPassenger.bin_dir, 'passenger')
+      register :passenger, PhusionPassenger
+    end
+  end
+elsif Object.const_defined?(:Rack) && Rack.release < '3'
+  module Rack
+    module Handler
+      module PhusionPassenger
+        class << self
+          include ::PhusionPassenger::Rack::Handler
         end
       end
-    end
-
-    register 'passenger', 'Rack::Handler::PhusionPassenger'
-
-    def self.default(options = {})
-      Rack::Handler::PhusionPassenger
+      def self.default(options = {})
+        ::Rack::Handler::PhusionPassenger
+      end
     end
   end
+  ::Rack::Handler.register(:passenger, ::Rack::Handler::PhusionPassenger)
+else
+  raise 'Rack 3 must be used with the Rackup gem'
 end

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

@@ -281,6 +281,11 @@ module PhusionPassenger
         :type      => :boolean,
         :desc      => 'Turn on friendly error pages'
       },
+      {
+        :name      => :custom_error_page,
+        :type      => :path,
+        :desc      => 'Path to html file to use for Passenger generated error pages'
+      },
       {
         :type      => :boolean,
         :cli       => '--no-friendly-error-pages',

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

@@ -144,6 +144,7 @@ module PhusionPassenger
           add_param(command, :app_start_command, "--app-start-command")
           add_param(command, :spawn_method, "--spawn-method")
           add_param(command, :restart_dir, "--restart-dir")
+          add_param(command, :custom_error_page, "--custom-error-page")
           if @options.has_key?(:friendly_error_pages)
             if @options[:friendly_error_pages]
               command << " --force-friendly-error-pages"

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

@@ -93,15 +93,11 @@ module PhusionPassenger
       ################# Configuration loading, option parsing and initialization ###################
 
       def self.create_option_parser(options)
-        logical_pwd = Dir.logical_pwd
-
         # If you add or change an option, make sure to update the following places too:
         # - src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb,
         #   function #build_daemon_controller_options
         # - resources/templates/standalone/config.erb
         OptionParser.new do |opts|
-          defaults = CONFIG_DEFAULTS
-          nl = "\n" + ' ' * 37
           opts.banner = "Usage: passenger start [DIRECTORY] [OPTIONS]\n"
           opts.separator "Starts #{PROGRAM_NAME} Standalone and serve one or more web applications."
           opts.separator ""

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

@@ -25,7 +25,7 @@
 # gem being available, for example in 'passenger start' before the RuntimeInstaller
 # has run.
 
-require 'strscan'
+PhusionPassenger.require_passenger_lib 'utils/strscan'
 require 'forwardable'
 
 module PhusionPassenger
@@ -56,11 +56,10 @@ class JSON
   private :s, :scan, :matched
 
   def initialize data
-    @scanner = StringScanner.new data.to_s
+    @scanner = PhusionPassenger::Utils::StringScanner.new data.to_s
   end
 
   def parse
-    space
     object
   end
 
@@ -152,7 +151,7 @@ class JSON
     private
 
     def generate_type(obj)
-      type = obj.is_a?(Numeric) ? :Numeric : obj.class.name
+      type = obj.is_a?(Numeric) ? :Numeric : obj.class.name.split('::').last
       begin send(:"generate_#{type}", obj)
       rescue NoMethodError; raise ArgumentError, "can't serialize #{type}"
       end
@@ -171,6 +170,10 @@ class JSON
       quote str.gsub(/[\r\n\f\t\b"\\]/) { "\\#{ESC_MAP[$&]}"}
     end
 
+    def generate_VersionComparer(vc)
+      generate_String(vc)
+    end
+
     def generate_simple(obj) obj.inspect end
     alias generate_Numeric generate_simple
     alias generate_TrueClass generate_simple
@@ -197,199 +200,5 @@ class JSON
   extend Generator
 end
 
-if __FILE__ == $0
-if !$stdin.tty?
-  data = JSON.parse $stdin.read
-  require 'pp'
-  pp data
-else
-  require 'test/unit'
-  require 'date'
-  class ParserTest < Test::Unit::TestCase
-    PARSED = JSON.parse DATA.read
-    def parsed() PARSED end
-    def parse_string(str) JSON.parse(%(["#{str}"]).gsub('\\\\', '\\')).first end
-    def test_string
-      assert_equal "Pagination library for \"Rails 3\", Sinatra, Merb, DataMapper, and more",
-        parsed['head']['repository']['description']
-    end
-    def test_string_specials
-      assert_equal "\r\n\t\f\b", parse_string('\r\n\t\f\b')
-      assert_equal "aA", parse_string('\u0061\u0041')
-      assert_equal "\e", parse_string('\u001B')
-      assert_equal "xyz", parse_string('\x\y\z')
-      assert_equal '"\\/', parse_string('\"\\\\\\/')
-      assert_equal 'no #{interpolation}', parse_string('no #{interpolation}')
-    end
-    def test_hash
-      assert_equal %w[label ref repository sha user], parsed['head'].keys.sort
-    end
-    def test_number
-      assert_equal 124.3e2, parsed['head']['repository']['size']
-    end
-    def test_bool
-      assert_equal true, parsed['head']['repository']['fork']
-      assert_equal false, parsed['head']['repository']['private']
-    end
-    def test_nil
-      assert_nil parsed['head']['user']['company']
-    end
-    def test_array
-      assert_equal ["4438f", {"a" => "b"}], parsed['head']['sha']
-    end
-    def test_invalid
-      assert_raises(RuntimeError) { JSON.parse %({) }
-      assert_raises(RuntimeError) { JSON.parse %({ "foo": }) }
-      assert_raises(RuntimeError) { JSON.parse %([ "foo": "bar" ]) }
-      assert_raises(RuntimeError) { JSON.parse %([ ~"foo" ]) }
-      assert_raises(RuntimeError) { JSON.parse %([ "foo ]) }
-      assert_raises(RuntimeError) { JSON.parse %([ "foo\\" ]) }
-      assert_raises(RuntimeError) { JSON.parse %([ "foo\\uabGd" ]) }
-    end
-    def test_single_line_comments
-      source = %Q{
-        // comment before document
-        {
-          // comment
-          "foo": "1",
-          "bar": "2",
-          // another comment
-          "baz": "3",
-          "array": [
-            // comment inside array
-            1, 2, 3
-            // comment at end of array
-          ]
-          // comment at end of hash
-        }
-        // comment after document
-      }
-      doc = { "foo" => "1", "bar" => "2", "baz" => "3", "array" => [1, 2, 3] }
-      assert_equal(doc, JSON.parse(source))
-    end
-    def test_multi_line_comments
-      source = %Q{
-        /* comment before
-         * document */
-        {
-          /* comment */
-          "foo": "1",
-          "bar": "2",
-          /* another
-             comment
-           */
-          "baz": "3",
-          "array": [
-            /* comment inside array */
-            1, 2, 3,
-            4, /* comment inside an array */ 5,
-            /*
-               // "nested" comments
-               { "faux json": "inside comment" }
-             */
-            6, 7
-            /**
-             * comment at end of array
-             */
-          ]
-          /**************************
-           comment at end of hash
-           **************************/
-        }
-        /* comment after
-           document */
-      }
-      doc = { "foo" => "1", "bar" => "2", "baz" => "3", "array" => [1, 2, 3, 4, 5, 6, 7] }
-      assert_equal(doc, JSON.parse(source))
-    end
-  end
-
-  class GeneratorTest < Test::Unit::TestCase
-    def generate(obj) JSON.generate(obj) end
-    def test_array
-      assert_equal %([1, 2, 3]), generate([1, 2, 3])
-    end
-    def test_bool
-      assert_equal %([true, false]), generate([true, false])
-    end
-    def test_null
-      assert_equal %([null]), generate([nil])
-    end
-    def test_string
-      assert_equal %(["abc\\n123"]), generate(["abc\n123"])
-    end
-    def test_string_unicode
-      assert_equal %(["ć\\"č\\nž\\tš\\\\đ"]), generate(["ć\"č\nž\tš\\đ"])
-    end
-    def test_time
-      time = Time.utc(2012, 04, 19, 1, 2, 3)
-      assert_equal %(["2012-04-19 01:02:03 UTC"]), generate([time])
-    end
-    def test_date
-      time = Date.new(2012, 04, 19)
-      assert_equal %(["2012-04-19"]), generate([time])
-    end
-    def test_symbol
-      assert_equal %(["abc"]), generate([:abc])
-    end
-    def test_hash
-      json = generate(:abc => 123, 123 => 'abc')
-      assert_match /^\{/, json
-      assert_match /\}$/, json
-      assert_equal [%("123": "abc"), %("abc": 123)], json[1...-1].split(', ').sort
-    end
-    def test_nested_structure
-      json = generate(:hash => {1=>2}, :array => [1,2])
-      assert json.include?(%("hash": {"1": 2}))
-      assert json.include?(%("array": [1, 2]))
-    end
-    def test_invalid_json
-      assert_raises(ArgumentError) { generate("abc") }
-    end
-    def test_invalid_object
-      err = assert_raises(ArgumentError) { generate("a" => Object.new) }
-      assert_equal "can't serialize Object", err.message
-    end
-  end
-end
-end
-
 end # module Utils
 end # module PhusionPassenger
-
-__END__
-{
-  "head": {
-    "ref": "master",
-    "repository": {
-      "forks": 0,
-      "integrate_branch": "rails3",
-      "watchers": 1,
-      "language": "Ruby",
-      "description": "Pagination library for \"Rails 3\", Sinatra, Merb, DataMapper, and more",
-      "has_downloads": true,
-      "fork": true,
-      "created_at": "2011/10/24 03:20:48 -0700",
-      "homepage": "http://github.com/mislav/will_paginate/wikis",
-      "size": 124.3e2,
-      "private": false,
-      "has_wiki": true,
-      "name": "will_paginate",
-      "owner": "dbackeus",
-      "url": "https://github.com/dbackeus/will_paginate",
-      "has_issues": false,
-      "open_issues": 0,
-      "pushed_at": "2011/10/25 05:44:05 -0700"
-    },
-    "label": "dbackeus:master",
-    "sha": ["4438f", { "a" : "b" }],
-    "user": {
-      "name": "David Backeus",
-      "company": null,
-      "gravatar_id": "ebe96524f5db9e92188f0542dc9d1d1a",
-      "location": "Stockholm (Sweden)",
-      "type": "User",
-      "login": "dbackeus"
-    }
-  }
-}

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

@@ -0,0 +1,67 @@
+# encoding: utf-8
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2024 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+module PhusionPassenger
+module Utils
+
+# A minimal pure-Ruby StringScanner implementation so that
+# PhusionPassenger::Utils::JSON doesn't have to depend on the 'strscan' gem.
+class StringScanner
+  attr_reader :pos, :matched
+
+  def initialize(data)
+    @data = data
+    @pos = 0
+    @matched = nil
+  end
+
+  def getch
+    @matched =
+      if @pos < @data.size
+        @pos += 1
+        @data[@pos - 1]
+      else
+        nil
+      end
+  end
+
+  def scan(pattern)
+    md = @data[@pos .. -1].match(/\A#{pattern}/)
+    @matched =
+      if md
+        @pos += md[0].size
+        @matched = md[0]
+      else
+        nil
+      end
+  end
+
+  def reset
+    @pos = 0
+  end
+end
+
+end # module Utils
+end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/utils.rb

@@ -23,8 +23,6 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'base64'
-
 module PhusionPassenger
 
   # Utility functions.
@@ -182,19 +180,11 @@ module PhusionPassenger
       end
     end
 
-    if Base64.respond_to?(:strict_encode64)
-      def base64(data)
-        Base64.strict_encode64(data)
-      end
-    else
-      # Base64-encodes the given data. Newlines are removed.
-      # This is like `Base64.strict_encode64`, but also works
-      # on Ruby 1.8 which doesn't have that method.
-      def base64(data)
-        result = Base64.encode64(data)
-        result.delete!("\n")
-        result
-      end
+    # Returns a base64 encoded string without line breaks and padding.
+    # Like Base64.strict_encode64, but without a dependency on the
+    # 'base64' library/gem.
+    def base64(data)
+      [data].pack("m0")
     end
 
     # Returns a string which reports the backtraces for all threads,

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,16 +31,16 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.22'
+  VERSION_STRING = '6.0.24'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha256 <VERSION>
-  PREFERRED_NGINX_VERSION = '1.26.0'
-  NGINX_SHA256_CHECKSUM = 'd2e6c8439d6c6db5015d8eaab2470ab52aef85a7bf363182879977e084370497'
+  PREFERRED_NGINX_VERSION = '1.26.2'
+  NGINX_SHA256_CHECKSUM = '627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738'
 
   # 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.0'
-  PACKAGING_NGINX_SHA256_CHECKSUM = 'd2e6c8439d6c6db5015d8eaab2470ab52aef85a7bf363182879977e084370497'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.26.2'
+  PACKAGING_NGINX_SHA256_CHECKSUM = '627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738'
 
   # sha256sum of the .tar.gz
   PREFERRED_PCRE_VERSION  = '10.39'