passenger 6.0.23 → 6.0.25

data/src/agent/Shared/Fundamentals/AbortHandler.cpp

@@ -1,9 +1,9 @@
 /*
  *  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
@@ -29,13 +29,13 @@
 #include <boost/cstdint.hpp>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <sys/select.h>
 #include <cstdio>
 #include <cstdlib>
 #include <cstddef>
 #include <cstring>
 #include <cerrno>
-#include <cassert>
 #include <fcntl.h>
 #include <poll.h>
 #include <unistd.h>
@@ -121,8 +121,6 @@ typedef void (*Callback)(AbortHandlerWorkingState &state, void *userData);
 
 
 static AbortHandlerContext *ctx = NULL;
-static const char digits[] = "0123456789";
-static const char hex_chars[] = "0123456789abcdef";
 
 
 static void
@@ -269,6 +267,65 @@ appendSignalReason(char *buf, const char *end, siginfo_t *info) {
 	return buf;
 }
 
+static bool
+resumeOriginalProcess(AbortHandlerWorkingState &state) {
+	const char *end = state.messageBuf + sizeof(state.messageBuf);
+	char *pos = state.messageBuf;
+	pos = ASSU::appendData(pos, end, state.messagePrefix);
+	pos = ASSU::appendData(pos, end, " ] Triggering original signal handler");
+	pos = ASSU::appendData(pos, end, "\n");
+	write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
+
+	int e = kill(state.pid, SIGCONT);
+	if (e == -1) {
+		int e = errno;
+		pos = state.messageBuf;
+		pos = ASSU::appendData(pos, end, state.messagePrefix);
+		pos = ASSU::appendData(pos, end, " ] Could not resume original process: kill() failed: ");
+		pos = ASSU::appendData(pos, end, ASSU::limitedStrerror(e));
+		pos = ASSU::appendData(pos, end, " (errno=");
+		pos = ASSU::appendInteger<int, 10>(pos, end, e);
+		pos = ASSU::appendData(pos, end, ")\n");
+		write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
+
+		return false;
+	} {
+		return true;
+	}
+}
+
+static void
+forceTerminateOriginalProcess(AbortHandlerWorkingState &state) {
+	const char *end = state.messageBuf + sizeof(state.messageBuf);
+	char *pos = state.messageBuf;
+	pos = ASSU::appendData(pos, end, state.messagePrefix);
+	pos = ASSU::appendData(pos, end, " ] Force terminating original process");
+	pos = ASSU::appendData(pos, end, "\n");
+	write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
+
+	int ret	= kill(state.pid, SIGKILL);
+	if (ret == -1) {
+		int e = errno;
+		pos = state.messageBuf;
+		pos = ASSU::appendData(pos, end, state.messagePrefix);
+		pos = ASSU::appendData(pos, end, " ] Could not force terminate original process: kill() failed: ");
+		pos = ASSU::appendData(pos, end, ASSU::limitedStrerror(e));
+		pos = ASSU::appendData(pos, end, " (errno=");
+		pos = ASSU::appendInteger<int, 10>(pos, end, e);
+		pos = ASSU::appendData(pos, end, ")\n");
+		write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
+	}
+}
+
+static void
+resumeOrForceTerminateOriginalProcess(AbortHandlerWorkingState &state) {
+	if (ctx->config->forceTerminateProcess) {
+		forceTerminateOriginalProcess(state);
+	} else if (!resumeOriginalProcess(state)) {
+		forceTerminateOriginalProcess(state);
+	}
+}
+
 static int
 runInSubprocessWithTimeLimit(AbortHandlerWorkingState &state, Callback callback, void *userData, int timeLimit) {
 	char *pos;
@@ -633,11 +690,25 @@ dumpWithCrashWatch(AbortHandlerWorkingState &state) {
 				close(p[0]);
 				backtrace_symbols_fd(backtraceStore, frames, p[1]);
 				close(p[1]);
-				if (waitpid(pid, &status, 0) == -1 || status != 0) {
+
+				int ret = waitpid(pid, &status, 0);
+				if (ret == -1 || status != 0) {
+					int e = errno;
 					pos = state.messageBuf;
 					pos = ASSU::appendData(pos, end, "ERROR: cannot execute '");
 					pos = ASSU::appendData(pos, end, ctx->backtraceSanitizerCommand);
-					pos = ASSU::appendData(pos, end, "' for sanitizing the backtrace, writing to stderr directly...\n");
+					pos = ASSU::appendData(pos, end, "' for sanitizing the backtrace (");
+					if (ret == -1) {
+						pos = ASSU::appendData(pos, end, "waitpid() failed, errno=");
+						pos = ASSU::appendInteger<int, 10>(pos, end, e);
+					} else if (WIFSIGNALED(status)) {
+						pos = ASSU::appendData(pos, end, "exited with signal ");
+						pos = ASSU::appendInteger<int, 10>(pos, end, WTERMSIG(status));
+					} else {
+						pos = ASSU::appendData(pos, end, "exit status ");
+						pos = ASSU::appendInteger<int, 10>(pos, end, WEXITSTATUS(status));
+					}
+					pos = ASSU::appendData(pos, end, "), writing to stderr directly...\n");
 					write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
 					backtrace_symbols_fd(backtraceStore, frames, STDERR_FILENO);
 				}
@@ -1083,19 +1154,19 @@ abortHandler(int signo, siginfo_t *info, void *_unused) {
 			// with SIGPIPE as a result, so we ignore SIGPIPE again.
 			ignoreSigpipe();
 			dumpDiagnostics(state);
-			// The child process may or may or may not resume the original process.
-			// We do it ourselves just to be sure.
-			kill(state.pid, SIGCONT);
+			resumeOrForceTerminateOriginalProcess(state);
 			_exit(0);
 
 		} else if (child == -1) {
 			int e = errno;
 			pos = state.messageBuf;
 			pos = ASSU::appendData(pos, end, state.messagePrefix);
-			pos = ASSU::appendData(pos, end, "] Could not fork a child process for dumping diagnostics: fork() failed with errno=");
+			pos = ASSU::appendData(pos, end, " ] Could not fork a child process for dumping diagnostics: fork() failed with errno=");
 			pos = ASSU::appendInteger<int, 10>(pos, end, e);
 			pos = ASSU::appendData(pos, end, "\n");
 			write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
+
+			resumeOrForceTerminateOriginalProcess(state);
 			_exit(1);
 
 		} else {
@@ -1112,6 +1183,8 @@ abortHandler(int signo, siginfo_t *info, void *_unused) {
 		pos = ASSU::appendData(pos, end, "\n");
 		write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
 
+		resumeOrForceTerminateOriginalProcess(state);
+
 	} else {
 		raise(SIGSTOP);
 		// Will continue after the child process has done its job.
@@ -1208,6 +1281,12 @@ abortHandlerConfigChanged() {
 	char *oldCrashWatchCommand = ctx->crashWatchCommand;
 	char *oldBacktraceSanitizerCommand = ctx->backtraceSanitizerCommand;
 
+	if (config->origArgv == NULL) {
+		fprintf(stderr, "AbortHandler requires config->origArgv!\n");
+		fflush(stderr);
+		abort();
+	}
+
 	if (config->resourceLocator != NULL) {
 		string path;
 		const ResourceLocator *locator = config->resourceLocator;

data/src/agent/Shared/Fundamentals/AbortHandler.h

@@ -1,9 +1,9 @@
 /*
  *  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
@@ -62,6 +62,7 @@ struct AbortHandlerConfig {
 	bool dumpWithCrashWatch;
 	bool beep;
 	bool stopProcess;
+	bool forceTerminateProcess;
 	ResourceLocator *resourceLocator;
 	DiagnosticsDumper diagnosticsDumpers[MAX_DIAGNOSTICS_DUMPERS];
 
@@ -72,6 +73,7 @@ struct AbortHandlerConfig {
 		  dumpWithCrashWatch(false),
 		  beep(false),
 		  stopProcess(false),
+		  forceTerminateProcess(false),
 		  resourceLocator(NULL)
 		{ }
 };

data/src/agent/Shared/Fundamentals/Initialization.cpp

@@ -1,9 +1,9 @@
 /*
  *  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
@@ -38,9 +38,8 @@
 #include <vector>
 
 #include <sys/types.h>
-#include <stdlib.h> // for srandom()
+#include <stdlib.h>
 #include <unistd.h>
-#include <signal.h>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -468,6 +467,7 @@ maybeInitializeAbortHandler() {
 	config->dumpWithCrashWatch = getEnvBool("PASSENGER_DUMP_WITH_CRASH_WATCH", true);
 	config->beep = getEnvBool("PASSENGER_BEEP_ON_ABORT");
 	config->stopProcess = getEnvBool("PASSENGER_STOP_ON_ABORT");
+	config->forceTerminateProcess = getEnvBool("PASSENGER_FORCE_TERMINATE_ON_ABORT");
 
 	installAbortHandler(config);
 }
@@ -525,6 +525,12 @@ storeArgvCopy(int argc, char *argv[]) {
 	for (int i = 0; i < argc; i++) {
 		context->origArgv[i] = strdup(argv[i]);
 	}
+
+	if (abortHandlerInstalled()) {
+		// Let AbortHandler use the copy.
+		context->abortHandlerConfig.origArgv = context->origArgv;
+		abortHandlerConfigChanged();
+	}
 }
 
 static void
@@ -558,7 +564,7 @@ initializeAgent(int argc, char **argv[], const char *processName,
 {
 	const char *seedStr;
 
-	context = new Context();
+	context = new Context(argc, *argv);
 
 	seedStr = getEnvString("PASSENGER_RANDOM_SEED");
 	if (seedStr == NULL) {

data/src/agent/Shared/Fundamentals/Initialization.h

@@ -1,9 +1,9 @@
 /*
  *  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
@@ -48,11 +48,11 @@ struct Context {
 	bool feedbackFdAvailable;
 	AbortHandlerConfig abortHandlerConfig;
 
-	Context()
+	Context(int argc, char *argv[])
 		: resourceLocator(NULL),
 		  randomSeed(0),
-		  origArgc(0),
-		  origArgv(NULL),
+		  origArgc(argc),
+		  origArgv(argv),
 		  feedbackFdAvailable(false)
 		{ }
 };

data/src/agent/Shared/Fundamentals/Utils.cpp

@@ -1,9 +1,9 @@
 /*
  *  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/agent/Shared/Fundamentals/Utils.h

@@ -1,9 +1,9 @@
 /*
  *  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/agent/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2012-2018 Phusion Holding B.V.
+ *  Copyright (c) 2012-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
@@ -36,8 +36,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cerrno>
-#include <cassert>
-#include <stdexcept>
+#include <exception>
 #include <string>
 #include <vector>
 
@@ -47,7 +46,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
-#include <limits.h>
+#include <limits.h> // IWYU pragma: keep (for PATH_MAX)
 #include <unistd.h>
 #include <pwd.h>
 #include <grp.h>
@@ -218,8 +217,8 @@ dumpEnvvars(const string &workDir) {
 		NULL
 	};
 	SubprocessInfo info;
-	runCommand(command, info, true, true,
-		boost::bind(reopenStdout, fileno(f)));
+	int fd = fileno(f);
+	runCommand(command, info, true, true, [=]() { reopenStdout(fd); });
 	fclose(f);
 }
 
@@ -237,8 +236,8 @@ dumpUserInfo(const string &workDir) {
 		NULL
 	};
 	SubprocessInfo info;
-	runCommand(command, info, true, true,
-		boost::bind(reopenStdout, fileno(f)));
+	int fd = fileno(f);
+	runCommand(command, info, true, true, [=]() { reopenStdout(fd); });
 	fclose(f);
 }
 

data/src/agent/SystemMetrics/SystemMetricsMain.cpp

@@ -1,9 +1,9 @@
 /*
  *  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

data/src/agent/TempDirToucher/TempDirToucherMain.cpp

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013-2018 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/agent/Watchdog/AgentWatcher.cpp

@@ -1,9 +1,9 @@
 /*
  *  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/agent/Watchdog/ApiServer.h

@@ -1,9 +1,9 @@
 /*
  *  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

data/src/agent/Watchdog/Config.h

@@ -1,9 +1,9 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2018 Phusion Holding B.V.
+ *  Copyright (c) 2011-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
@@ -144,6 +144,7 @@ using namespace std;
  *   max_instances_per_app                                                    unsigned integer   -          read_only
  *   max_pool_size                                                            unsigned integer   -          default(6)
  *   multi_app                                                                boolean            -          default(false),read_only
+ *   old_routing                                                              boolean            -          default(false),read_only
  *   passenger_root                                                           string             required   read_only
  *   pidfiles_to_delete_on_exit                                               array of strings   -          default([])
  *   pool_idle_time                                                           unsigned integer   -          default(300)
@@ -155,7 +156,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.0.23")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.25")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/agent/Watchdog/CoreWatcher.cpp

@@ -1,9 +1,9 @@
 /*
  *  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

data/src/agent/Watchdog/InstanceDirToucher.cpp

@@ -1,9 +1,9 @@
 /*
  *  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/agent/Watchdog/WatchdogMain.cpp

@@ -1,9 +1,9 @@
 /*
  *  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
@@ -836,13 +836,10 @@ parseOptions(int argc, const char *argv[], ConfigKit::Store &config) {
 		}
 	}
 
-	if (!updates.empty()) {
-		vector<ConfigKit::Error> errors;
-		if (!config.update(updates, errors)) {
-			P_BUG("Unable to set initial configuration: " <<
-				ConfigKit::toString(errors) << "\n"
-				"Raw initial configuration: " << updates.toStyledString());
-		}
+	vector<ConfigKit::Error> errors;
+	if (!config.update(updates, errors)) {
+		P_ERROR("*** Error in options: " << ConfigKit::toString(errors));
+		std::exit(1);
 	}
 }
 

data/src/apache2_module/Bucket.cpp

@@ -1,9 +1,9 @@
 /*
  *  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/apache2_module/Bucket.h

@@ -1,9 +1,9 @@
 /*
  *  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/apache2_module/CBindings.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/apache2_module/Config.cpp

@@ -1,9 +1,9 @@
 /*
  *  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

data/src/apache2_module/Config.h

@@ -1,9 +1,9 @@
 /*
  *  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

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -1,9 +1,9 @@
 /*
  *  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
@@ -332,6 +332,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF | ACCESS_CONF,
 		"The Node.js command to use."),
+	AP_INIT_FLAG("PassengerOldRouting",
+		(FlagFunc) cmd_passenger_old_routing,
+		NULL,
+		RSRC_CONF,
+		"Whether to revert to old routing behaviour in Phusion Passenger(R)."),
 	AP_INIT_TAKE1("PassengerPoolIdleTime",
 		(Take1Func) cmd_passenger_pool_idle_time,
 		NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp.cxxcodebuilder

@@ -1,8 +1,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

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.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
@@ -108,6 +108,11 @@ ConfigManifestGenerator::autoGenerated_setGlobalConfigDefaults() {
 		"PassengerMaxPoolSize",
 		DEFAULT_MAX_POOL_SIZE);
 
+	addOptionsContainerStaticDefaultBool(
+		globalConfigContainer,
+		"PassengerOldRouting",
+		false);
+
 	addOptionsContainerStaticDefaultInt(
 		globalConfigContainer,
 		"PassengerPoolIdleTime",

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.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