passenger 6.2.0 → 6.2.2

data/src/agent/Core/SpawningKit/Handshake/WorkDir.h

@@ -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/Journey.h

@@ -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/PipeWatcher.h

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

data/src/agent/Core/SpawningKit/README.md

@@ -109,7 +109,7 @@ For example, in Ruby applications a significant amount of memory is taken up by
 
 SpawningKit provides facilities to use this preforking technique. Obviously, this technique can only be used if the target programming language actually supports forking. This is the case with e.g. C, Ruby (using MRI) and Python (using CPython), but not with e.g. Node.js, Ruby (using JRuby), Go and anything running on the JVM.
 
-Using the preforking technique through SpawningKit requires either application code modifications, or the existance of a wrapper that supports this technique.
+Using the preforking technique through SpawningKit requires either application code modifications, or the existence of a wrapper that supports this technique.
 
 ### The start command
 
@@ -528,9 +528,9 @@ The error report is presented in two ways:
  1. In the terminal or in log files.
  2. In an HTML page.
 
-The summary is only meant to be displayed in the terminal or in the log files as a one-liner. It can contain basic details (such as the OS error code) but is not meant to contain finer details such as the subprocess stdout/stderr output, the environment variable dump, etc.
+The summary is a one-line field used by the HTML error page and other structured consumers. It can contain basic details (such as the OS error code) but is not meant to contain finer details such as the subprocess stdout/stderr output or the environment variable dump. `SpawnException::what()` provides the plain-text representation for terminals, logs, and exception consumers. It starts with the summary and, when subprocess stdout or stderr is available, adds up to 8 KB of that output in an indented block. For larger output it includes the first and last 4 KB and marks how many bytes were omitted. The complete output remains available in the detailed HTML error page.
 
-Everything else is meant to be displayed in an HTML page. The HTML page explicitly does not include the summary, so the summary must not contain any information that isn't available in all the other fields.
+The remaining report details are meant to be displayed in an HTML page. The HTML page explicitly does not include the summary, so the summary must not contain any information that isn't available in all the other fields.
 
 The advanced problem details are only displayed in the HTML page if one does not explicitly supply a problem description. See "Generating an error report" for more information.
 

data/src/agent/Core/SpawningKit/Result/AutoGeneratedCode.h

@@ -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/Result/AutoGeneratedCode.h.cxxcodebuilder

@@ -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/Result.h

@@ -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/SmartSpawner.h

@@ -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.
@@ -34,6 +34,7 @@
 #include <vector>
 #include <map>
 #include <exception>
+#include <functional>
 #include <dirent.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -221,11 +222,14 @@ private:
 	{
 		StdChannelsAsyncOpenStatePtr state = boost::make_shared<StdChannelsAsyncOpenState>(
 			session.workDirFd);
-		state->stdinOpenThread = new oxt::thread(boost::bind(
-			openStdinChannel, state, session.workDir->getPath()),
+		// The threads borrow state. The caller keeps it alive, and its destructor
+		// interrupts and joins both threads before freeing it. Giving the callbacks
+		// shared ownership would create a cycle through the thread objects.
+		state->stdinOpenThread = new oxt::thread(std::bind(
+			openStdinChannel, std::ref(*state), session.workDir->getPath()),
 			"FIFO opener: " + session.workDir->getPath() + "/stdin", 1024 * 128);
-		state->stdoutAndErrOpenThread = new oxt::thread(boost::bind(
-			openStdoutAndErrChannel, state, session.workDir->getPath()),
+		state->stdoutAndErrOpenThread = new oxt::thread(std::bind(
+			openStdoutAndErrChannel, std::ref(*state), session.workDir->getPath()),
 			"FIFO opener: " + session.workDir->getPath() + "/stdout_and_err", 1024 * 128);
 		return state;
 	}
@@ -288,22 +292,18 @@ private:
 		}
 	}
 
-	static void openStdinChannel(StdChannelsAsyncOpenStatePtr state,
-		const string &workDir)
-	{
-		int fd = syscalls::openat(state->workDirFd, "stdin", O_WRONLY | O_APPEND | O_NOFOLLOW);
+	static void openStdinChannel(StdChannelsAsyncOpenState &state, const string &workDir) {
+		int fd = syscalls::openat(state.workDirFd, "stdin", O_WRONLY | O_APPEND | O_NOFOLLOW);
 		int e = errno;
-		state->stdinFd.assign(fd, __FILE__, __LINE__);
-		state->stdinOpenErrno = e;
+		state.stdinFd.assign(fd, __FILE__, __LINE__);
+		state.stdinOpenErrno = e;
 	}
 
-	static void openStdoutAndErrChannel(StdChannelsAsyncOpenStatePtr state,
-		const string &workDir)
-	{
-		int fd = syscalls::openat(state->workDirFd, "stdout_and_err", O_RDONLY | O_NOFOLLOW);
+	static void openStdoutAndErrChannel(StdChannelsAsyncOpenState &state, const string &workDir) {
+		int fd = syscalls::openat(state.workDirFd, "stdout_and_err", O_RDONLY | O_NOFOLLOW);
 		int e = errno;
-		state->stdoutAndErrFd.assign(fd, __FILE__, __LINE__);
-		state->stdoutAndErrOpenErrno = e;
+		state.stdoutAndErrFd.assign(fd, __FILE__, __LINE__);
+		state.stdoutAndErrOpenErrno = e;
 	}
 
 	bool preloaderStarted() const {

data/src/agent/Core/SpawningKit/Spawner.h

@@ -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/UserSwitchingRules.h

@@ -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/TelemetryCollector.h

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

data/src/agent/ExecHelper/ExecHelperMain.cpp

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

data/src/agent/FileReadHelper/FileReadHelperMain.cpp

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

data/src/agent/MainFunctions.h

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

data/src/agent/Shared/ApiAccountUtils.h

@@ -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.
@@ -36,6 +36,7 @@
 #include <ConfigKit/ConfigKit.h>
 #include <Exceptions.h>
 #include <StaticString.h>
+#include <FileTools/FileManip.h>
 #include <FileTools/PathManip.h>
 #include <Utils.h>
 #include <StrIntTools/StrIntUtils.h>
@@ -70,7 +71,7 @@ using namespace std;
  *           "password": "bar",
  *           "password_file": "/filename"
  *
- *           "level": "readonly" | "full"   // Optional; "full" is defeault
+ *           "level": "readonly" | "full"   // Optional; "full" is default
  *         },
  *         ...
  *       ]
@@ -108,7 +109,7 @@ inline Json::Value parseApiAccountDescription(const StaticString &description);
  *
  * A JSON array that passes this function is *valid*, although not necessarily *normalized*.
  */
-static void
+inline void
 validateAuthorizationsField(const string &key, const ConfigKit::Store &config,
 	vector<ConfigKit::Error> &outputErrors)
 {

data/src/agent/Shared/ApiServerUtils.h

@@ -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.
@@ -58,7 +58,6 @@
 #include <sys/types.h>
 #include <string>
 #include <vector>
-#include <stdexcept>
 #include <cstddef>
 #include <cstring>
 #include <jsoncpp/json.h>
@@ -67,7 +66,7 @@
 #include <Exceptions.h>
 #include <DataStructures/LString.h>
 #include <DataStructures/StringKeyTable.h>
-#include <ServerKit/llhttp.h>
+#include <llhttp/llhttp.h>
 #include <ServerKit/Server.h>
 #include <ServerKit/HeaderTable.h>
 #include <LoggingKit/LoggingKit.h>

data/src/agent/Shared/ApplicationPoolApiKey.h

@@ -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/Shared/Fundamentals/AbortHandler.cpp

@@ -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/Shared/Fundamentals/AbortHandler.h

@@ -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/Shared/Fundamentals/Initialization.cpp

@@ -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/Shared/Fundamentals/Initialization.h

@@ -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/Shared/Fundamentals/Utils.cpp

@@ -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/Shared/Fundamentals/Utils.h

@@ -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/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp

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

data/src/agent/SystemMetrics/SystemMetricsMain.cpp

@@ -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/TempDirToucher/TempDirToucherMain.cpp

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

data/src/agent/Watchdog/ApiServer.h

@@ -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.
@@ -183,12 +183,13 @@ private:
 		if (req->method == HTTP_GET) {
 			if (!authorizeStateInspectionOperation(this, client, req)) {
 				apiServerRespondWith401(this, client, req);
-			} else {
-				HeaderTable headers;
-				Json::Value doc = LoggingKit::context->getConfig().inspect();
-				headers.insert(req->pool, "Content-Type", "application/json");
-				writeSimpleResponse(client, 200, &headers, doc.toStyledString());
+				return;
 			}
+
+			HeaderTable headers;
+			Json::Value doc = LoggingKit::context->getConfig().inspect();
+			headers.insert(req->pool, "Content-Type", "application/json");
+			writeSimpleResponse(client, 200, &headers, doc.toStyledString());
 			if (!req->ended()) {
 				endRequest(&client, &req);
 			}

data/src/agent/Watchdog/Config.h

@@ -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.
@@ -139,7 +139,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")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/apache2_module/Bucket.cpp

@@ -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/apache2_module/Bucket.h

@@ -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/apache2_module/CBindings.cpp

@@ -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/apache2_module/Config.cpp

@@ -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/apache2_module/Config.h

@@ -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.