passenger 6.0.3 → 6.0.7

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

@@ -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.
 	 */
@@ -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/Hooks.cpp

@@ -1020,6 +1020,10 @@ private:
 			env = (apr_table_entry_t*) env_arr->elts;
 
 			for (i = 0; i < env_arr->nelts; ++i) {
+				if ((strcmp(env[i].key, "SCRIPT_NAME") == 0)
+				 || (strcmp(env[i].key, "PATH_INFO")   == 0)) {
+					continue;
+				}
 				envvarsData.append(env[i].key);
 				envvarsData.append("\0", 1);
 				if (env[i].val != NULL) {

data/src/cxx_supportlib/Constants.h

@@ -48,6 +48,7 @@
 #define DEFAULT_APP_OUTPUT_LOG_LEVEL 3
 #define DEFAULT_APP_OUTPUT_LOG_LEVEL_NAME "notice"
 #define DEFAULT_APP_THREAD_COUNT 1
+#define DEFAULT_BIND_ADDRESS "127.0.0.1"
 #define DEFAULT_CONCURRENCY_MODEL "process"
 #define DEFAULT_FILE_BUFFERED_CHANNEL_THRESHOLD 131072
 #define DEFAULT_HTTP_SERVER_LISTEN_ADDRESS "tcp://127.0.0.1:3000"
@@ -68,9 +69,10 @@
 #define DEFAULT_SPAWN_METHOD "smart"
 #define DEFAULT_START_TIMEOUT 90000
 #define DEFAULT_STAT_THROTTLE_RATE 10
+#define DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES "SameSite=Lax; Secure;"
 #define DEFAULT_STICKY_SESSIONS_COOKIE_NAME "_passenger_route"
 #define DEFAULT_WEB_APP_USER "nobody"
-#define ENTERPRISE_URL "https://www.phusionpassenger.com/enterprise"
+#define ENTERPRISE_URL "https://www.phusionpassenger.com/features#premium-features"
 #define FEEDBACK_FD 3
 #define FLYING_PASSENGER_NAME "Flying Passenger"
 #define GLOBAL_NAMESPACE_DIRNAME "passenger"
@@ -81,7 +83,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.3"
+#define PASSENGER_VERSION "6.0.7"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/Hooks.h

@@ -80,6 +80,7 @@ namespace {
 				key.append(1, toupper(*data));
 				data++;
 			}
+			if (key == "PASSENGER_CONFIG_MANIFEST") continue;
 			switch (it->type()) {
 			case Json::nullValue:
 			case Json::stringValue:

data/src/cxx_supportlib/oxt/system_calls.cpp

@@ -132,15 +132,15 @@ shouldSimulateFailure() {
 			_my_errno = errno; \
 		} while ((error_expression) \
 			&& _my_errno == EINTR \
-			&& (!this_thread::syscalls_interruptable() \
-			    || !(_intr_requested = this_thread::interruption_requested())) \
+			&& (!boost::this_thread::syscalls_interruptable() \
+			    || !(_intr_requested = boost::this_thread::interruption_requested())) \
 		); \
 		if (OXT_LIKELY(ctx != NULL)) { \
 			ctx->syscall_interruption_lock.lock(); \
 		} \
 		if ((error_expression) \
 		 && _my_errno == EINTR \
-		 && this_thread::syscalls_interruptable() \
+		 && boost::this_thread::syscalls_interruptable() \
 		 && _intr_requested) { \
 			throw thread_interrupted(); \
 		} \
@@ -284,8 +284,8 @@ syscalls::close(int fd) {
 		}
 		if (ret == -1
 		 && errno == EINTR
-		 && this_thread::syscalls_interruptable()
-		 && this_thread::interruption_requested()) {
+		 && boost::this_thread::syscalls_interruptable()
+		 && boost::this_thread::interruption_requested()) {
 			throw thread_interrupted();
 		} else {
 			return ret;
@@ -662,8 +662,8 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 		}
 	} while (ret == -1
 		&& e == EINTR
-		&& (!this_thread::syscalls_interruptable()
-		    || !(intr_requested = this_thread::interruption_requested()))
+		&& (!boost::this_thread::syscalls_interruptable()
+		    || !(intr_requested = boost::this_thread::interruption_requested()))
 	);
 
 	if (OXT_UNLIKELY(ctx != NULL)) {
@@ -672,7 +672,7 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 
 	if (ret == -1
 	 && e == EINTR
-	 && this_thread::syscalls_interruptable()
+	 && boost::this_thread::syscalls_interruptable()
 	 && intr_requested) {
 		throw thread_interrupted();
 	}
@@ -748,14 +748,14 @@ syscalls::waitpid(pid_t pid, int *status, int options) {
 	 * http://stackoverflow.com/questions/20410943/segmentation-fault-when-accessing-statically-initialized-thread-variable?noredirect=1#comment30483943_20410943
 	 * https://bugzilla.redhat.com/show_bug.cgi?id=731228
 	 */
-	__thread int this_thread::_syscalls_interruptable = 1;
+	__thread int boost::this_thread::_syscalls_interruptable = 1;
 
 	bool
 	boost::this_thread::syscalls_interruptable() {
 		return _syscalls_interruptable;
 	}
 #else
-	boost::thread_specific_ptr<bool> this_thread::_syscalls_interruptable;
+	boost::thread_specific_ptr<bool> boost::this_thread::_syscalls_interruptable;
 
 	bool
 	boost::this_thread::syscalls_interruptable() {

data/src/cxx_supportlib/vendor-modified/modp_b64_data.h

@@ -11,10 +11,6 @@
 	typedef uint32_t modp_uint32_t;
 #endif
 
-#ifndef MODP_B64_DONT_INCLUDE_BOOST_ENDIANNESS_HEADERS
-	#include <boost/detail/endian.hpp>
-#endif
-
 /**
  * you can control if we use padding by commenting out this
  * next line.  However, I highly recommend you use padding and not

data/src/cxx_supportlib/vendor-modified/modp_b64_strict_aliasing.cpp

@@ -26,6 +26,10 @@
 
 #include "modp_b64_data.h"
 
+#ifndef MODP_B64_DONT_INCLUDE_BOOST_ENDIANNESS_HEADERS
+    #include <boost/predef/other/endian.h>
+#endif
+
 /* public header */
 #include "modp_b64.h"
 
@@ -85,7 +89,7 @@ size_t modp_b64_decode(char* dest, const char* src, size_t len)
 	case 0:
 		x = d0[y[3]] | d1[y[2]] | d2[y[1]] | d3[y[0]];
 		if (x >= B64_BADCHAR)  return -1;
-#ifdef BOOST_BIG_ENDIAN
+#ifdef BOOST_ENDIAN_BIG_BYTE
 		*p++ = ((modp_uint8_t*)&x)[1];
 		*p++ = ((modp_uint8_t*)&x)[2];
 		*p   = ((modp_uint8_t*)&x)[3];

data/src/helper-scripts/node-loader.js

@@ -135,7 +135,7 @@ setupEnvironment(options);
 
 function tryWriteFile(path, contents) {
 	try {
-		fs.writeFileSync(path, contents);
+		fs.writeFileSync(path, contents.toString());
 	} catch (e) {
 		console.error('Warning: unable to write to ' + path + ': ' + e.message);
 	}

data/src/helper-scripts/prespawn

@@ -107,6 +107,7 @@ class PrespawnLocation
   def head_request
     socket.write("HEAD #{request_path} HTTP/1.1\r\n")
     socket.write("Host: #{request_host}\r\n")
+    socket.write("User-Agent: Passenger Prespawn Script\r\n")
     socket.write("Authorization: Basic " + base64(@uri.userinfo) + "\r\n") if @uri.userinfo
     socket.write("Connection: close\r\n")
     socket.write("\r\n")

data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c

@@ -446,6 +446,14 @@
     offsetof(passenger_loc_conf_t, autogenerated.spawn_method),
     NULL
 },
+{
+    ngx_string("passenger_direct_instance_request_address"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_direct_instance_request_address,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, autogenerated.direct_instance_request_address),
+    NULL
+},
 {
     ngx_string("passenger_load_shell_envvars"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
@@ -542,6 +550,14 @@
     offsetof(passenger_loc_conf_t, autogenerated.document_root),
     NULL
 },
+{
+    ngx_string("passenger_temp_path"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    ngx_conf_set_path_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, upstream_config.temp_path),
+    NULL
+},
 {
     ngx_string("passenger_ignore_headers"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_1MORE,
@@ -678,6 +694,14 @@
     offsetof(passenger_loc_conf_t, autogenerated.sticky_sessions_cookie_name),
     NULL
 },
+{
+    ngx_string("passenger_sticky_sessions_cookie_attributes"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_sticky_sessions_cookie_attributes,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, autogenerated.sticky_sessions_cookie_attributes),
+    NULL
+},
 {
     ngx_string("passenger_vary_turbocache_by_cookie"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,

data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c

@@ -280,6 +280,13 @@ set_manifest_autogenerated_app_conf_defaults(manifest_gen_ctx_t *ctx, PsgJsonVal
         "'smart' for Ruby apps, 'direct' for all other apps",
         sizeof("'smart' for Ruby apps, 'direct' for all other apps") - 1);
 
+    add_manifest_options_container_static_default_str(ctx,
+        options_container,
+        "passenger_direct_instance_request_address",
+        sizeof("passenger_direct_instance_request_address") - 1,
+        "127.0.0.1",
+        sizeof("127.0.0.1") - 1);
+
     add_manifest_options_container_static_default_bool(ctx,
         options_container,
         "passenger_load_shell_envvars",
@@ -430,5 +437,12 @@ set_manifest_autogenerated_loc_conf_defaults(manifest_gen_ctx_t *ctx, PsgJsonVal
         "_passenger_route",
         sizeof("_passenger_route") - 1);
 
+    add_manifest_options_container_static_default_str(ctx,
+        options_container,
+        "passenger_sticky_sessions_cookie_attributes",
+        sizeof("passenger_sticky_sessions_cookie_attributes") - 1,
+        "SameSite=Lax; Secure;",
+        sizeof("SameSite=Lax; Secure;") - 1);
+
 }
 

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -685,6 +685,18 @@ passenger_conf_set_spawn_method(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_direct_instance_request_address(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.direct_instance_request_address_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.direct_instance_request_address_source_file,
+        &passenger_conf->autogenerated.direct_instance_request_address_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_load_shell_envvars(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
@@ -961,6 +973,18 @@ passenger_conf_set_sticky_sessions_cookie_name(ngx_conf_t *cf, ngx_command_t *cm
     return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_sticky_sessions_cookie_attributes(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.sticky_sessions_cookie_attributes_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.sticky_sessions_cookie_attributes_source_file,
+        &passenger_conf->autogenerated.sticky_sessions_cookie_attributes_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_vary_turbocache_by_cookie(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;