passenger 5.2.3 → 5.3.0

data/src/agent/Watchdog/Config.h

@@ -145,7 +145,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/5.2.3")
+ *   server_software                                                          string             -          default("Phusion_Passenger/5.3.0")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only
@@ -157,8 +157,6 @@ using namespace std;
  *   turbocaching                                                             boolean            -          default(true),read_only
  *   user                                                                     string             -          default,read_only
  *   user_switching                                                           boolean            -          default(true)
- *   ust_router_address                                                       string             -          -
- *   ust_router_password                                                      string             -          secret
  *   vary_turbocache_by_cookie                                                string             -          -
  *   watchdog_api_server_accept_burst_count                                   unsigned integer   -          default(32)
  *   watchdog_api_server_addresses                                            array of strings   -          default([]),read_only

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -535,7 +535,8 @@ usage() {
 	printf("Usage: " AGENT_EXE " watchdog <OPTIONS...>\n");
 	printf("Runs the " PROGRAM_NAME " watchdog.\n\n");
 	printf("The watchdog runs and supervises various " PROGRAM_NAME " agent processes,\n");
-	printf("namely the core and the UstRouter. Arguments marked with \"[A]\", e.g.\n");
+	printf("at this moment only the core (there was also a process called UstRouter but\n");
+	printf("it no longer exists). Arguments marked with \"[A]\", e.g.\n");
 	printf("--passenger-root and --log-level, are automatically passed to all supervised\n");
 	printf("agents, unless you explicitly override them by passing extra arguments to a\n");
 	printf("supervised agent specifically. You can pass arguments to a supervised agent by\n");

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -83,6 +83,11 @@ AP_INIT_TAKE1("PassengerAppGroupName",
 	NULL,
 	RSRC_CONF | ACCESS_CONF,
 	"Application process group name."),
+AP_INIT_TAKE1("PassengerAppLogFile",
+	(Take1Func) cmd_passenger_enterprise_only,
+	NULL,
+	RSRC_CONF | ACCESS_CONF,
+	"Application log file path."),
 AP_INIT_TAKE1("PassengerAppRoot",
 	(Take1Func) cmd_passenger_app_root,
 	NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -149,6 +149,11 @@ ConfigManifestGenerator::autoGenerated_setAppConfigDefaults() {
 		"PassengerAppGroupName",
 		P_STATIC_STRING("PassengerAppRoot plus PassengerAppEnv"));
 
+	addOptionsContainerDynamicDefault(
+		defaultAppConfigContainer,
+		"PassengerAppLogFile",
+		P_STATIC_STRING("PassengerLogFile"));
+
 	addOptionsContainerDynamicDefault(
 		defaultAppConfigContainer,
 		"PassengerAppRoot",

data/src/apache2_module/ConfigGeneral/ManifestGeneration.h

@@ -100,13 +100,13 @@ private:
 			*appOptionsContainer = &appConfigContainer["options"];
 			*locOptionsContainer = &appConfigContainer["default_location_configuration"];
 
-			// Create a default value for passenger_app_root
-			// if we just created this config container
+			// Create a default value for PassengerAppGroupName and
+			// PassengerAppRoot if we just created this config container
 			if ((*appOptionsContainer)->empty()) {
-				addOptionsContainerStaticDefaultStr(**appOptionsContainer,
+				addOptionsContainerInferredDefaultStr(**appOptionsContainer,
 					"PassengerAppGroupName",
 					appGroupName);
-				addOptionsContainerStaticDefaultStr(**appOptionsContainer,
+				addOptionsContainerInferredDefaultStr(**appOptionsContainer,
 					"PassengerAppRoot",
 					inferDefaultAppRoot(csconf));
 			}
@@ -531,8 +531,8 @@ private:
 		optionContainer["value_hierarchy"].append(hierarchyMember);
 	}
 
-	Json::Value &addOptionsContainerStaticDefault(Json::Value &optionsContainer,
-		const char *optionName)
+	Json::Value &addOptionsContainerDefault(Json::Value &optionsContainer,
+		const char *defaultType, const char *optionName)
 	{
 		Json::Value &optionContainer = optionsContainer[optionName];
 		if (optionContainer.isNull()) {
@@ -540,7 +540,7 @@ private:
 		}
 
 		Json::Value hierarchyMember;
-		hierarchyMember["source"]["type"] = "default";
+		hierarchyMember["source"]["type"] = defaultType;
 
 		return optionContainer["value_hierarchy"].append(hierarchyMember);
 	}
@@ -548,8 +548,8 @@ private:
 	void addOptionsContainerStaticDefaultStr(Json::Value &optionsContainer,
 		const char *optionName, const StaticString &value)
 	{
-		Json::Value &hierarchyMember = addOptionsContainerStaticDefault(
-			optionsContainer, optionName);
+		Json::Value &hierarchyMember = addOptionsContainerDefault(
+			optionsContainer, "default", optionName);
 		hierarchyMember["value"] = Json::Value(value.data(),
 			value.data() + value.size());
 	}
@@ -557,19 +557,28 @@ private:
 	void addOptionsContainerStaticDefaultInt(Json::Value &optionsContainer,
 		const char *optionName, int value)
 	{
-		Json::Value &hierarchyMember = addOptionsContainerStaticDefault(
-			optionsContainer, optionName);
+		Json::Value &hierarchyMember = addOptionsContainerDefault(
+			optionsContainer, "default", optionName);
 		hierarchyMember["value"] = value;
 	}
 
 	void addOptionsContainerStaticDefaultBool(Json::Value &optionsContainer,
 		const char *optionName, bool value)
 	{
-		Json::Value &hierarchyMember = addOptionsContainerStaticDefault(
-			optionsContainer, optionName);
+		Json::Value &hierarchyMember = addOptionsContainerDefault(
+			optionsContainer, "default", optionName);
 		hierarchyMember["value"] = value;
 	}
 
+	void addOptionsContainerInferredDefaultStr(Json::Value &optionsContainer,
+		const char *optionName, const StaticString &value)
+	{
+		Json::Value &hierarchyMember = addOptionsContainerDefault(
+			optionsContainer, "inferred-default", optionName);
+		hierarchyMember["value"] = Json::Value(value.data(),
+			value.data() + value.size());
+	}
+
 	void jsonAppendValues(Json::Value &doc, const Json::Value &doc2) {
 		Json::Value::const_iterator it, end = doc2.end();
 

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp

@@ -49,6 +49,9 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	/*
 	 * config->mAppGroupName: default initialized
 	 */
+	/*
+	 * config->mAppLogFile: default initialized
+	 */
 	/*
 	 * config->mAppRoot: default initialized
 	 */
@@ -110,6 +113,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mAllowEncodedSlashesSourceLine = 0;
 	config->mAppEnvSourceLine = 0;
 	config->mAppGroupNameSourceLine = 0;
+	config->mAppLogFileSourceLine = 0;
 	config->mAppRootSourceLine = 0;
 	config->mAppTypeSourceLine = 0;
 	config->mBaseURIsSourceLine = 0;
@@ -143,6 +147,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mAllowEncodedSlashesExplicitlySet = false;
 	config->mAppEnvExplicitlySet = false;
 	config->mAppGroupNameExplicitlySet = false;
+	config->mAppLogFileExplicitlySet = false;
 	config->mAppRootExplicitlySet = false;
 	config->mAppTypeExplicitlySet = false;
 	config->mBaseURIsExplicitlySet = false;

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp

@@ -49,6 +49,9 @@ constructRequestHeaders_autoGenerated(request_rec *r, Passenger::Apache2Module::
 	addHeader(result, StaticString("!~PASSENGER_APP_GROUP_NAME",
 			sizeof("!~PASSENGER_APP_GROUP_NAME") - 1),
 		config->mAppGroupName);
+	addHeader(result, StaticString("!~PASSENGER_APP_LOG_FILE",
+			sizeof("!~PASSENGER_APP_LOG_FILE") - 1),
+		config->mAppLogFile);
 	addHeader(r, result, StaticString("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS",
 			sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS") - 1),
 		config->mForceMaxConcurrentRequestsPerProcess);

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp

@@ -85,6 +85,19 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForDirConfig(server
 			pdconf->mAppGroupName.data(),
 			pdconf->mAppGroupName.data() + pdconf->mAppGroupName.size());
 	}
+	if (pdconf->mAppLogFileExplicitlySet) {
+		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
+			pdconf, context, &appOptionsContainer, &locOptionsContainer);
+		Json::Value &optionContainer = findOrCreateOptionContainer(*appOptionsContainer,
+			"PassengerAppLogFile",
+			sizeof("PassengerAppLogFile") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			pdconf->mAppLogFileSourceFile,
+			pdconf->mAppLogFileSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			pdconf->mAppLogFile.data(),
+			pdconf->mAppLogFile.data() + pdconf->mAppLogFile.size());
+	}
 	if (pdconf->mAppRootExplicitlySet) {
 		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
 			pdconf, context, &appOptionsContainer, &locOptionsContainer);

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp

@@ -54,6 +54,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(!add->mAppGroupName.empty())
 		? add->mAppGroupName
 		: base->mAppGroupName;
+	config->mAppLogFile =
+		(!add->mAppLogFile.empty())
+		? add->mAppLogFile
+		: base->mAppLogFile;
 	config->mAppRoot =
 		(!add->mAppRoot.empty())
 		? add->mAppRoot
@@ -174,6 +178,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mAllowEncodedSlashesSourceFile = add->mAllowEncodedSlashesSourceFile;
 	config->mAppEnvSourceFile = add->mAppEnvSourceFile;
 	config->mAppGroupNameSourceFile = add->mAppGroupNameSourceFile;
+	config->mAppLogFileSourceFile = add->mAppLogFileSourceFile;
 	config->mAppRootSourceFile = add->mAppRootSourceFile;
 	config->mAppTypeSourceFile = add->mAppTypeSourceFile;
 	config->mBaseURIsSourceFile = add->mBaseURIsSourceFile;
@@ -207,6 +212,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mAllowEncodedSlashesSourceLine = add->mAllowEncodedSlashesSourceLine;
 	config->mAppEnvSourceLine = add->mAppEnvSourceLine;
 	config->mAppGroupNameSourceLine = add->mAppGroupNameSourceLine;
+	config->mAppLogFileSourceLine = add->mAppLogFileSourceLine;
 	config->mAppRootSourceLine = add->mAppRootSourceLine;
 	config->mAppTypeSourceLine = add->mAppTypeSourceLine;
 	config->mBaseURIsSourceLine = add->mBaseURIsSourceLine;
@@ -240,6 +246,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mAllowEncodedSlashesExplicitlySet = add->mAllowEncodedSlashesExplicitlySet;
 	config->mAppEnvExplicitlySet = add->mAppEnvExplicitlySet;
 	config->mAppGroupNameExplicitlySet = add->mAppGroupNameExplicitlySet;
+	config->mAppLogFileExplicitlySet = add->mAppLogFileExplicitlySet;
 	config->mAppRootExplicitlySet = add->mAppRootExplicitlySet;
 	config->mAppTypeExplicitlySet = add->mAppTypeExplicitlySet;
 	config->mBaseURIsExplicitlySet = add->mBaseURIsExplicitlySet;

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -129,6 +129,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	StaticString mAppGroupName;
 
+	/*
+	 * Application log file path.
+	 */
+	StaticString mAppLogFile;
+
 	/*
 	 * The application's root directory.
 	 */
@@ -218,6 +223,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mStartTimeoutSourceFile;
 	StaticString mAppEnvSourceFile;
 	StaticString mAppGroupNameSourceFile;
+	StaticString mAppLogFileSourceFile;
 	StaticString mAppRootSourceFile;
 	StaticString mAppTypeSourceFile;
 	StaticString mGroupSourceFile;
@@ -251,6 +257,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mStartTimeoutSourceLine;
 	unsigned int mAppEnvSourceLine;
 	unsigned int mAppGroupNameSourceLine;
+	unsigned int mAppLogFileSourceLine;
 	unsigned int mAppRootSourceLine;
 	unsigned int mAppTypeSourceLine;
 	unsigned int mGroupSourceLine;
@@ -284,6 +291,7 @@ struct AutoGeneratedDirConfig {
 	bool mStartTimeoutExplicitlySet: 1;
 	bool mAppEnvExplicitlySet: 1;
 	bool mAppGroupNameExplicitlySet: 1;
+	bool mAppLogFileExplicitlySet: 1;
 	bool mAppRootExplicitlySet: 1;
 	bool mAppTypeExplicitlySet: 1;
 	bool mGroupExplicitlySet: 1;
@@ -454,6 +462,11 @@ struct AutoGeneratedDirConfig {
 		return mAppGroupName;
 	}
 
+	StaticString
+	getAppLogFile() const {
+		return mAppLogFile;
+	}
+
 	StaticString
 	getAppRoot() const {
 		return mAppRoot;

data/src/cxx_supportlib/Constants.h

@@ -81,11 +81,13 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "5.2.3"
+#define PASSENGER_VERSION "5.3.0"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"
+#define PROGRAM_AUTHOR "Phusion"
 #define PROGRAM_NAME "Phusion Passenger"
+#define PROGRAM_WEBSITE "https://www.phusionpassenger.com"
 #define RPM_APACHE_MODULE_PACKAGE "mod_passenger"
 #define RPM_DEV_PACKAGE "passenger-devel"
 #define RPM_MAIN_PACKAGE "passenger"

data/src/cxx_supportlib/Exceptions.h

@@ -245,127 +245,6 @@ public:
 	virtual const char *what() const throw() { return msg.c_str(); }
 };
 
-/**
- * Thrown when SpawnManager or ApplicationPool fails to spawn an application
- * instance. The exception may contain an error page. This error page contains
- * detailed information about the error and may be in HTML format. The error
- * page always contains enough information so that showing `what()` is not
- * necessary.
- */
-class SpawnException: public oxt::tracable_exception {
-public:
-	enum ErrorKind {
-		UNDEFINED_ERROR,
-		/** The preloader failed to start, not due to a wrong protocol message.
-		 * It did not explicitly supply an error message.
-		 */
-		PRELOADER_STARTUP_ERROR,
-		/** The preloader sent a wrong protocol message during startup. */
-		PRELOADER_STARTUP_PROTOCOL_ERROR,
-		/** The preloader timed out during startup. */
-		PRELOADER_STARTUP_TIMEOUT,
-		/** The preloader failed to start, not due to a wrong protocol message.
-		 * It DID explicitly supply an error message. */
-		PRELOADER_STARTUP_EXPLAINABLE_ERROR,
-		/** The application failed to start, not due to a wrong protocol message.
-		 * It did not explicitly supply an error message. */
-		APP_STARTUP_ERROR,
-		/** The application sent a wrong protocol message during startup. */
-		APP_STARTUP_PROTOCOL_ERROR,
-		/** The application timed out during startup. */
-		APP_STARTUP_TIMEOUT,
-		/** The application failed to start, not due to a wrong protocol message.
-		 * It DID explicitly supply an error message. */
-		APP_STARTUP_EXPLAINABLE_ERROR
-	};
-
-private:
-	ErrorKind errorKind;
-	string msg;
-	bool m_hasErrorPage;
-	bool m_isHTML;
-	string m_errorPage;
-	string preloaderCommand;
-	map<string, string> annotations;
-
-public:
-	SpawnException(const string &message, ErrorKind errorKind = UNDEFINED_ERROR)
-		: msg(message)
-	{
-		this->errorKind = errorKind;
-		m_hasErrorPage = false;
-		m_isHTML = false;
-	}
-
-	SpawnException(const string &message, const string &errorPage,
-		bool isHTML = true, ErrorKind errorKind = UNDEFINED_ERROR)
-		: msg(message), m_errorPage(errorPage)
-	{
-		this->errorKind = errorKind;
-		m_hasErrorPage = true;
-		m_isHTML = isHTML;
-	}
-
-	virtual ~SpawnException() throw() {}
-
-	virtual const char *what() const throw() {
-		return msg.c_str();
-	}
-
-	bool hasErrorPage() const {
-		return m_hasErrorPage;
-	}
-
-	const string &getErrorPage() const {
-		return m_errorPage;
-	}
-
-	bool isHTML() const {
-		return m_isHTML;
-	}
-
-	ErrorKind getErrorKind() const {
-		return errorKind;
-	}
-
-	SpawnException &setPreloaderCommand(const string &filename) {
-		preloaderCommand = filename;
-		return *this;
-	}
-
-	const string &getPreloaderCommand() const {
-		return preloaderCommand;
-	}
-
-	void addAnnotations(const map<string, string> &annotations) {
-		map<string, string>::const_iterator it, end = annotations.end();
-		for (it = annotations.begin(); it != end; it++) {
-			this->annotations[it->first] = it->second;
-		}
-	}
-
-	const map<string, string> &getAnnotations() const {
-		return annotations;
-	}
-
-	string operator[](const string &name) const {
-		return get(name);
-	}
-
-	void set(const string &name, const string &value) {
-		annotations[name] = value;
-	}
-
-	string get(const string &name) const {
-		map<string, string>::const_iterator it = annotations.find(name);
-		if (it == annotations.end()) {
-			return string();
-		} else {
-			return it->second;
-		}
-	}
-};
-
 /**
  * Indicates that a Pool::get() or Pool::asyncGet() request was denied.
  * The request never reached a process. This could be because, before the

data/src/cxx_supportlib/LoggingKit/Implementation.cpp

@@ -432,7 +432,9 @@ realLogAppOutput(const HashedStaticString &groupName, int targetFd,
 }
 
 void
-logAppOutput(const HashedStaticString &groupName, pid_t pid, const char *channelName, const char *message, unsigned int size, const StaticString &appLogFile) {
+logAppOutput(const HashedStaticString &groupName, pid_t pid, const StaticString &channelName,
+	const char *message, unsigned int size, const StaticString &appLogFile)
+{
 	int targetFd;
 	bool saveLog = false;
 
@@ -457,7 +459,7 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const char *channel
 		}
 	}
 	char pidStr[sizeof("4294967295")];
-	unsigned int pidStrLen, channelNameLen, totalLen;
+	unsigned int pidStrLen, totalLen;
 
 	try {
 		pidStrLen = integerToOtherBase<pid_t, 10>(pid, pidStr, sizeof(pidStr));
@@ -467,21 +469,20 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const char *channel
 		pidStrLen = 1;
 	}
 
-	channelNameLen = strlen(channelName);
-	totalLen = (sizeof("App X Y: \n") - 2) + pidStrLen + channelNameLen + size;
+	totalLen = (sizeof("App X Y: \n") - 2) + pidStrLen + channelName.size() + size;
 	if (totalLen < 1024) {
 		char buf[1024];
 		realLogAppOutput(groupName, targetFd,
 			buf, sizeof(buf),
 			pidStr, pidStrLen,
-			channelName, channelNameLen,
+			channelName.data(), channelName.size(),
 			message, size, fd, saveLog);
 	} else {
 		DynamicBuffer buf(totalLen);
 		realLogAppOutput(groupName, targetFd,
 			buf.data, totalLen,
 			pidStr, pidStrLen,
-			channelName, channelNameLen,
+			channelName.data(), channelName.size(),
 			message, size, fd, saveLog);
 	}
 	if(fd > -1){close(fd);}