passenger 6.0.6 → 6.0.10

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -179,6 +179,11 @@ ConfigManifestGenerator::autoGenerated_setAppConfigDefaults() {
 		"PassengerAppType",
 		P_STATIC_STRING("Autodetected"));
 
+	addOptionsContainerStaticDefaultStr(
+		defaultAppConfigContainer,
+		"PassengerDirectInstanceRequestAddress",
+		P_STATIC_STRING("127.0.0.1"));
+
 	addOptionsContainerStaticDefaultInt(
 		defaultAppConfigContainer,
 		"PassengerForceMaxConcurrentRequestsPerProcess",
@@ -305,6 +310,11 @@ ConfigManifestGenerator::autoGenerated_setLocationConfigDefaults() {
 		"PassengerStickySessions",
 		false);
 
+	addOptionsContainerStaticDefaultStr(
+		defaultLocConfigContainer,
+		"PassengerStickySessionsCookieAttributes",
+		DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES);
+
 	addOptionsContainerStaticDefaultStr(
 		defaultLocConfigContainer,
 		"PassengerStickySessionsCookieName",

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -319,6 +319,21 @@ cmd_passenger_default_user(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_direct_instance_request_address(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->mDirectInstanceRequestAddressSourceFile = cmd->directive->filename;
+	config->mDirectInstanceRequestAddressSourceLine = cmd->directive->line_num;
+	config->mDirectInstanceRequestAddressExplicitlySet = true;
+	config->mDirectInstanceRequestAddress = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_disable_anonymous_telemetry(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -903,6 +918,16 @@ cmd_passenger_sticky_sessions(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_sticky_sessions_cookie_attributes(cmd_parms *cmd, void *pcfg, const char *arg) {
+	DirConfig *config = (DirConfig *) pcfg;
+	config->mStickySessionsCookieAttributesSourceFile = cmd->directive->filename;
+	config->mStickySessionsCookieAttributesSourceLine = cmd->directive->line_num;
+	config->mStickySessionsCookieAttributesExplicitlySet = true;
+	config->mStickySessionsCookieAttributes = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_sticky_sessions_cookie_name(cmd_parms *cmd, void *pcfg, const char *arg) {
 	DirConfig *config = (DirConfig *) pcfg;
@@ -967,7 +992,7 @@ cmd_passenger_user_switching(cmd_parms *cmd, void *pcfg, const char *arg) {
 
 static const char *
 cmd_rails_allow_mod_rewrite(cmd_parms *cmd, void *pcfg, const char *arg) {
-	fprintf(stderr, "WARNING: The 'RailsAllowModRewrite' option is obsolete: Phusion Passenger now fully supports mod_rewrite. Please remove this option from your configuration file.\n");
+	fprintf(stderr, "WARNING: The 'RailsAllowModRewrite' option is obsolete: Phusion Passenger(R) now fully supports mod_rewrite. Please remove this option from your configuration file.\n");
 	fflush(stderr);
 	return NULL;
 }

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp

@@ -75,6 +75,9 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	 */
 	config->mBufferResponse = Apache2Module::UNSET;
 	config->mBufferUpload = Apache2Module::UNSET;
+	/*
+	 * config->mDirectInstanceRequestAddress: default initialized
+	 */
 	config->mEnabled = Apache2Module::UNSET;
 	config->mErrorOverride = Apache2Module::UNSET;
 	config->mForceMaxConcurrentRequestsPerProcess = UNSET_INT_VALUE;
@@ -115,6 +118,9 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	 * config->mStartupFile: default initialized
 	 */
 	config->mStickySessions = Apache2Module::UNSET;
+	/*
+	 * config->mStickySessionsCookieAttributes: default initialized
+	 */
 	/*
 	 * config->mStickySessionsCookieName: default initialized
 	 */
@@ -132,6 +138,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mBaseURIsSourceLine = 0;
 	config->mBufferResponseSourceLine = 0;
 	config->mBufferUploadSourceLine = 0;
+	config->mDirectInstanceRequestAddressSourceLine = 0;
 	config->mEnabledSourceLine = 0;
 	config->mErrorOverrideSourceLine = 0;
 	config->mForceMaxConcurrentRequestsPerProcessSourceLine = 0;
@@ -154,6 +161,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mStartTimeoutSourceLine = 0;
 	config->mStartupFileSourceLine = 0;
 	config->mStickySessionsSourceLine = 0;
+	config->mStickySessionsCookieAttributesSourceLine = 0;
 	config->mStickySessionsCookieNameSourceLine = 0;
 	config->mUserSourceLine = 0;
 
@@ -167,6 +175,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mBaseURIsExplicitlySet = false;
 	config->mBufferResponseExplicitlySet = false;
 	config->mBufferUploadExplicitlySet = false;
+	config->mDirectInstanceRequestAddressExplicitlySet = false;
 	config->mEnabledExplicitlySet = false;
 	config->mErrorOverrideExplicitlySet = false;
 	config->mForceMaxConcurrentRequestsPerProcessExplicitlySet = false;
@@ -189,6 +198,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mStartTimeoutExplicitlySet = false;
 	config->mStartupFileExplicitlySet = false;
 	config->mStickySessionsExplicitlySet = false;
+	config->mStickySessionsCookieAttributesExplicitlySet = false;
 	config->mStickySessionsCookieNameExplicitlySet = false;
 	config->mUserExplicitlySet = 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_DIRECT_INSTANCE_REQUEST_ADDRESS",
+			sizeof("!~PASSENGER_DIRECT_INSTANCE_REQUEST_ADDRESS") - 1),
+		config->mDirectInstanceRequestAddress);
 	addHeader(r, result, StaticString("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS",
 			sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS") - 1),
 		config->mForceMaxConcurrentRequestsPerProcess);
@@ -115,6 +118,9 @@ constructRequestHeaders_autoGenerated(request_rec *r, DirConfig *config, std::st
 	addHeader(result, StaticString("!~PASSENGER_STICKY_SESSIONS",
 			sizeof("!~PASSENGER_STICKY_SESSIONS") - 1),
 		config->mStickySessions);
+	addHeader(result, StaticString("!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES",
+			sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES") - 1),
+		config->mStickySessionsCookieAttributes);
 	addHeader(result, StaticString("!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME",
 			sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME") - 1),
 		config->mStickySessionsCookieName);

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->mDirectInstanceRequestAddressExplicitlySet) {
+		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
+			pdconf, context, &appOptionsContainer, &locOptionsContainer);
+		Json::Value &optionContainer = findOrCreateOptionContainer(*appOptionsContainer,
+			"PassengerDirectInstanceRequestAddress",
+			sizeof("PassengerDirectInstanceRequestAddress") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			pdconf->mDirectInstanceRequestAddressSourceFile,
+			pdconf->mDirectInstanceRequestAddressSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			pdconf->mDirectInstanceRequestAddress.data(),
+			pdconf->mDirectInstanceRequestAddress.data() + pdconf->mDirectInstanceRequestAddress.size());
+	}
 	if (pdconf->mEnabledExplicitlySet) {
 		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
 			pdconf, context, &appOptionsContainer, &locOptionsContainer);
@@ -435,6 +448,19 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForDirConfig(server
 			pdconf->mStickySessionsSourceLine);
 		hierarchyMember["value"] = pdconf->mStickySessions == Apache2Module::ENABLED;
 	}
+	if (pdconf->mStickySessionsCookieAttributesExplicitlySet) {
+		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
+			pdconf, context, &appOptionsContainer, &locOptionsContainer);
+		Json::Value &optionContainer = findOrCreateOptionContainer(*locOptionsContainer,
+			"PassengerStickySessionsCookieAttributes",
+			sizeof("PassengerStickySessionsCookieAttributes") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			pdconf->mStickySessionsCookieAttributesSourceFile,
+			pdconf->mStickySessionsCookieAttributesSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			pdconf->mStickySessionsCookieAttributes.data(),
+			pdconf->mStickySessionsCookieAttributes.data() + pdconf->mStickySessionsCookieAttributes.size());
+	}
 	if (pdconf->mStickySessionsCookieNameExplicitlySet) {
 		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->mDirectInstanceRequestAddress =
+		(!add->mDirectInstanceRequestAddress.empty())
+		? add->mDirectInstanceRequestAddress
+		: base->mDirectInstanceRequestAddress;
 	config->mEnabled =
 		(add->mEnabled != Apache2Module::UNSET)
 		? add->mEnabled
@@ -176,6 +180,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(add->mStickySessions != Apache2Module::UNSET)
 		? add->mStickySessions
 		: base->mStickySessions;
+	config->mStickySessionsCookieAttributes =
+		(!add->mStickySessionsCookieAttributes.empty())
+		? add->mStickySessionsCookieAttributes
+		: base->mStickySessionsCookieAttributes;
 	config->mStickySessionsCookieName =
 		(!add->mStickySessionsCookieName.empty())
 		? add->mStickySessionsCookieName
@@ -195,6 +203,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsSourceFile = add->mBaseURIsSourceFile;
 	config->mBufferResponseSourceFile = add->mBufferResponseSourceFile;
 	config->mBufferUploadSourceFile = add->mBufferUploadSourceFile;
+	config->mDirectInstanceRequestAddressSourceFile = add->mDirectInstanceRequestAddressSourceFile;
 	config->mEnabledSourceFile = add->mEnabledSourceFile;
 	config->mErrorOverrideSourceFile = add->mErrorOverrideSourceFile;
 	config->mForceMaxConcurrentRequestsPerProcessSourceFile = add->mForceMaxConcurrentRequestsPerProcessSourceFile;
@@ -217,6 +226,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mStartTimeoutSourceFile = add->mStartTimeoutSourceFile;
 	config->mStartupFileSourceFile = add->mStartupFileSourceFile;
 	config->mStickySessionsSourceFile = add->mStickySessionsSourceFile;
+	config->mStickySessionsCookieAttributesSourceFile = add->mStickySessionsCookieAttributesSourceFile;
 	config->mStickySessionsCookieNameSourceFile = add->mStickySessionsCookieNameSourceFile;
 	config->mUserSourceFile = add->mUserSourceFile;
 
@@ -230,6 +240,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsSourceLine = add->mBaseURIsSourceLine;
 	config->mBufferResponseSourceLine = add->mBufferResponseSourceLine;
 	config->mBufferUploadSourceLine = add->mBufferUploadSourceLine;
+	config->mDirectInstanceRequestAddressSourceLine = add->mDirectInstanceRequestAddressSourceLine;
 	config->mEnabledSourceLine = add->mEnabledSourceLine;
 	config->mErrorOverrideSourceLine = add->mErrorOverrideSourceLine;
 	config->mForceMaxConcurrentRequestsPerProcessSourceLine = add->mForceMaxConcurrentRequestsPerProcessSourceLine;
@@ -252,6 +263,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mStartTimeoutSourceLine = add->mStartTimeoutSourceLine;
 	config->mStartupFileSourceLine = add->mStartupFileSourceLine;
 	config->mStickySessionsSourceLine = add->mStickySessionsSourceLine;
+	config->mStickySessionsCookieAttributesSourceLine = add->mStickySessionsCookieAttributesSourceLine;
 	config->mStickySessionsCookieNameSourceLine = add->mStickySessionsCookieNameSourceLine;
 	config->mUserSourceLine = add->mUserSourceLine;
 
@@ -265,6 +277,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsExplicitlySet = add->mBaseURIsExplicitlySet;
 	config->mBufferResponseExplicitlySet = add->mBufferResponseExplicitlySet;
 	config->mBufferUploadExplicitlySet = add->mBufferUploadExplicitlySet;
+	config->mDirectInstanceRequestAddressExplicitlySet = add->mDirectInstanceRequestAddressExplicitlySet;
 	config->mEnabledExplicitlySet = add->mEnabledExplicitlySet;
 	config->mErrorOverrideExplicitlySet = add->mErrorOverrideExplicitlySet;
 	config->mForceMaxConcurrentRequestsPerProcessExplicitlySet = add->mForceMaxConcurrentRequestsPerProcessExplicitlySet;
@@ -287,6 +300,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mStartTimeoutExplicitlySet = add->mStartTimeoutExplicitlySet;
 	config->mStartupFileExplicitlySet = add->mStartupFileExplicitlySet;
 	config->mStickySessionsExplicitlySet = add->mStickySessionsExplicitlySet;
+	config->mStickySessionsCookieAttributesExplicitlySet = add->mStickySessionsCookieAttributesExplicitlySet;
 	config->mStickySessionsCookieNameExplicitlySet = add->mStickySessionsCookieNameExplicitlySet;
 	config->mUserExplicitlySet = add->mUserExplicitlySet;
 }

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -72,7 +72,7 @@ struct AutoGeneratedDirConfig {
 	Threeway mBufferUpload;
 
 	/*
-	 * Enable or disable Phusion Passenger.
+	 * Enable or disable Phusion Passenger(R).
 	 */
 	Threeway mEnabled;
 
@@ -166,6 +166,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	StaticString mAppType;
 
+	/*
+	 * The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.
+	 */
+	StaticString mDirectInstanceRequestAddress;
+
 	/*
 	 * The group that Ruby applications must run as.
 	 */
@@ -187,7 +192,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mPython;
 
 	/*
-	 * The directory in which Phusion Passenger should look for restart.txt.
+	 * The directory in which Phusion Passenger(R) should look for restart.txt.
 	 */
 	StaticString mRestartDir;
 
@@ -206,6 +211,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	StaticString mStartupFile;
 
+	/*
+	 * The attributes to use for the sticky session cookie.
+	 */
+	StaticString mStickySessionsCookieAttributes;
+
 	/*
 	 * The cookie name to use for sticky sessions.
 	 */
@@ -249,6 +259,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mAppRootSourceFile;
 	StaticString mAppStartCommandSourceFile;
 	StaticString mAppTypeSourceFile;
+	StaticString mDirectInstanceRequestAddressSourceFile;
 	StaticString mGroupSourceFile;
 	StaticString mMeteorAppSettingsSourceFile;
 	StaticString mNodejsSourceFile;
@@ -257,6 +268,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mRubySourceFile;
 	StaticString mSpawnMethodSourceFile;
 	StaticString mStartupFileSourceFile;
+	StaticString mStickySessionsCookieAttributesSourceFile;
 	StaticString mStickySessionsCookieNameSourceFile;
 	StaticString mUserSourceFile;
 	StaticString mBaseURIsSourceFile;
@@ -284,6 +296,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mAppRootSourceLine;
 	unsigned int mAppStartCommandSourceLine;
 	unsigned int mAppTypeSourceLine;
+	unsigned int mDirectInstanceRequestAddressSourceLine;
 	unsigned int mGroupSourceLine;
 	unsigned int mMeteorAppSettingsSourceLine;
 	unsigned int mNodejsSourceLine;
@@ -292,6 +305,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mRubySourceLine;
 	unsigned int mSpawnMethodSourceLine;
 	unsigned int mStartupFileSourceLine;
+	unsigned int mStickySessionsCookieAttributesSourceLine;
 	unsigned int mStickySessionsCookieNameSourceLine;
 	unsigned int mUserSourceLine;
 	unsigned int mBaseURIsSourceLine;
@@ -319,6 +333,7 @@ struct AutoGeneratedDirConfig {
 	bool mAppRootExplicitlySet: 1;
 	bool mAppStartCommandExplicitlySet: 1;
 	bool mAppTypeExplicitlySet: 1;
+	bool mDirectInstanceRequestAddressExplicitlySet: 1;
 	bool mGroupExplicitlySet: 1;
 	bool mMeteorAppSettingsExplicitlySet: 1;
 	bool mNodejsExplicitlySet: 1;
@@ -327,6 +342,7 @@ struct AutoGeneratedDirConfig {
 	bool mRubyExplicitlySet: 1;
 	bool mSpawnMethodExplicitlySet: 1;
 	bool mStartupFileExplicitlySet: 1;
+	bool mStickySessionsCookieAttributesExplicitlySet: 1;
 	bool mStickySessionsCookieNameExplicitlySet: 1;
 	bool mUserExplicitlySet: 1;
 	bool mBaseURIsExplicitlySet: 1;
@@ -507,6 +523,15 @@ struct AutoGeneratedDirConfig {
 		return mAppType;
 	}
 
+	StaticString
+	getDirectInstanceRequestAddress() const {
+		if (mDirectInstanceRequestAddress.empty()) {
+			return P_STATIC_STRING("127.0.0.1");
+		} else {
+			return mDirectInstanceRequestAddress;
+		}
+	}
+
 	StaticString
 	getGroup() const {
 		return mGroup;
@@ -563,6 +588,15 @@ struct AutoGeneratedDirConfig {
 		return mStartupFile;
 	}
 
+	StaticString
+	getStickySessionsCookieAttributes() const {
+		if (mStickySessionsCookieAttributes.empty()) {
+			return DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES;
+		} else {
+			return mStickySessionsCookieAttributes;
+		}
+	}
+
 	StaticString
 	getStickySessionsCookieName() const {
 		if (mStickySessionsCookieName.empty()) {

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -58,7 +58,7 @@ namespace Apache2Module {
 struct AutoGeneratedServerConfig {
 
 	/*
-	 * Whether to disable Phusion Passenger anonymous telemetry.
+	 * Whether to disable Phusion Passenger(R) anonymous telemetry.
 	 */
 	bool disableAnonymousTelemetry;
 
@@ -68,27 +68,27 @@ struct AutoGeneratedServerConfig {
 	bool disableLogPrefix;
 
 	/*
-	 * Whether to disable the Phusion Passenger security update check & notification.
+	 * Whether to disable the Phusion Passenger(R) security update check & notification.
 	 */
 	bool disableSecurityUpdateCheck;
 
 	/*
-	 * Whether to show the Phusion Passenger version number in the X-Powered-By header.
+	 * Whether to show the Phusion Passenger(R) version number in the X-Powered-By header.
 	 */
 	bool showVersionInHeader;
 
 	/*
-	 * Whether to enable turbocaching in Phusion Passenger.
+	 * Whether to enable turbocaching in Phusion Passenger(R).
 	 */
 	bool turbocaching;
 
 	/*
-	 * Whether to enable user switching support in Phusion Passenger.
+	 * Whether to enable user switching support in Phusion Passenger(R).
 	 */
 	bool userSwitching;
 
 	/*
-	 * The Phusion Passenger log verbosity.
+	 * The Phusion Passenger(R) log verbosity.
 	 */
 	int logLevel;
 
@@ -108,12 +108,12 @@ struct AutoGeneratedServerConfig {
 	int poolIdleTime;
 
 	/*
-	 * The maximum size of the Phusion Passenger response buffer.
+	 * The maximum size of the Phusion Passenger(R) response buffer.
 	 */
 	int responseBufferHighWatermark;
 
 	/*
-	 * The Phusion Passenger socket backlog.
+	 * The Phusion Passenger(R) socket backlog.
 	 */
 	int socketBacklog;
 
@@ -143,27 +143,27 @@ struct AutoGeneratedServerConfig {
 	StaticString adminPanelUsername;
 
 	/*
-	 * Use specified HTTP/SOCKS proxy for Phusion Passenger anonymous telemetry collection.
+	 * Use specified HTTP/SOCKS proxy for Phusion Passenger(R) anonymous telemetry collection.
 	 */
 	StaticString anonymousTelemetryProxy;
 
 	/*
-	 * The directory that Phusion Passenger data buffers should be stored into.
+	 * The directory that Phusion Passenger(R) data buffers should be stored into.
 	 */
 	StaticString dataBufferDir;
 
 	/*
-	 * The group that Phusion Passenger applications must run as when user switching fails or is disabled.
+	 * The group that Phusion Passenger(R) applications must run as when user switching fails or is disabled.
 	 */
 	StaticString defaultGroup;
 
 	/*
-	 * Phusion Passenger's default Ruby interpreter to use.
+	 * Phusion Passenger(R)'s default Ruby interpreter to use.
 	 */
 	StaticString defaultRuby;
 
 	/*
-	 * The user that Phusion Passenger applications must run as when user switching fails or is disabled.
+	 * The user that Phusion Passenger(R) applications must run as when user switching fails or is disabled.
 	 */
 	StaticString defaultUser;
 
@@ -173,32 +173,32 @@ struct AutoGeneratedServerConfig {
 	StaticString dumpConfigManifest;
 
 	/*
-	 * The Phusion Passenger file descriptor log file.
+	 * The Phusion Passenger(R) file descriptor log file.
 	 */
 	StaticString fileDescriptorLogFile;
 
 	/*
-	 * The directory to register the Phusion Passenger instance to.
+	 * The directory to register the Phusion Passenger(R) instance to.
 	 */
 	StaticString instanceRegistryDir;
 
 	/*
-	 * The Phusion Passenger log file.
+	 * The Phusion Passenger(R) log file.
 	 */
 	StaticString logFile;
 
 	/*
-	 * The Phusion Passenger root folder.
+	 * The Phusion Passenger(R) root folder.
 	 */
 	StaticString root;
 
 	/*
-	 * Use specified HTTP/SOCKS proxy for the Phusion Passenger security update check.
+	 * Use specified HTTP/SOCKS proxy for the Phusion Passenger(R) security update check.
 	 */
 	StaticString securityUpdateCheckProxy;
 
 	/*
-	 * The directory for Phusion Passenger used during child spawning.
+	 * The directory for Phusion Passenger(R) used during child spawning.
 	 */
 	StaticString spawnDir;