passenger 6.0.2 → 6.0.7

data/src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h

@@ -51,6 +51,7 @@ Passenger::SpawningKit::Config::internStrings() {
 	totalSize += appType.size() + 1;
 	totalSize += appEnv.size() + 1;
 	totalSize += spawnMethod.size() + 1;
+	totalSize += bindAddress.size() + 1;
 	totalSize += baseURI.size() + 1;
 	totalSize += user.size() + 1;
 	totalSize += group.size() + 1;
@@ -90,6 +91,8 @@ Passenger::SpawningKit::Config::internStrings() {
 	pos = appendData(pos, end, "\0", 1);
 	pos = appendData(pos, end, spawnMethod);
 	pos = appendData(pos, end, "\0", 1);
+	pos = appendData(pos, end, bindAddress);
+	pos = appendData(pos, end, "\0", 1);
 	pos = appendData(pos, end, baseURI);
 	pos = appendData(pos, end, "\0", 1);
 	pos = appendData(pos, end, user);
@@ -147,6 +150,10 @@ Passenger::SpawningKit::Config::internStrings() {
 	spawnMethod = StaticString(pos, tmpSize);
 	pos += tmpSize + 1;
 
+	tmpSize = bindAddress.size();
+	bindAddress = StaticString(pos, tmpSize);
+	pos += tmpSize + 1;
+
 	tmpSize = baseURI.size();
 	baseURI = StaticString(pos, tmpSize);
 	pos += tmpSize + 1;
@@ -221,6 +228,10 @@ Passenger::SpawningKit::Config::validate(vector<StaticString> &errors) const {
 		ok = false;
 		errors.push_back(P_STATIC_STRING("spawn_method may not be empty"));
 	}
+	if (OXT_UNLIKELY(bindAddress.empty())) {
+		ok = false;
+		errors.push_back(P_STATIC_STRING("bind_address may not be empty"));
+	}
 	if (OXT_UNLIKELY(baseURI.empty())) {
 		ok = false;
 		errors.push_back(P_STATIC_STRING("base_uri may not be empty"));
@@ -287,6 +298,7 @@ Passenger::SpawningKit::Config::getConfidentialFieldsToPassToApp() const {
 	doc["app_type"] = appType.toString();
 	doc["app_env"] = appEnv.toString();
 	doc["spawn_method"] = spawnMethod.toString();
+	doc["bind_address"] = bindAddress.toString();
 	doc["base_uri"] = baseURI.toString();
 	doc["user"] = user.toString();
 	doc["group"] = group.toString();
@@ -340,6 +352,7 @@ Passenger::SpawningKit::Config::getNonConfidentialFieldsToPassToApp() const {
 	doc["app_type"] = appType.toString();
 	doc["app_env"] = appEnv.toString();
 	doc["spawn_method"] = spawnMethod.toString();
+	doc["bind_address"] = bindAddress.toString();
 	doc["base_uri"] = baseURI.toString();
 	doc["user"] = user.toString();
 	doc["group"] = group.toString();

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

@@ -138,6 +138,7 @@ public:
 	RandomGeneratorPtr randomGenerator;
 	string integrationMode;
 	string instanceDir;
+	string spawnDir;
 	DebugSupport *debugSupport;
 	//UnionStation::ContextPtr unionStationContext;
 

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

@@ -123,7 +123,7 @@ private:
 
 	void createWorkDir() {
 		TRACE_POINT();
-		session.workDir.reset(new HandshakeWorkDir());
+		session.workDir.reset(new HandshakeWorkDir(context->spawnDir));
 
 		session.envDumpDir = session.workDir->getPath() + "/envdump";
 		makeDirTree(session.envDumpDir,

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

@@ -54,12 +54,15 @@ private:
 	string path;
 
 public:
-	HandshakeWorkDir() {
+	HandshakeWorkDir(const std::string& spawn_dir) {
 		char buf[PATH_MAX + 1];
 		char *pos = buf;
 		const char *end = buf + PATH_MAX;
 
-		pos = appendData(pos, end, getSystemTempDir());
+		if (spawn_dir.empty())
+			throw RuntimeException("spawn_dir is not set");
+		pos = appendData(pos, end, spawn_dir.c_str());
+
 		pos = appendData(pos, end, "/passenger.spawn.XXXXXXXXXX");
 		*pos = '\0';
 

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

@@ -134,6 +134,7 @@ protected:
 		config->group = info.groupname;
 
 		extraArgs["spawn_method"] = options.spawnMethod.toString();
+		config->bindAddress = options.bindAddress;
 
 		/******************/
 		/******************/

data/src/agent/TempDirToucher/TempDirToucherMain.cpp

@@ -415,9 +415,11 @@ doSleep(int sec) {
 
 static void
 maybeDeletePidFile() {
+	up_privilege();
 	if (pidFile != NULL) {
 		unlink(pidFile);
 	}
+	down_privilege();
 }
 
 static void

data/src/agent/Watchdog/Config.h

@@ -103,6 +103,7 @@ using namespace std;
  *   daemonize                                                                boolean            -          default(false)
  *   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_environment                                                      string             -          default("production")
  *   default_force_max_concurrent_requests_per_process                        integer            -          default(-1)
  *   default_friendly_error_pages                                             string             -          default("auto")
@@ -120,14 +121,20 @@ using namespace std;
  *   default_server_port                                                      unsigned integer   -          default
  *   default_spawn_method                                                     string             -          default("smart")
  *   default_sticky_sessions                                                  boolean            -          default(false)
+ *   default_sticky_sessions_cookie_attributes                                string             -          default("SameSite=Lax; Secure;")
  *   default_sticky_sessions_cookie_name                                      string             -          default("_passenger_route")
  *   default_user                                                             string             -          default("nobody")
+ *   disable_log_prefix                                                       boolean            -          default(false)
  *   file_descriptor_log_target                                               any                -          -
  *   graceful_exit                                                            boolean            -          default(true)
  *   hook_after_watchdog_initialization                                       string             -          -
  *   hook_after_watchdog_shutdown                                             string             -          -
+ *   hook_attached_process                                                    string             -          read_only
  *   hook_before_watchdog_initialization                                      string             -          -
  *   hook_before_watchdog_shutdown                                            string             -          -
+ *   hook_detached_process                                                    string             -          read_only
+ *   hook_queue_full_error                                                    string             -          read_only
+ *   hook_spawn_failed                                                        string             -          read_only
  *   instance_registry_dir                                                    string             -          default,read_only
  *   integration_mode                                                         string             -          default("standalone")
  *   log_level                                                                string             -          default("notice")
@@ -146,13 +153,14 @@ 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.2")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.7")
  *   setsid                                                                   boolean            -          default(false)
  *   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             -          default,read_only
  *   standalone_engine                                                        string             -          default
  *   startup_report_file                                                      string             -          -
  *   stat_throttle_rate                                                       unsigned integer   -          default(10)
@@ -246,6 +254,10 @@ private:
 		return getSystemTempDir();
 	}
 
+	static Json::Value getDefaultSpawnDir(const ConfigKit::Store &store) {
+		return getSystemTempDir();
+	}
+
 	static void validateAddresses(const ConfigKit::Store &config, vector<ConfigKit::Error> &errors) {
 		typedef ConfigKit::Error Error;
 
@@ -258,6 +270,7 @@ private:
 	static Json::Value normalizePaths(const Json::Value &effectiveValues) {
 		Json::Value updates;
 		updates["instance_registry_dir"] = absolutizePath(effectiveValues["instance_registry_dir"].asString());
+		updates["spawn_dir"] = absolutizePath(effectiveValues["spawn_dir"].asString());
 		if (!effectiveValues["watchdog_pid_file"].isNull()) {
 			updates["watchdog_pid_file"] = absolutizePath(effectiveValues["watchdog_pid_file"].asString());
 		}
@@ -334,6 +347,8 @@ public:
 			OPTIONAL | READ_ONLY | CACHE_DEFAULT_VALUE, getDefaultUser);
 		addWithDynamicDefault("instance_registry_dir", STRING_TYPE,
 			OPTIONAL | READ_ONLY | CACHE_DEFAULT_VALUE, getDefaultInstanceRegistryDir);
+		addWithDynamicDefault("spawn_dir", STRING_TYPE,
+			OPTIONAL | READ_ONLY | CACHE_DEFAULT_VALUE, getDefaultSpawnDir);
 
 		add("hook_before_watchdog_initialization", STRING_TYPE, OPTIONAL);
 		add("hook_after_watchdog_initialization", STRING_TYPE, OPTIONAL);

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -654,6 +654,9 @@ usage() {
 	printf("      --instance-registry-dir  Directory to register instance into.\n");
 	printf("                               Default: %s\n", getSystemTempDir());
 	printf("\n");
+	printf("      --spawn-dir              Directory for spawn handshakes.\n");
+	printf("                               Default: %s\n", getSystemTempDir());
+	printf("\n");
 	printf("      --no-user-switching     Disables user switching support [A]\n");
 	printf("      --default-user NAME     Default user to start apps as, when user\n");
 	printf("                              switching is enabled. Default: " DEFAULT_WEB_APP_USER "\n");
@@ -774,6 +777,9 @@ parseOptions(int argc, const char *argv[], ConfigKit::Store &config) {
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--instance-registry-dir")) {
 			updates["instance_registry_dir"] = argv[i + 1];
 			i += 2;
+		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--spawn-dir")) {
+			updates["spawn_dir"] = argv[i + 1];
+			i += 2;
 		} else if (p.isFlag(argv[i], '\0', "--no-user-switching")) {
 			updates["user_switching"] = false;
 			i++;
@@ -1111,6 +1117,7 @@ initializeWorkingObjects(const WorkingObjectsPtr &wo, InstanceDirToucherPtr &ins
 
 	// check if path is safe
 	warnIfInstanceDirVulnerable(watchdogConfig->get("instance_registry_dir").asString());
+	warnIfInstanceDirVulnerable(watchdogConfig->get("spawn_dir").asString());
 
 	wo->instanceDir = boost::make_shared<InstanceDirectory>(instanceOptions,
 		watchdogConfig->get("instance_registry_dir").asString());

data/src/apache2_module/Config.cpp

@@ -183,7 +183,7 @@ static const char *
 cmd_passenger_enterprise_only(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return "this feature is only available in Phusion Passenger Enterprise. "
 		"You are currently running the open source Phusion Passenger Enterprise. "
-		"Please learn more about and/or buy Phusion Passenger Enterprise at https://www.phusionpassenger.com/enterprise";
+		"Please learn more about and/or buy Phusion Passenger Enterprise at https://www.phusionpassenger.com/features#premium-features";
 }
 
 static const char *

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -172,6 +172,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The user that Phusion Passenger applications must run as when user switching fails or is disabled."),
+	AP_INIT_TAKE1("PassengerDirectInstanceRequestAddress",
+		(Take1Func) cmd_passenger_direct_instance_request_address,
+		NULL,
+		RSRC_CONF | ACCESS_CONF,
+		"The address that Passenger binds to in order to allow sending HTTP requests to individual application processes."),
 	AP_INIT_FLAG("PassengerDisableAnonymousTelemetry",
 		(FlagFunc) cmd_passenger_disable_anonymous_telemetry,
 		NULL,
@@ -382,6 +387,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The Phusion Passenger socket backlog."),
+	AP_INIT_TAKE1("PassengerSpawnDir",
+		(Take1Func) cmd_passenger_spawn_dir,
+		NULL,
+		RSRC_CONF,
+		"The directory for Phusion Passenger used during child spawning."),
 	AP_INIT_TAKE1("PassengerSpawnMethod",
 		(Take1Func) cmd_passenger_spawn_method,
 		NULL,
@@ -407,6 +417,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF | ACCESS_CONF | OR_ALL,
 		"Whether to enable sticky sessions."),
+	AP_INIT_TAKE1("PassengerStickySessionsCookieAttributes",
+		(Take1Func) cmd_passenger_sticky_sessions_cookie_attributes,
+		NULL,
+		RSRC_CONF | ACCESS_CONF | OR_ALL,
+		"The attributes to use for the sticky session cookie."),
 	AP_INIT_TAKE1("PassengerStickySessionsCookieName",
 		(Take1Func) cmd_passenger_sticky_sessions_cookie_name,
 		NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -128,6 +128,11 @@ ConfigManifestGenerator::autoGenerated_setGlobalConfigDefaults() {
 		"PassengerSocketBacklog",
 		DEFAULT_SOCKET_BACKLOG);
 
+	addOptionsContainerDynamicDefault(
+		globalConfigContainer,
+		"PassengerSpawnDir",
+		P_STATIC_STRING("Either $TMPDIR or /tmp"));
+
 	addOptionsContainerStaticDefaultInt(
 		globalConfigContainer,
 		"PassengerStatThrottleRate",
@@ -174,6 +179,11 @@ ConfigManifestGenerator::autoGenerated_setAppConfigDefaults() {
 		"PassengerAppType",
 		P_STATIC_STRING("Autodetected"));
 
+	addOptionsContainerStaticDefaultStr(
+		defaultAppConfigContainer,
+		"PassengerDirectInstanceRequestAddress",
+		P_STATIC_STRING("127.0.0.1"));
+
 	addOptionsContainerStaticDefaultInt(
 		defaultAppConfigContainer,
 		"PassengerForceMaxConcurrentRequestsPerProcess",
@@ -300,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);
@@ -832,6 +847,21 @@ cmd_passenger_socket_backlog(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return setIntConfig(cmd, arg, serverConfig.socketBacklog, 0);
 }
 
+static const char *
+cmd_passenger_spawn_dir(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+	if (err != NULL) {
+		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
+			"WARNING: %s", err);
+	}
+
+	serverConfig.spawnDirSourceFile = cmd->directive->filename;
+	serverConfig.spawnDirSourceLine = cmd->directive->line_num;
+	serverConfig.spawnDirExplicitlySet = true;
+	serverConfig.spawnDir = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_start_timeout(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
@@ -888,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;

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);