passenger 6.0.22 → 6.0.24

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

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

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

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

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

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

@@ -104,6 +104,7 @@ using namespace std;
  *   default_abort_websockets_on_process_shutdown                             boolean            -          default(true)
  *   default_app_file_descriptor_ulimit                                       unsigned integer   -          -
  *   default_bind_address                                                     string             -          default("127.0.0.1")
+ *   default_custom_error_page                                                string             -          default("")
  *   default_environment                                                      string             -          default("production")
  *   default_force_max_concurrent_requests_per_process                        integer            -          default(-1)
  *   default_friendly_error_pages                                             string             -          default("auto")
@@ -154,7 +155,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.22")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.24")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -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/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -142,6 +142,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Set advanced Phusion Passenger(R) options."),
+	AP_INIT_TAKE1("PassengerCustomErrorPage",
+		(Take1Func) cmd_passenger_custom_error_page,
+		NULL,
+		RSRC_CONF | ACCESS_CONF,
+		"Path to html file to use for Passenger generated error pages."),
 	AP_INIT_TAKE1("PassengerDataBufferDir",
 		(Take1Func) cmd_passenger_data_buffer_dir,
 		NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -259,6 +259,21 @@ cmd_passenger_buffer_upload(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_custom_error_page(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
+	if (err != NULL) {
+		return err;
+	}
+
+	DirConfig *config = (DirConfig *) pcfg;
+	config->mCustomErrorPageSourceFile = cmd->directive->filename;
+	config->mCustomErrorPageSourceLine = cmd->directive->line_num;
+	config->mCustomErrorPageExplicitlySet = true;
+	config->mCustomErrorPage = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_data_buffer_dir(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);

data/src/apache2_module/ConfigGeneral/ManifestGeneration.h

@@ -632,8 +632,10 @@ public:
 } // namespace Apache2Module
 } // namespace Passenger
 
-#include "../ServerConfig/AutoGeneratedManifestGeneration.cpp"
-#include "../DirConfig/AutoGeneratedManifestGeneration.cpp"
-#include "AutoGeneratedManifestDefaultsInitialization.cpp"
+#if !defined(INTELLISENSE)
+	#include "../ServerConfig/AutoGeneratedManifestGeneration.cpp"
+	#include "../DirConfig/AutoGeneratedManifestGeneration.cpp"
+	#include "AutoGeneratedManifestDefaultsInitialization.cpp"
+#endif
 
 #endif /* _PASSENGER_APACHE2_MODULE_CONFIG_GENERAL_MANIFEST_GENERATION_H_ */

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp

@@ -75,6 +75,9 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	 */
 	config->mBufferResponse = Apache2Module::UNSET;
 	config->mBufferUpload = Apache2Module::UNSET;
+	/*
+	 * config->mCustomErrorPage: default initialized
+	 */
 	/*
 	 * config->mDirectInstanceRequestAddress: default initialized
 	 */
@@ -139,6 +142,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mBaseURIsSourceLine = 0;
 	config->mBufferResponseSourceLine = 0;
 	config->mBufferUploadSourceLine = 0;
+	config->mCustomErrorPageSourceLine = 0;
 	config->mDirectInstanceRequestAddressSourceLine = 0;
 	config->mEnabledSourceLine = 0;
 	config->mErrorOverrideSourceLine = 0;
@@ -177,6 +181,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mBaseURIsExplicitlySet = false;
 	config->mBufferResponseExplicitlySet = false;
 	config->mBufferUploadExplicitlySet = false;
+	config->mCustomErrorPageExplicitlySet = false;
 	config->mDirectInstanceRequestAddressExplicitlySet = false;
 	config->mEnabledExplicitlySet = false;
 	config->mErrorOverrideExplicitlySet = false;

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp

@@ -61,6 +61,9 @@ constructRequestHeaders_autoGenerated(request_rec *r, DirConfig *config, std::st
 	addHeader(result, StaticString("!~PASSENGER_APP_LOG_FILE",
 			sizeof("!~PASSENGER_APP_LOG_FILE") - 1),
 		config->mAppLogFile);
+	addHeader(result, StaticString("!~PASSENGER_CUSTOM_ERROR_PAGE",
+			sizeof("!~PASSENGER_CUSTOM_ERROR_PAGE") - 1),
+		config->mCustomErrorPage);
 	addHeader(result, StaticString("!~PASSENGER_DIRECT_INSTANCE_REQUEST_ADDRESS",
 			sizeof("!~PASSENGER_DIRECT_INSTANCE_REQUEST_ADDRESS") - 1),
 		config->mDirectInstanceRequestAddress);

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp

@@ -176,6 +176,19 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForDirConfig(server
 			pdconf->mBufferUploadSourceLine);
 		hierarchyMember["value"] = pdconf->mBufferUpload == Apache2Module::ENABLED;
 	}
+	if (pdconf->mCustomErrorPageExplicitlySet) {
+		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
+			pdconf, context, &appOptionsContainer, &locOptionsContainer);
+		Json::Value &optionContainer = findOrCreateOptionContainer(*appOptionsContainer,
+			"PassengerCustomErrorPage",
+			sizeof("PassengerCustomErrorPage") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			pdconf->mCustomErrorPageSourceFile,
+			pdconf->mCustomErrorPageSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			pdconf->mCustomErrorPage.data(),
+			pdconf->mCustomErrorPage.data() + pdconf->mCustomErrorPage.size());
+	}
 	if (pdconf->mDirectInstanceRequestAddressExplicitlySet) {
 		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
 			pdconf, context, &appOptionsContainer, &locOptionsContainer);

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp

@@ -88,6 +88,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(add->mBufferUpload != Apache2Module::UNSET)
 		? add->mBufferUpload
 		: base->mBufferUpload;
+	config->mCustomErrorPage =
+		(!add->mCustomErrorPage.empty())
+		? add->mCustomErrorPage
+		: base->mCustomErrorPage;
 	config->mDirectInstanceRequestAddress =
 		(!add->mDirectInstanceRequestAddress.empty())
 		? add->mDirectInstanceRequestAddress
@@ -207,6 +211,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsSourceFile = add->mBaseURIsSourceFile;
 	config->mBufferResponseSourceFile = add->mBufferResponseSourceFile;
 	config->mBufferUploadSourceFile = add->mBufferUploadSourceFile;
+	config->mCustomErrorPageSourceFile = add->mCustomErrorPageSourceFile;
 	config->mDirectInstanceRequestAddressSourceFile = add->mDirectInstanceRequestAddressSourceFile;
 	config->mEnabledSourceFile = add->mEnabledSourceFile;
 	config->mErrorOverrideSourceFile = add->mErrorOverrideSourceFile;
@@ -245,6 +250,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsSourceLine = add->mBaseURIsSourceLine;
 	config->mBufferResponseSourceLine = add->mBufferResponseSourceLine;
 	config->mBufferUploadSourceLine = add->mBufferUploadSourceLine;
+	config->mCustomErrorPageSourceLine = add->mCustomErrorPageSourceLine;
 	config->mDirectInstanceRequestAddressSourceLine = add->mDirectInstanceRequestAddressSourceLine;
 	config->mEnabledSourceLine = add->mEnabledSourceLine;
 	config->mErrorOverrideSourceLine = add->mErrorOverrideSourceLine;
@@ -283,6 +289,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsExplicitlySet = add->mBaseURIsExplicitlySet;
 	config->mBufferResponseExplicitlySet = add->mBufferResponseExplicitlySet;
 	config->mBufferUploadExplicitlySet = add->mBufferUploadExplicitlySet;
+	config->mCustomErrorPageExplicitlySet = add->mCustomErrorPageExplicitlySet;
 	config->mDirectInstanceRequestAddressExplicitlySet = add->mDirectInstanceRequestAddressExplicitlySet;
 	config->mEnabledExplicitlySet = add->mEnabledExplicitlySet;
 	config->mErrorOverrideExplicitlySet = add->mErrorOverrideExplicitlySet;

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -29,6 +29,9 @@
 #ifdef INTELLISENSE
 	// These includes do nothing, but keep IntelliSense happy.
 	#include <ap_config.h>
+	#include <set>
+	#include <Constants.h>
+	#include <StaticString.h>
 	#include "../ConfigGeneral/Common.h"
 #endif
 
@@ -171,6 +174,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	StaticString mAppType;
 
+	/*
+	 * Path to html file to use for Passenger generated error pages.
+	 */
+	StaticString mCustomErrorPage;
+
 	/*
 	 * The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.
 	 */
@@ -265,6 +273,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mAppRootSourceFile;
 	StaticString mAppStartCommandSourceFile;
 	StaticString mAppTypeSourceFile;
+	StaticString mCustomErrorPageSourceFile;
 	StaticString mDirectInstanceRequestAddressSourceFile;
 	StaticString mGroupSourceFile;
 	StaticString mMeteorAppSettingsSourceFile;
@@ -303,6 +312,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mAppRootSourceLine;
 	unsigned int mAppStartCommandSourceLine;
 	unsigned int mAppTypeSourceLine;
+	unsigned int mCustomErrorPageSourceLine;
 	unsigned int mDirectInstanceRequestAddressSourceLine;
 	unsigned int mGroupSourceLine;
 	unsigned int mMeteorAppSettingsSourceLine;
@@ -341,6 +351,7 @@ struct AutoGeneratedDirConfig {
 	bool mAppRootExplicitlySet: 1;
 	bool mAppStartCommandExplicitlySet: 1;
 	bool mAppTypeExplicitlySet: 1;
+	bool mCustomErrorPageExplicitlySet: 1;
 	bool mDirectInstanceRequestAddressExplicitlySet: 1;
 	bool mGroupExplicitlySet: 1;
 	bool mMeteorAppSettingsExplicitlySet: 1;
@@ -540,6 +551,11 @@ struct AutoGeneratedDirConfig {
 		return mAppType;
 	}
 
+	StaticString
+	getCustomErrorPage() const {
+		return mCustomErrorPage;
+	}
+
 	StaticString
 	getDirectInstanceRequestAddress() const {
 		if (mDirectInstanceRequestAddress.empty()) {

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h.cxxcodebuilder

@@ -37,6 +37,9 @@ def main
     #ifdef INTELLISENSE
       // These includes do nothing, but keep IntelliSense happy.
       #include <ap_config.h>
+      #include <set>
+      #include <Constants.h>
+      #include <StaticString.h>
       #include "../ConfigGeneral/Common.h"
     #endif
   }

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -28,9 +28,10 @@
 
 #ifdef INTELLISENSE
 	// These includes do nothing, but keep IntelliSense happy.
+	#include <set>
 	#include <StaticString.h>
+	#include <Constants.h>
 	#include <ap_config.h>
-	#include "../ConfigGeneral/Common.h"
 #endif
 
 /*

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h.cxxcodebuilder

@@ -36,9 +36,10 @@ def main
 
     #ifdef INTELLISENSE
       // These includes do nothing, but keep IntelliSense happy.
+      #include <set>
       #include <StaticString.h>
+      #include <Constants.h>
       #include <ap_config.h>
-      #include "../ConfigGeneral/Common.h"
     #endif
   }
 

data/src/cxx_supportlib/Constants.h

@@ -83,7 +83,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.22"
+#define PASSENGER_VERSION "6.0.24"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/DataStructures/LString.h

@@ -257,6 +257,10 @@ psg_lstr_cmp(const LString *str, const StaticString &other) {
 	const LString::Part *part;
 	const char *b;
 
+	if (str == NULL) {
+		return false;
+	}
+
 	// Fast check: check length match
 	if (str->size != other.size()) {
 		return false;

data/src/cxx_supportlib/DataStructures/StringMap.h

@@ -27,7 +27,6 @@
 #define _PASSENGER_DATA_STRUCTURES_STRING_MAP_H_
 
 #include <string>
-#include <map>
 #include <utility>
 
 #include <StaticString.h>

data/src/cxx_supportlib/FileTools/PathManip.cpp

@@ -27,7 +27,7 @@
 #include <sys/param.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <limits.h>
+#include <limits.h> // IWYU pragma: keep; for PATH_MAX
 #include <libgen.h>
 
 #ifdef __has_include

data/src/cxx_supportlib/SafeLibev.h

@@ -28,10 +28,8 @@
 
 #include <ev++.h>
 #include <vector>
-#include <list>
 #include <memory>
 #include <boost/thread.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/bind/bind.hpp>
@@ -82,7 +80,7 @@ private:
 	}
 
 	static void timeoutHandler(int revents, void *arg) {
-		boost::scoped_ptr<Callback> callback((Callback *) arg);
+		std::unique_ptr<Callback> callback((Callback *) arg);
 		(*callback)();
 	}
 

data/src/cxx_supportlib/ServerKit/Hooks.h

@@ -61,13 +61,13 @@ struct RefGuard {
 		  file(_file),
 		  line(_line)
 	{
-		if (_hooks != NULL && _hooks->impl != NULL) {
+		if (_hooks != nullptr && _hooks->impl != nullptr) {
 			_hooks->impl->hook_ref(_hooks, _source, _file, _line);
 		}
 	}
 
 	~RefGuard() {
-		if (hooks != NULL && hooks->impl != NULL) {
+		if (hooks != nullptr && hooks->impl != nullptr) {
 			hooks->impl->hook_unref(hooks, source, file, line);
 		}
 	}

data/src/cxx_supportlib/ServerKit/HttpHeaderParser.h

@@ -29,7 +29,6 @@
 #include <boost/cstdint.hpp>
 #include <oxt/backtrace.hpp>
 #include <cstddef>
-#include <cassert>
 #include <cstring>
 #include <MemoryKit/mbuf.h>
 #include <ServerKit/llhttp.h>