RubyGems - passenger - Versions diffs - 6.2.0 → 6.2.2 - Mend

passenger 6.2.0 → 6.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (898) hide show

data/src/agent/Core/ApplicationPool/Pool/ProcessUtils.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/ApplicationPool/Pool/StateInspection.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/ApplicationPool/Pool.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/ApplicationPool/Process.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/ApplicationPool/Process.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/ApplicationPool/Session.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/ApplicationPool/Socket.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/ApplicationPool/TestSession.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2016-2025 Asynchronous B.V.
+ *  Copyright (c) 2016-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Config.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -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.2.0")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.2.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
@@ -404,6 +404,7 @@ public:
 		loggingKit.translator.finalize();
 		addSubSchema(loggingKit.schema, loggingKit.translator);
 		erase("redirect_stderr");
+		erase("redirect_stdout");
 		erase("buffer_logs");
 		// Add subschema: controller

data/src/agent/Core/ConfigChange.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/ConfigChange.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/AppResponse.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/BufferBody.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/CheckoutSession.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -252,9 +252,8 @@ Controller::onSessionSocketConnected(EV_P_ ev_io *io, int revents) {
 	TRACE_POINT();
     ev_io_stop(self->getLoop(), io);
-	if (req->connectedWatcherTimout.active) {
-		ev_timer_stop(self->getLoop(), &req->connectedWatcherTimout);
-	}
+	// Also stops the timer if it has expired but its callback hasn't run yet.
+	ev_timer_stop(self->getLoop(), &req->connectedWatcherTimout);
 	if (revents & EV_WRITE) {
 		// Socket connect finished
@@ -353,9 +352,13 @@ Controller::writeRequestQueueFullExceptionErrorResponse(Client *client, Request
 		" due to: " << e->what());
 	endRequestWithSimpleResponse(&client, &req,
+		"<html><head>"
+		"<meta name='viewport' content='width=device-width, initial-scale=1'>"
+		"</head><body>"
 		"<h2>This website is under heavy load (queue full)</h2>"
 		"<p>We're sorry, too many people are accessing this website at the same "
-		"time. We're working on this problem. Please try again later.</p>",
+		"time. We're working on this problem. Please try again later.</p>"
+		"</body></html>",
 		requestQueueOverflowStatusCode);
 }

data/src/agent/Core/Controller/Client.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/Config.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -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.2.0")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.2.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/Core/Controller/ForwardResponse.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -79,7 +79,7 @@ Controller::onAppSourceData(Client *client, Request *req, const MemoryKit::mbuf
 			}
 			if (resp->httpState == AppResponse::PARSING_HEADERS) {
 				// Not yet done parsing.
-				return Channel::Result(buffer.size(), false);
+				return Channel::Result(ret, false);
 			}
 			// Done parsing.

data/src/agent/Core/Controller/Hooks.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -125,8 +125,10 @@ Controller::reinitializeRequest(Client *client, Request *req) {
 	// appSink and appSource are initialized in Controller::checkoutSession().
-	req->connectedWatcher.active = false;
-	req->connectedWatcherTimout.active = false;
+	// Initialize the session socket connect watchers so that they can always be
+	// stopped safely, even if this request never starts connecting to the app.
+	ev_init(&req->connectedWatcher, onSessionSocketConnected);
+	ev_init(&req->connectedWatcherTimout, onSessionSocketConnectTimeout);
 	req->startedAt = 0;
 	req->state = Request::ANALYZING_REQUEST;
@@ -160,12 +162,13 @@ Controller::reinitializeRequest(Client *client, Request *req) {
 void
 Controller::deinitializeRequest(Client *client, Request *req) {
-	if (req->connectedWatcher.active) {
-		ev_io_stop(getLoop(), &req->connectedWatcher);
-	}
-	if (req->connectedWatcherTimout.active) {
-		ev_timer_stop(getLoop(), &req->connectedWatcherTimout);
-	}
+	// Stop unconditionally instead of checking whether the watchers are active:
+	// a timer that has expired is no longer active, but may still be pending (queued
+	// to have its callback invoked later in the current event loop iteration).
+	// Stopping also removes it from that queue, so that libev doesn't touch this
+	// request after it has been deinitialized and possibly freed.
+	ev_io_stop(getLoop(), &req->connectedWatcher);
+	ev_timer_stop(getLoop(), &req->connectedWatcherTimout);
 	req->session.reset();
 	req->config.reset();

data/src/agent/Core/Controller/Implementation.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2015-2025 Asynchronous B.V.
+ *  Copyright (c) 2015-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/InitRequest.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/InitializationAndShutdown.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/InternalUtils.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/Miscellaneous.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/Request.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/SendRequest.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/StateInspection.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller/TurboCaching.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/Controller.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/CoreMain.cpp CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/OptionParser.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/ResponseCache.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SecurityUpdateChecker.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h.cxxcodebuilder CHANGED Viewed

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2017-2025 Asynchronous B.V.
+#  Copyright (c) 2017-2026 Asynchronous B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/Config.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/Context.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/DirectSpawner.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/DummySpawner.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/ErrorRenderer.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/Exceptions.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -91,6 +91,7 @@ private:
 	string problemDescription;
 	string solutionDescription;
 	string stdoutAndErrData;
+	string whatMessage;
 	string id;
 	EnvDump parentProcessEnvDump;
@@ -188,6 +189,56 @@ private:
 		return message;
 	}
+	static string createWhatMessage(const string &summary,
+		const string &stdoutAndErrData)
+	{
+		static const size_t OUTPUT_CHUNK_SIZE = 4 * 1024;
+		static const size_t MAX_OUTPUT_SIZE = OUTPUT_CHUNK_SIZE * 2;
+		// HandshakePerform uses this sentinel when no output capture channel exists.
+		if (summary.empty() || stdoutAndErrData.empty()
+		 || stdoutAndErrData == "(not available)")
+		{
+			return summary;
+		}
+		string output;
+		if (stdoutAndErrData.size() > MAX_OUTPUT_SIZE) {
+			output.reserve(MAX_OUTPUT_SIZE + 64);
+			output.append(stdoutAndErrData, 0, OUTPUT_CHUNK_SIZE);
+			output.append("\n[...truncated ");
+			output.append(toString(stdoutAndErrData.size() - MAX_OUTPUT_SIZE));
+			output.append(" bytes...]\n");
+			output.append(stdoutAndErrData, stdoutAndErrData.size() - OUTPUT_CHUNK_SIZE,
+				OUTPUT_CHUNK_SIZE);
+		} else {
+			output = stdoutAndErrData;
+		}
+		if (!output.empty() && output[output.size() - 1] == '\n') {
+			output.erase(output.size() - 1);
+			if (!output.empty() && output[output.size() - 1] == '\r') {
+				output.erase(output.size() - 1);
+			}
+		}
+		string message;
+		message.reserve(summary.size() + output.size() + 32);
+		message.append(summary);
+		message.append("\nSubprocess output:\n    ");
+		for (string::const_iterator it = output.begin(); it != output.end(); it++) {
+			message.push_back(*it);
+			if (*it == '\n' && it + 1 != output.end()) {
+				message.append("    ");
+			}
+		}
+		return message;
+	}
+	void updateWhatMessage() {
+		whatMessage = createWhatMessage(summary, stdoutAndErrData);
+	}
 	static string createDefaultProblemDescription(ErrorCategory category,
 		const Journey &journey, const Config &config,
 		const StaticString &advancedProblemDetails,
@@ -791,6 +842,7 @@ public:
 	{
 		assert(_journey.getFirstFailedStep() != UNKNOWN_JOURNEY_STEP);
 		config.internStrings();
+		updateWhatMessage();
 	}
 	SpawnException(const std::exception &originalException,
@@ -805,13 +857,19 @@ public:
 	{
 		assert(_journey.getFirstFailedStep() != UNKNOWN_JOURNEY_STEP);
 		config.internStrings();
+		updateWhatMessage();
 	}
 	virtual ~SpawnException() throw() {}
+	/**
+	 * A plain-text representation of the error for terminals, logs and exception consumers.
+	 * Includes subprocess output if available, though limited to a fixed size by truncating
+	 * in the middle.
+	 */
 	virtual const char *what() const throw() {
-		return summary.c_str();
+		return whatMessage.c_str();
 	}
 	ErrorCategory getErrorCategory() const {
@@ -833,6 +891,7 @@ public:
 	void setSummary(const string &value) {
 		summary = value;
+		updateWhatMessage();
 	}
 	const string &getAdvancedProblemDetails() const {
@@ -865,6 +924,7 @@ public:
 	void setStdoutAndErrData(const string &value) {
 		stdoutAndErrData = value;
+		updateWhatMessage();
 	}
 	const string &getId() const {
@@ -881,6 +941,7 @@ public:
 			summary = createDefaultSummary(category, journey,
 				advancedProblemDetails);
 		}
+		updateWhatMessage();
 		if (problemDescription.empty()) {
 			problemDescription = createDefaultProblemDescription(
 				category, journey, config, advancedProblemDetails,

data/src/agent/Core/SpawningKit/Factory.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/Handshake/BackgroundIOCapturer.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/Handshake/Perform.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2016-2025 Asynchronous B.V.
+ *  Copyright (c) 2016-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -116,7 +116,8 @@ private:
 	void initializeStdchannelsCapturing() {
 		if (stdoutAndErrFd != -1) {
 			stdoutAndErrCapturer = boost::make_shared<BackgroundIOCapturer>(
-				stdoutAndErrFd, pid, "output", alreadyReadStdoutAndErrData);
+				stdoutAndErrFd, pid, config->appGroupName, config->logFile,
+				"output", alreadyReadStdoutAndErrData);
 			stdoutAndErrCapturer->setEndReachedCallback(boost::bind(
 				&HandshakePerform::wakeupEventLoop, this));
 			stdoutAndErrCapturer->start();

data/src/agent/Core/SpawningKit/Handshake/Prepare.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2016-2025 Asynchronous B.V.
+ *  Copyright (c) 2016-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/agent/Core/SpawningKit/Handshake/Session.h CHANGED Viewed

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2016-2025 Asynchronous B.V.
+ *  Copyright (c) 2016-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.