passenger 6.0.23 → 6.0.24

data/src/agent/Core/Config.h

@@ -167,13 +167,13 @@ 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.24")
  *   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
  *   single_app_mode_app_type                                        string             -          read_only
  *   single_app_mode_startup_file                                    string             -          read_only
- *   spawn_dir                                                       string             required   read_only
+ *   spawn_dir                                                       string             -          default,read_only
  *   standalone_engine                                               string             -          default
  *   stat_throttle_rate                                              unsigned integer   -          default(10)
  *   telemetry_collector_ca_certificate_path                         string             -          -
@@ -240,6 +240,10 @@ private:
 		return 80;
 	}
 
+	static Json::Value getDefaultSpawnDir(const ConfigKit::Store &store) {
+		return getSystemTempDir();
+	}
+
 	static Json::Value getDefaultThreads(const ConfigKit::Store &store) {
 		return Json::UInt(boost::thread::hardware_concurrency());
 	}
@@ -488,7 +492,7 @@ public:
 		overrideWithDynamicDefault("default_server_port", UINT_TYPE, OPTIONAL, getDefaultServerPort);
 
 		add("passenger_root", STRING_TYPE, REQUIRED | READ_ONLY);
-		add("spawn_dir", STRING_TYPE, REQUIRED | READ_ONLY);
+		addWithDynamicDefault("spawn_dir", STRING_TYPE, OPTIONAL | READ_ONLY | CACHE_DEFAULT_VALUE, getDefaultSpawnDir);
 		add("config_manifest", OBJECT_TYPE, OPTIONAL | READ_ONLY);
 		add("pid_file", STRING_TYPE, OPTIONAL | READ_ONLY);
 		add("web_server_version", STRING_TYPE, OPTIONAL | READ_ONLY);

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

@@ -117,7 +117,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/6.0.23")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.24")
  *   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/CoreMain.cpp

@@ -85,7 +85,6 @@
 #include <AppTypeDetector/Detector.h>
 #include <IOTools/MessageSerialization.h>
 #include <FileDescriptor.h>
-#include <ResourceLocator.h>
 #include <BackgroundEventLoop.cpp>
 #include <FileTools/FileManip.h>
 #include <FileTools/PathSecurityCheck.h>
@@ -145,7 +144,6 @@ namespace Core {
 
 		boost::mutex configSyncher;
 
-		ResourceLocator resourceLocator;
 		RandomGeneratorPtr randomGenerator;
 		SpawningKit::Context::Schema spawningKitContextSchema;
 		SpawningKit::ContextPtr spawningKitContext;
@@ -697,8 +695,6 @@ initializeNonPrivilegedWorkingObjects() {
 
 	setenv("SERVER_SOFTWARE", coreConfig->get("server_software").asCString(), 1);
 
-	wo->resourceLocator = ResourceLocator(coreConfig->get("passenger_root").asString());
-
 	wo->randomGenerator = boost::make_shared<RandomGenerator>();
 	// Check whether /dev/urandom is actually random.
 	// https://code.google.com/p/phusion-passenger/issues/detail?id=516
@@ -710,7 +706,7 @@ initializeNonPrivilegedWorkingObjects() {
 	UPDATE_TRACE_POINT();
 	wo->spawningKitContext = boost::make_shared<SpawningKit::Context>(
 		wo->spawningKitContextSchema);
-	wo->spawningKitContext->resourceLocator = &wo->resourceLocator;
+	wo->spawningKitContext->resourceLocator = Agent::Fundamentals::context->resourceLocator;
 	wo->spawningKitContext->wrapperRegistry = coreWrapperRegistry;
 	wo->spawningKitContext->randomGenerator = wo->randomGenerator;
 	wo->spawningKitContext->integrationMode = coreConfig->get("integration_mode").asString();
@@ -772,7 +768,7 @@ initializeNonPrivilegedWorkingObjects() {
 			&coreSchema->controllerSingleAppMode.schema,
 			&wo->singleAppModeConfig,
 			coreSchema->controllerSingleAppMode.translator);
-		two.controller->resourceLocator = &wo->resourceLocator;
+		two.controller->resourceLocator = Agent::Fundamentals::context->resourceLocator;
 		two.controller->wrapperRegistry = coreWrapperRegistry;
 		two.controller->appPool = wo->appPool;
 		two.controller->shutdownFinishCallback = controllerShutdownFinished;
@@ -877,7 +873,7 @@ initializeSecurityUpdateChecker() {
 		config,
 		coreSchema->securityUpdateChecker.translator);
 	workingObjects->securityUpdateChecker = checker;
-	checker->resourceLocator = &workingObjects->resourceLocator;
+	checker->resourceLocator = Agent::Fundamentals::context->resourceLocator;
 	checker->initialize();
 	checker->start();
 }
@@ -927,7 +923,7 @@ initializeAdminPanelConnector() {
 	AdminPanelConnector *connector = new Core::AdminPanelConnector(
 		coreSchema->adminPanelConnector.schema, config,
 		coreSchema->adminPanelConnector.translator);
-	connector->resourceLocator = &wo.resourceLocator;
+	connector->resourceLocator = Agent::Fundamentals::context->resourceLocator;
 	connector->appPool = wo.appPool;
 	connector->configGetter = inspectConfig;
 	for (unsigned int i = 0; i < wo.threadWorkingObjects.size(); i++) {
@@ -956,7 +952,7 @@ prestartWebApps() {
 	}
 
 	boost::function<void ()> func = boost::bind(prestartWebApps,
-		wo->resourceLocator,
+		*Agent::Fundamentals::context->resourceLocator,
 		coreConfig->get("default_ruby").asString(),
 		prestartURLs
 	);
@@ -983,7 +979,7 @@ warnIfPassengerRootVulnerable() {
 		return; // Passenger is not root, so no escalation.
 	}
 
-	string root = workingObjects->resourceLocator.getInstallSpec();
+	string root = Agent::Fundamentals::context->resourceLocator->getInstallSpec();
 	vector<string> errors, checkErrors;
 	if (isPathProbablySecureForRootUse(root, errors, checkErrors)) {
 		if (!checkErrors.empty()) {
@@ -1400,13 +1396,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/agent/Core/SpawningKit/Handshake/Prepare.h

@@ -30,9 +30,7 @@
 #include <boost/thread.hpp>
 #include <boost/scoped_array.hpp>
 #include <string>
-#include <vector>
-#include <stdexcept>
-#include <algorithm>
+#include <exception>
 #include <utility>
 #include <cerrno>
 #include <cstddef>
@@ -45,7 +43,6 @@
 #include <pwd.h>
 #include <grp.h>
 #include <unistd.h>
-#include <limits.h>
 
 #include <jsoncpp/json.h>
 
@@ -350,55 +347,6 @@ private:
 		}
 	}
 
-	#if 0
-	void inferApplicationInfo() const {
-		TRACE_POINT();
-		session.result.codeRevision = readFromRevisionFile();
-		if (session.result.codeRevision.empty()) {
-			session.result.codeRevision = inferCodeRevisionFromCapistranoSymlink();
-		}
-	}
-
-	string readFromRevisionFile() const {
-		TRACE_POINT();
-		string filename = config->appRoot + "/REVISION";
-		try {
-			if (fileExists(filename)) {
-				return strip(readAll(filename));
-			}
-		} catch (const SystemException &e) {
-			P_WARN("Cannot access " << filename << ": " << e.what());
-		}
-		return string();
-	}
-
-	string inferCodeRevisionFromCapistranoSymlink() const {
-		TRACE_POINT();
-		if (extractBaseName(config->appRoot) == "current") {
-			string appRoot = config->appRoot.toString(); // null terminate string
-			char buf[PATH_MAX + 1];
-			ssize_t ret;
-
-			do {
-				ret = readlink(appRoot.c_str(), buf, PATH_MAX);
-			} while (ret == -1 && errno == EINTR);
-			if (ret == -1) {
-				if (errno == EINVAL) {
-					return string();
-				} else {
-					int e = errno;
-					P_WARN("Cannot read symlink " << appRoot << ": " << strerror(e));
-				}
-			}
-
-			buf[ret] = '\0';
-			return extractBaseName(buf);
-		} else {
-			return string();
-		}
-	}
-	#endif
-
 	void findFreePortOrSocketFile() {
 		TRACE_POINT();
 		session.expectedStartPort = findFreePort();

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

@@ -89,6 +89,9 @@ struct HandshakeSession {
 		{ }
 
 	~HandshakeSession() {
+		boost::this_thread::disable_interruption di;
+		boost::this_thread::disable_syscall_interruption dsi;
+
 		if (workDirFd != -1) {
 			safelyClose(workDirFd, true);
 		}

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

@@ -31,11 +31,12 @@
 #include <cerrno>
 
 #include <sys/types.h>
-#include <limits.h>
+#include <limits.h> // IWYU pragma: keep; for PATH_MAX
 #include <unistd.h>
 
 #include <Exceptions.h>
 #include <Utils.h>
+#include <FileTools/FileManip.h>
 #include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
@@ -78,6 +79,8 @@ public:
 
 	~HandshakeWorkDir() {
 		if (!path.empty()) {
+			boost::this_thread::disable_interruption di;
+			boost::this_thread::disable_syscall_interruption dsi;
 			removeDirTree(path);
 		}
 	}
@@ -108,7 +111,7 @@ public:
 		// dropping root privileges).
 		boost::this_thread::disable_interruption di;
 		boost::this_thread::disable_syscall_interruption dsi;
-		syscalls::chown(path.c_str(), uid, gid);
+		oxt::syscalls::chown(path.c_str(), uid, gid);
 	}
 };
 

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

@@ -33,12 +33,12 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <stdexcept>
+#include <exception>
 #include <dirent.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <signal.h>
+#include <signal.h> // IWYU pragma: keep; for signal constants
 #include <unistd.h>
 #include <cstring>
 #include <cassert>
@@ -66,6 +66,10 @@
 #include <Core/SpawningKit/Handshake/Perform.h>
 #include <Core/SpawningKit/Handshake/BackgroundIOCapturer.h>
 
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Options.h>
+#endif
+
 namespace Passenger {
 namespace SpawningKit {
 

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

@@ -38,6 +38,10 @@
 #include <Core/SpawningKit/Result.h>
 #include <Core/SpawningKit/UserSwitchingRules.h>
 
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Options.h>
+#endif
+
 namespace Passenger {
 namespace SpawningKit {
 

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

@@ -155,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.23")
+ *   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/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/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
 

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
   }