passenger 6.0.3 → 6.0.7

data/src/agent/Core/Config.h

@@ -116,6 +116,7 @@ using namespace std;
  *   controller_threads                                              unsigned integer   -          default,read_only
  *   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")
@@ -133,6 +134,7 @@ 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)
@@ -162,7 +164,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.3")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.7")
  *   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

data/src/agent/Core/Controller.h

@@ -123,6 +123,7 @@ private:
 	HashedStaticString PASSENGER_SHOW_VERSION_IN_HEADER;
 	HashedStaticString PASSENGER_STICKY_SESSIONS;
 	HashedStaticString PASSENGER_STICKY_SESSIONS_COOKIE_NAME;
+	HashedStaticString PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES;
 	HashedStaticString PASSENGER_REQUEST_OOB_WORK;
 	HashedStaticString REMOTE_ADDR;
 	HashedStaticString REMOTE_PORT;

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

@@ -87,6 +87,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   client_freelist_limit                               unsigned integer   -          default(0)
  *   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")
@@ -104,6 +105,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   default_server_port                                 unsigned integer   required   -
  *   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")
  *   graceful_exit                                       boolean            -          default(true)
@@ -113,7 +115,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.3")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.7")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -154,12 +156,14 @@ private:
 		add("default_server_port", UINT_TYPE, REQUIRED);
 		add("default_sticky_sessions", BOOL_TYPE, OPTIONAL, false);
 		add("default_sticky_sessions_cookie_name", STRING_TYPE, OPTIONAL, DEFAULT_STICKY_SESSIONS_COOKIE_NAME);
+		add("default_sticky_sessions_cookie_attributes", STRING_TYPE, OPTIONAL, DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES);
 		add("server_software", STRING_TYPE, OPTIONAL, SERVER_TOKEN_NAME "/" PASSENGER_VERSION);
 		add("vary_turbocache_by_cookie", STRING_TYPE, OPTIONAL);
 
 		add("default_friendly_error_pages", STRING_TYPE, OPTIONAL, "auto");
 		add("default_environment", STRING_TYPE, OPTIONAL, DEFAULT_APP_ENV);
 		add("default_spawn_method", STRING_TYPE, OPTIONAL, DEFAULT_SPAWN_METHOD);
+		add("default_bind_address", STRING_TYPE, OPTIONAL, DEFAULT_BIND_ADDRESS);
 		add("default_load_shell_envvars", BOOL_TYPE, OPTIONAL, false);
 		add("default_meteor_app_settings", STRING_TYPE, OPTIONAL);
 		add("default_app_file_descriptor_ulimit", UINT_TYPE, OPTIONAL);
@@ -419,11 +423,13 @@ public:
 	StaticString defaultServerPort;
 	StaticString serverSoftware;
 	StaticString defaultStickySessionsCookieName;
+	StaticString defaultStickySessionsCookieAttributes;
 	StaticString defaultVaryTurbocacheByCookie;
 
 	StaticString defaultFriendlyErrorPages;
 	StaticString defaultEnvironment;
 	StaticString defaultSpawnMethod;
+	StaticString defaultBindAddress;
 	StaticString defaultMeteorAppSettings;
 	unsigned int defaultAppFileDescriptorUlimit;
 	unsigned int defaultMinInstances;
@@ -451,11 +457,13 @@ public:
 		  defaultServerPort(psg_pstrdup(pool, config["default_server_port"].asString())),
 		  serverSoftware(psg_pstrdup(pool, config["server_software"].asString())),
 		  defaultStickySessionsCookieName(psg_pstrdup(pool, config["default_sticky_sessions_cookie_name"].asString())),
+		  defaultStickySessionsCookieAttributes(psg_pstrdup(pool, config["default_sticky_sessions_cookie_attributes"].asString())),
 		  defaultVaryTurbocacheByCookie(psg_pstrdup(pool, config["vary_turbocache_by_cookie"].asString())),
 
 		  defaultFriendlyErrorPages(psg_pstrdup(pool, config["default_friendly_error_pages"].asString())),
 		  defaultEnvironment(psg_pstrdup(pool, config["default_environment"].asString())),
 		  defaultSpawnMethod(psg_pstrdup(pool, config["default_spawn_method"].asString())),
+		  defaultBindAddress(psg_pstrdup(pool, config["default_bind_address"].asString())),
 		  defaultMeteorAppSettings(psg_pstrdup(pool, config["default_meteor_app_settings"].asString())),
 		  defaultAppFileDescriptorUlimit(config["default_app_file_descriptor_ulimit"].asUInt()),
 		  defaultMinInstances(config["default_min_instances"].asUInt()),

data/src/agent/Core/Controller/ForwardResponse.cpp

@@ -768,6 +768,19 @@ Controller::constructHeaderBuffersForResponse(Request *req, struct iovec *buffer
 		dataSize += baseURI.size();
 		INC_BUFFER_ITER(i);
 
+
+		StaticString stickyAttributes = req->options.stickySessionsCookieAttributes;
+		if (stickyAttributes.size() > 0) {
+			PUSH_STATIC_BUFFER("; ");
+			if (buffers != NULL) {
+				BEGIN_PUSH_NEXT_BUFFER();
+				buffers[i].iov_base = (void *) stickyAttributes.data();
+				buffers[i].iov_len  = stickyAttributes.size();
+			}
+			dataSize += stickyAttributes.size();
+			INC_BUFFER_ITER(i);
+		}
+
 		PUSH_STATIC_BUFFER("\r\n");
 	}
 

data/src/agent/Core/Controller/InitRequest.cpp

@@ -153,6 +153,7 @@ Controller::initializePoolOptions(Client *client, Request *req, RequestAnalysis
 
 			if (options != NULL) {
 				req->options = **options;
+				fillPoolOption(req, req->options.baseURI, "!~SCRIPT_NAME");
 			} else {
 				createNewPoolOptions(client, req, hAppGroupName);
 			}
@@ -199,9 +200,11 @@ Controller::fillPoolOptionsFromConfigCaches(Options &options,
 	options.forceMaxConcurrentRequestsPerProcess = requestConfig->defaultForceMaxConcurrentRequestsPerProcess;
 	options.environment = requestConfig->defaultEnvironment;
 	options.spawnMethod = requestConfig->defaultSpawnMethod;
+	options.bindAddress = requestConfig->defaultBindAddress;
 	options.loadShellEnvvars = requestConfig->defaultLoadShellEnvvars;
 	options.statThrottleRate = mainConfig.statThrottleRate;
 	options.maxRequests = requestConfig->defaultMaxRequests;
+	options.stickySessionsCookieAttributes = requestConfig->defaultStickySessionsCookieAttributes;
 
 	/******************************/
 }
@@ -365,6 +368,7 @@ Controller::createNewPoolOptions(Client *client, Request *req,
 	fillPoolOption(req, options.group, "!~PASSENGER_GROUP");
 	fillPoolOption(req, options.minProcesses, "!~PASSENGER_MIN_PROCESSES");
 	fillPoolOption(req, options.spawnMethod, "!~PASSENGER_SPAWN_METHOD");
+	fillPoolOption(req, options.bindAddress, "!~PASSENGER_DIRECT_INSTANCE_REQUEST_ADDRESS");
 	fillPoolOption(req, options.appStartCommand, "!~PASSENGER_APP_START_COMMAND");
 	fillPoolOptionSecToMsec(req, options.startTimeout, "!~PASSENGER_START_TIMEOUT");
 	fillPoolOption(req, options.maxPreloaderIdleTime, "!~PASSENGER_MAX_PRELOADER_IDLE_TIME");
@@ -377,6 +381,7 @@ Controller::createNewPoolOptions(Client *client, Request *req,
 	fillPoolOption(req, options.fileDescriptorUlimit, "!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT");
 	fillPoolOption(req, options.raiseInternalError, "!~PASSENGER_RAISE_INTERNAL_ERROR");
 	fillPoolOption(req, options.lveMinUid, "!~PASSENGER_LVE_MIN_UID");
+	fillPoolOption(req, options.stickySessionsCookieAttributes, "!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES");
 
 	// maxProcesses is configured per-application by the (Enterprise) maxInstances option (and thus passed
 	// via request headers). In OSS the max processes can also be configured, but on a global level

data/src/agent/Core/Controller/InitializationAndShutdown.cpp

@@ -70,6 +70,7 @@ Controller::preinitialize() {
 	PASSENGER_SHOW_VERSION_IN_HEADER = "!~PASSENGER_SHOW_VERSION_IN_HEADER";
 	PASSENGER_STICKY_SESSIONS = "!~PASSENGER_STICKY_SESSIONS";
 	PASSENGER_STICKY_SESSIONS_COOKIE_NAME = "!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME";
+	PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES = "!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES";
 	PASSENGER_REQUEST_OOB_WORK = "!~Request-OOB-Work";
 	REMOTE_ADDR = "!~REMOTE_ADDR";
 	REMOTE_PORT = "!~REMOTE_PORT";

data/src/agent/Core/OptionParser.h

@@ -173,6 +173,9 @@ coreUsage() {
 	printf("      --sticky-sessions-cookie-name NAME\n");
 	printf("                            Cookie name to use for sticky sessions.\n");
 	printf("                            Default: " DEFAULT_STICKY_SESSIONS_COOKIE_NAME "\n");
+	printf("      --sticky-sessions-cookie-attributes 'NAME1=VALUE1; NAME2'\n");
+	printf("                            The attributes to use for the sticky session cookie.\n");
+	printf("                            Default: " DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES "\n");
 	printf("      --vary-turbocache-by-cookie NAME\n");
 	printf("                            Vary the turbocache by the cookie of the given name\n");
 	printf("      --disable-turbocaching\n");

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

@@ -251,6 +251,17 @@ public:
 	 */
 	StaticString spawnMethod;
 
+	/**
+	 * The address that Passenger binds to in order to allow sending HTTP
+	 * requests to individual application processes.
+	 *
+	 * @hinted_parseable
+	 * @require_non_empty
+	 * @pass_during_handshake
+	 * @non_confidential
+	 */
+	StaticString bindAddress;
+
 	/**
 	 * The base URI on which the app runs. If the app is running on the
 	 * root URI, then this value must be "/".

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/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,6 +121,7 @@ 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)
@@ -151,7 +153,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.3")
+ *   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

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

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

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