passenger 6.0.24 → 6.0.25

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2015-2018 Phusion Holding B.V.
+#  Copyright (c) 2015-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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
@@ -165,6 +165,12 @@ module PhusionPassenger
         :type      => :path,
         :desc      => 'Where to store the PID file'
       },
+      {
+        :name      => :stop_timeout,
+        :type      => :integer,
+        :default   => 60,
+        :desc      => "How long in seconds to wait for the HTTP engine to gracefully shutdown,\nbefore killing it.\nDefault: %DEFAULT%"
+      },
       {
         :name      => :instance_registry_dir,
         :type      => :path,
@@ -263,7 +269,7 @@ module PhusionPassenger
         :type      => :hostname,
         :type_desc => 'HOST',
         :default   => '127.0.0.1',
-        :desc      => "The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.\nDefault: %DEFAULT%"
+        :desc      => "The address that Passenger binds to in order to allow sending\nHTTP requests to individual application processes.\nDefault: %DEFAULT%"
       },
       {
         :name      => :static_files_dir,
@@ -479,6 +485,11 @@ module PhusionPassenger
           options[:turbocaching] = false
         end
       },
+      {
+        :name      => :old_routing,
+        :type      => :boolean,
+        :desc      => 'Revert to old routing algorithm'
+      },
       {
         :name      => :unlimited_concurrency_paths,
         :type      => :array,

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2017 Phusion Holding B.V.
+#  Copyright (c) 2014-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2017 Phusion Holding B.V.
+#  Copyright (c) 2013-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2018 Phusion Holding B.V.
+#  Copyright (c) 2014-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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
@@ -155,6 +155,7 @@ module PhusionPassenger
           if @options[:turbocaching] == false
             command << " --disable-turbocaching"
           end
+          add_flag_param(command, :old_routing, "--old-routing")
           if @options[:abort_websockets_on_process_shutdown] == false
             command << " --no-abort-websockets-on-process-shutdown"
           end
@@ -200,7 +201,8 @@ module PhusionPassenger
             :ping_command  => ping_spec,
             :pid_file      => @options[:pid_file],
             :log_file      => @options[:log_file],
-            :timeout       => 25
+            :start_timeout => 25,
+            :stop_timeout  => @options[:stop_timeout]
           }
         end
 

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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
@@ -166,7 +166,7 @@ module PhusionPassenger
             :pid_file      => @options[:pid_file],
             :log_file      => @options[:log_file],
             :start_timeout => 25,
-            :stop_timeout  => 60,
+            :stop_timeout  => @options[:stop_timeout],
             :log_file_activity_timeout => 12,
             :dont_stop_if_pid_file_invalid => true
           }

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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
@@ -114,8 +114,7 @@ module PhusionPassenger
           :start_command => "true", # Doesn't matter
           :ping_command  => "true", # Doesn't matter
           :pid_file      => @options[:pid_file],
-          :log_file      => "/dev/null",
-          :timeout       => 25
+          :log_file      => "/dev/null"
         )
       end
     end

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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
@@ -84,6 +84,12 @@ module PhusionPassenger
             "Don't abort with an error if PID file cannot be found") do
             options[:ignore_pid_not_found] = true
           end
+          opts.on("-t", "--timeout NUMBER", Integer,
+                  "How long in seconds to wait for the HTTP engine to#{nl}"+
+                  "gracefully shutdown, before killing it.#{nl}" +
+                  "Default: #{defaults[:stop_timeout]}") do |value|
+            options[:stop_timeout] = value
+          end
         end
       end
 
@@ -125,7 +131,7 @@ module PhusionPassenger
           :ping_command  => "true", # Doesn't matter
           :pid_file      => @options[:pid_file],
           :log_file      => "/dev/null",
-          :timeout       => 25
+          :stop_timeout  => @options[:stop_timeout]
         )
       end
     end

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2017 Phusion Holding B.V.
+#  Copyright (c) 2013-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,9 +1,9 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2017 Phusion Holding B.V.
+#  Copyright (c) 2014-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2024 Phusion Holding B.V.
+#  Copyright (c) 2024-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2017 Phusion Holding B.V.
+#  Copyright (c) 2013-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

data/src/ruby_supportlib/phusion_passenger/utils.rb

@@ -1,9 +1,9 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

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

@@ -1,6 +1,6 @@
 # encoding: binary
 #
-# Copyright (c) 2010-2017 Phusion Holding B.V.
+# Copyright (c) 2010-2025 Asynchronous B.V.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Phusion Holding B.V.
+# Copyright (c) 2016-2025 Asynchronous B.V.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,6 +1,6 @@
 # encoding: binary
 #
-# Copyright (c) 2010-2017 Phusion Holding B.V.
+# Copyright (c) 2010-2025 Asynchronous B.V.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,6 +1,6 @@
 # encoding: binary
 #
-# Copyright (c) 2016-2017 Phusion Holding B.V.
+# Copyright (c) 2016-2025 Asynchronous B.V.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,6 +1,6 @@
 # encoding: binary
 #
-# Copyright (c) 2016-2017 Phusion Holding B.V.
+# Copyright (c) 2016-2025 Asynchronous B.V.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2017 Phusion Holding B.V.
+# Copyright (c) 2010-2025 Asynchronous B.V.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller/lock_file.rb

@@ -1,5 +1,5 @@
 # daemon_controller, library for robust daemon management
-# Copyright (c) 2010-2017 Phusion Holding B.V.
+# Copyright (c) 2010-2025 Asynchronous 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

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller/spawn.rb

@@ -1,5 +1,5 @@
 # daemon_controller, library for robust daemon management
-# Copyright (c) 2010-2017 Phusion Holding B.V.
+# Copyright (c) 2010-2025 Asynchronous 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

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller/version.rb

@@ -1,5 +1,5 @@
 # daemon_controller, library for robust daemon management
-# Copyright (c) 2010-2017 Phusion Holding B.V.
+# Copyright (c) 2010-2025 Asynchronous 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

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller.rb

@@ -1,5 +1,5 @@
 # daemon_controller, library for robust daemon management
-# Copyright (c) 2010-2017 Phusion Holding B.V.
+# Copyright (c) 2010-2025 Asynchronous 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

data/src/ruby_supportlib/phusion_passenger.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2018 Phusion Holding B.V.
+#  Copyright (c) 2010-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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
@@ -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.24'
+  VERSION_STRING = '6.0.25'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha256 <VERSION>
   PREFERRED_NGINX_VERSION = '1.26.2'
@@ -237,7 +237,7 @@ module PhusionPassenger
   # Using this method also has two more advantages:
   #
   #  1. It is immune to Bundler's load path mangling code.
-  #  2. It is faster than plan require() because it doesn't need to
+  #  2. It is faster than plain require() because it doesn't need to
   #     scan the entire load path.
   def self.require_passenger_lib(name)
     require("#{ruby_libdir}/phusion_passenger/#{name}")

data/src/schema_printer/SchemaPrinterMain.cpp

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017 Phusion Holding B.V.
+ *  Copyright (c) 2017-2025 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ *  trademarks of Asynchronous 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

data/src/schema_printer/SchemaPrinterMain.cpp.cxxcodebuilder

@@ -1,8 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2017 Phusion Holding B.V.
+#  Copyright (c) 2017-2025 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
+#  trademarks of Asynchronous 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.0.24
+  version: 6.0.25
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-07 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -129,6 +129,8 @@ files:
 - dev/websocketpp.patch
 - doc/CodingTipsAndPitfalls.md
 - doc/DebuggingAndStressTesting.md
+- doc/DesignAspects/LimitedGemDependencies.md
+- doc/DesignAspects/NoGemActivationDuringRubyLoaderInitialization.md
 - doc/DeveloperQuickstart.md
 - doc/Packaging.md
 - doc/images/phusion_banner_small.png