From c7599c49ef2d757c877045564f26156bb36dc4e5 Mon Sep 17 00:00:00 2001
From: Camden Narzt <c.narzt@me.com>
Date: Thu, 12 Dec 2024 12:20:38 -0700
Subject: [PATCH] fix timeouts in passenger standalone

wrong option names were used for timeouts
---
 CHANGELOG                                                      | 1 +
 .../standalone/start_command/builtin_engine.rb                 | 2 +-
 .../phusion_passenger/standalone/status_command.rb             | 3 +--
 .../phusion_passenger/standalone/stop_command.rb               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 692499fc06..6016cf0450 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 Release 6.0.25 (Not yet released)
 -------------
+ * [Standalone] Changes Passenger (not app) start and stop timeouts to 25s (from 15s) except for Nginx engine mode, which retains a stop timeout of 60s.
  * 
 
 
diff --git a/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb b/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb
index 0694833d39..26ab11f3ac 100644
--- a/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb
+++ b/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb
@@ -200,7 +200,7 @@ def build_daemon_controller_options
             :ping_command  => ping_spec,
             :pid_file      => @options[:pid_file],
             :log_file      => @options[:log_file],
-            :timeout       => 25
+            :start_timeout => 25
           }
         end
 
diff --git a/src/ruby_supportlib/phusion_passenger/standalone/status_command.rb b/src/ruby_supportlib/phusion_passenger/standalone/status_command.rb
index bd7fe3ac1b..9bfe0c84ce 100644
--- a/src/ruby_supportlib/phusion_passenger/standalone/status_command.rb
+++ b/src/ruby_supportlib/phusion_passenger/standalone/status_command.rb
@@ -114,8 +114,7 @@ def create_controller
           :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
diff --git a/src/ruby_supportlib/phusion_passenger/standalone/stop_command.rb b/src/ruby_supportlib/phusion_passenger/standalone/stop_command.rb
index 965c86b4df..c632cdbba8 100644
--- a/src/ruby_supportlib/phusion_passenger/standalone/stop_command.rb
+++ b/src/ruby_supportlib/phusion_passenger/standalone/stop_command.rb
@@ -125,7 +125,7 @@ def create_controller
           :ping_command  => "true", # Doesn't matter
           :pid_file      => @options[:pid_file],
           :log_file      => "/dev/null",
-          :timeout       => 25
+          :stop_timeout  => 25
         )
       end
     end