passenger 6.0.6 → 6.0.22

data/src/helper-scripts/wsgi-loader.py

@@ -23,8 +23,12 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-import sys, os, re, imp, threading, signal, traceback, socket, select, struct, logging, errno
+import sys, os, threading, signal, traceback, socket, select, struct, logging, errno
 import tempfile, json, time
+if sys.version_info[0] >= 3 and sys.version_info[1] >= 5:
+	from importlib import util
+else:
+	import imp
 
 options = {}
 
@@ -37,7 +41,7 @@ def try_write_file(path, contents):
 		with open(path, 'w') as f:
 			f.write(contents)
 	except IOError as e:
-		logging.warn('Warning: unable to write to ' + path + ': ' + e.message)
+		logging.warn('Warning: unable to write to ' + path + ': ' + e.strerror)
 
 def initialize_logging():
 	logging.basicConfig(
@@ -50,18 +54,21 @@ def read_startup_arguments():
 	global options
 
 	work_dir = os.getenv('PASSENGER_SPAWN_WORK_DIR')
+	assert work_dir is not None
 	path = work_dir + '/args.json'
 	with open(path, 'r') as f:
 		options = json.load(f)
 
 def record_journey_step_begin(step, state):
 	work_dir = os.getenv('PASSENGER_SPAWN_WORK_DIR')
+	assert work_dir is not None
 	step_dir = work_dir + '/response/steps/' + step.lower()
 	try_write_file(step_dir + '/state', state)
 	try_write_file(step_dir + '/begin_time', str(time.time()))
 
 def record_journey_step_end(step, state):
 	work_dir = os.getenv('PASSENGER_SPAWN_WORK_DIR')
+	assert work_dir is not None
 	step_dir = work_dir + '/response/steps/' + step.lower()
 	try_write_file(step_dir + '/state', state)
 	if not os.path.exists(step_dir + '/begin_time') and not os.path.exists(step_dir + '/begin_time_monotonic'):
@@ -73,7 +80,15 @@ def load_app():
 
 	sys.path.insert(0, os.getcwd())
 	startup_file = options.get('startup_file', 'passenger_wsgi.py')
-	return imp.load_source('passenger_wsgi', startup_file)
+	if sys.version_info[0] >= 3 and sys.version_info[1] >= 5:
+		spec = util.spec_from_file_location("passenger_wsgi", startup_file)
+		assert spec is not None
+		app_module = util.module_from_spec(spec)
+		assert spec.loader is not None
+		spec.loader.exec_module(app_module)
+		return app_module
+	else:
+		return imp.load_source('passenger_wsgi', startup_file)
 
 def create_server_socket():
 	global options
@@ -88,13 +103,8 @@ def create_server_socket():
 
 	i = 0
 	while i < 128:
-		s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-		socket_suffix = format(struct.unpack('Q', os.urandom(8))[0], 'x')
-		filename = socket_dir + '/' + socket_prefix + '.' + socket_suffix
-		filename = filename[0:UNIX_PATH_MAX]
 		try:
-			s.bind(filename)
-			break
+			return make_socket(socket_dir, socket_prefix, UNIX_PATH_MAX)
 		except socket.error as e:
 			if e.errno == errno.EADDRINUSE:
 				i += 1
@@ -103,6 +113,12 @@ def create_server_socket():
 			else:
 				raise e
 
+def make_socket(socket_dir, socket_prefix, UNIX_PATH_MAX):
+	s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+	socket_suffix = format(struct.unpack('Q', os.urandom(8))[0], 'x')
+	filename = socket_dir + '/' + socket_prefix + '.' + socket_suffix
+	filename = filename[0:UNIX_PATH_MAX]
+	s.bind(filename)
 	s.listen(1000)
 	return (filename, s)
 
@@ -130,6 +146,7 @@ def install_signal_handlers():
 
 def advertise_sockets(socket_filename):
 	work_dir = os.getenv('PASSENGER_SPAWN_WORK_DIR')
+	assert work_dir is not None
 	path = work_dir + '/response/properties.json'
 	doc = {
 		'sockets': [
@@ -147,6 +164,7 @@ def advertise_sockets(socket_filename):
 
 def advertise_readiness():
 	work_dir = os.getenv('PASSENGER_SPAWN_WORK_DIR')
+	assert work_dir is not None
 	path = work_dir + '/response/finish'
 	with open(path, 'w') as f:
 		f.write('1')
@@ -173,7 +191,6 @@ else:
 	def str_to_bytes(s):
 		return s
 
-
 class RequestHandler:
 	def __init__(self, server_socket, owner_pipe, app):
 		self.server = server_socket
@@ -194,13 +211,12 @@ class RequestHandler:
 						env, input_stream = self.parse_request(client)
 						if env:
 							if env['REQUEST_METHOD'] == 'ping':
-								self.process_ping(env, input_stream, client)
+								self.process_ping(client)
 							else:
 								socket_hijacked = self.process_request(env, input_stream, client)
 					except KeyboardInterrupt:
 						done = True
-					except IOError:
-						e = sys.exc_info()[1]
+					except IOError as e:
 						if not getattr(e, 'passenger', False) or e.errno != errno.EPIPE:
 							logging.exception("WSGI application raised an I/O exception!")
 					except Exception:
@@ -298,10 +314,9 @@ class RequestHandler:
 					output_stream.sendall(b'\r\n')
 				if not is_head:
 					output_stream.sendall(str_to_bytes(data))
-			except IOError:
+			except IOError as e:
 				# Mark this exception as coming from the Phusion Passenger
 				# socket and not some other socket.
-				e = sys.exc_info()[1]
 				setattr(e, 'passenger', True)
 				raise e
 
@@ -347,7 +362,7 @@ class RequestHandler:
 				result.close()
 		return False
 
-	def process_ping(self, env, input_stream, output_stream):
+	def process_ping(self, output_stream):
 		output_stream.sendall(b"pong")
 
 
@@ -376,7 +391,9 @@ if __name__ == "__main__":
 
 	record_journey_step_begin('SUBPROCESS_LISTEN', 'STEP_IN_PROGRESS')
 	try:
-		socket_filename, server_socket = create_server_socket()
+		tuple = create_server_socket()
+		assert tuple is not None
+		socket_filename, server_socket = tuple
 		install_signal_handlers()
 		handler = RequestHandler(server_socket, sys.stdin, app_module.application)
 		advertise_sockets(socket_filename)

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,
@@ -454,6 +462,14 @@
     offsetof(passenger_loc_conf_t, autogenerated.load_shell_envvars),
     NULL
 },
+{
+    ngx_string("passenger_preload_bundler"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+    passenger_conf_set_preload_bundler,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, autogenerated.preload_bundler),
+    NULL
+},
 {
     ngx_string("passenger_max_request_queue_size"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
@@ -662,6 +678,14 @@
     offsetof(passenger_loc_conf_t, autogenerated.request_queue_overflow_status_code),
     NULL
 },
+{
+    ngx_string("passenger_spawn_exception_status_code"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_spawn_exception_status_code,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, autogenerated.spawn_exception_status_code),
+    NULL
+},
 {
     ngx_string("passenger_buffer_upload"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,

data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c

@@ -280,12 +280,25 @@ 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",
         sizeof("passenger_load_shell_envvars") - 1,
         1);
 
+    add_manifest_options_container_static_default_bool(ctx,
+        options_container,
+        "passenger_preload_bundler",
+        sizeof("passenger_preload_bundler") - 1,
+        0);
+
     add_manifest_options_container_static_default_uint(ctx,
         options_container,
         "passenger_max_request_queue_size",
@@ -411,6 +424,12 @@ set_manifest_autogenerated_loc_conf_defaults(manifest_gen_ctx_t *ctx, PsgJsonVal
         sizeof("passenger_request_queue_overflow_status_code") - 1,
         503);
 
+    add_manifest_options_container_static_default_int(ctx,
+        options_container,
+        "passenger_spawn_exception_status_code",
+        sizeof("passenger_spawn_exception_status_code") - 1,
+        500);
+
     add_manifest_options_container_static_default_bool(ctx,
         options_container,
         "passenger_buffer_upload",

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;
@@ -697,6 +709,18 @@ passenger_conf_set_load_shell_envvars(ngx_conf_t *cf, ngx_command_t *cmd, void *
     return ngx_conf_set_flag_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_preload_bundler(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.preload_bundler_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.preload_bundler_source_file,
+        &passenger_conf->autogenerated.preload_bundler_source_line);
+
+    return ngx_conf_set_flag_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_max_request_queue_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
@@ -925,6 +949,18 @@ passenger_conf_set_request_queue_overflow_status_code(ngx_conf_t *cf, ngx_comman
     return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_spawn_exception_status_code(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.spawn_exception_status_code_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.spawn_exception_status_code_source_file,
+        &passenger_conf->autogenerated.spawn_exception_status_code_source_line);
+
+    return ngx_conf_set_num_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_buffer_upload(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;

data/src/nginx_module/ConfigGeneral/ManifestGeneration.c

@@ -248,7 +248,7 @@ find_manifest_loc_config_container(manifest_gen_ctx_t *ctx,
         json_location_matcher_type.data = (u_char *) psg_json_value_get_str(
             psg_json_value_get(location_matcher_doc, "type", -1),
             &json_location_matcher_type.len);
-        #if (NGX_PCRE)
+        #if (NGX_PCRE) || (NGX_PCRE2)
             if (clcf->regex != NULL) {
                 if (json_location_matcher_type.len != sizeof("regex") - 1
                     || ngx_memcmp(json_location_matcher_type.data, "regex", sizeof("regex") - 1) != 0)
@@ -319,7 +319,7 @@ create_manifest_loc_config_container(manifest_gen_ctx_t *ctx,
 
     psg_json_value_set_str(location_matcher_doc, "value",
         (const char *) clcf->name.data, clcf->name.len);
-    #if (NGX_PCRE)
+    #if (NGX_PCRE) || (NGX_PCRE2)
         if (clcf->regex != NULL) {
             psg_json_value_set_str(location_matcher_doc, "type",
                 "regex", -1);

data/src/nginx_module/Configuration.c

@@ -61,8 +61,8 @@ static ngx_str_t headers_to_hide[] = {
 
 passenger_main_conf_t passenger_main_conf;
 
-static ngx_path_init_t  ngx_http_proxy_temp_path = {
-    ngx_string(NGX_HTTP_PROXY_TEMP_PATH), { 1, 2, 0 }
+static ngx_path_init_t  ngx_http_passenger_temp_path = {
+    ngx_string(NGX_HTTP_PASSENGER_TEMP_PATH), { 1, 2, 0 }
 };
 
 
@@ -580,7 +580,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     if (ngx_conf_merge_path_value(cf,
                               &conf->upstream_config.temp_path,
                               prev->upstream_config.temp_path,
-                              &ngx_http_proxy_temp_path)
+                              &ngx_http_passenger_temp_path)
         != NGX_OK)
     {
         return NGX_CONF_ERROR;
@@ -1095,7 +1095,7 @@ static char *
 passenger_enterprise_only(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     return ": this feature is only available in Phusion Passenger Enterprise. "
         "You are currently running the open source Phusion Passenger. "
-        "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 ;";
 }
 #endif
 

data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c

@@ -69,7 +69,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->env_vars = NULL;
     conf->spawn_method.data = NULL;
     conf->spawn_method.len  = 0;
+    conf->direct_instance_request_address.data = NULL;
+    conf->direct_instance_request_address.len  = 0;
     conf->load_shell_envvars = NGX_CONF_UNSET;
+    conf->preload_bundler = NGX_CONF_UNSET;
     conf->max_request_queue_size = NGX_CONF_UNSET_UINT;
     conf->app_type.data = NULL;
     conf->app_type.len  = 0;
@@ -89,6 +92,7 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->headers_hash_max_size = NGX_CONF_UNSET_UINT;
     conf->headers_hash_bucket_size = NGX_CONF_UNSET_UINT;
     conf->request_queue_overflow_status_code = NGX_CONF_UNSET;
+    conf->spawn_exception_status_code = NGX_CONF_UNSET;
     conf->buffer_upload = NGX_CONF_UNSET;
     conf->sticky_sessions = NGX_CONF_UNSET;
     conf->sticky_sessions_cookie_name.data = NULL;
@@ -172,10 +176,18 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->spawn_method_source_file.len = 0;
     conf->spawn_method_source_line = 0;
     conf->spawn_method_explicitly_set = 0;
+    conf->direct_instance_request_address_source_file.data = NULL;
+    conf->direct_instance_request_address_source_file.len = 0;
+    conf->direct_instance_request_address_source_line = 0;
+    conf->direct_instance_request_address_explicitly_set = 0;
     conf->load_shell_envvars_source_file.data = NULL;
     conf->load_shell_envvars_source_file.len = 0;
     conf->load_shell_envvars_source_line = 0;
     conf->load_shell_envvars_explicitly_set = 0;
+    conf->preload_bundler_source_file.data = NULL;
+    conf->preload_bundler_source_file.len = 0;
+    conf->preload_bundler_source_line = 0;
+    conf->preload_bundler_explicitly_set = 0;
     conf->max_request_queue_size_source_file.data = NULL;
     conf->max_request_queue_size_source_file.len = 0;
     conf->max_request_queue_size_source_line = 0;
@@ -280,6 +292,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->request_queue_overflow_status_code_source_file.len = 0;
     conf->request_queue_overflow_status_code_source_line = 0;
     conf->request_queue_overflow_status_code_explicitly_set = 0;
+    conf->spawn_exception_status_code_source_file.data = NULL;
+    conf->spawn_exception_status_code_source_file.len = 0;
+    conf->spawn_exception_status_code_source_line = 0;
+    conf->spawn_exception_status_code_explicitly_set = 0;
     conf->buffer_upload_source_file.data = NULL;
     conf->buffer_upload_source_file.len = 0;
     conf->buffer_upload_source_line = 0;

data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c

@@ -159,6 +159,12 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         len += sizeof("\r\n") - 1;
     }
 
+    if (conf->autogenerated.direct_instance_request_address.data != NULL) {
+        len += sizeof("!~PASSENGER_DIRECT_INSTANCE_REQUEST_ADDRESS: ") - 1;
+        len += conf->autogenerated.direct_instance_request_address.len;
+        len += sizeof("\r\n") - 1;
+    }
+
     if (conf->autogenerated.load_shell_envvars != NGX_CONF_UNSET) {
         len += sizeof("!~PASSENGER_LOAD_SHELL_ENVVARS: ") - 1;
         len += conf->autogenerated.load_shell_envvars
@@ -166,6 +172,13 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
             : sizeof("f\r\n") - 1;
     }
 
+    if (conf->autogenerated.preload_bundler != NGX_CONF_UNSET) {
+        len += sizeof("!~PASSENGER_PRELOAD_BUNDLER: ") - 1;
+        len += conf->autogenerated.preload_bundler
+            ? sizeof("t\r\n") - 1
+            : sizeof("f\r\n") - 1;
+    }
+
     if (conf->autogenerated.max_request_queue_size != NGX_CONF_UNSET_UINT) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
@@ -225,6 +238,16 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         len += sizeof("\r\n") - 1;
     }
 
+    if (conf->autogenerated.spawn_exception_status_code != NGX_CONF_UNSET) {
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%d",
+            conf->autogenerated.spawn_exception_status_code);
+        len += sizeof("!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE: ") - 1;
+        len += end - int_buf;
+        len += sizeof("\r\n") - 1;
+    }
+
     if (conf->autogenerated.sticky_sessions != NGX_CONF_UNSET) {
         len += sizeof("!~PASSENGER_STICKY_SESSIONS: ") - 1;
         len += conf->autogenerated.sticky_sessions
@@ -417,6 +440,15 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
             conf->autogenerated.spawn_method.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
+    if (conf->autogenerated.direct_instance_request_address.data != NULL) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_DIRECT_INSTANCE_REQUEST_ADDRESS: ",
+            sizeof("!~PASSENGER_DIRECT_INSTANCE_REQUEST_ADDRESS: ") - 1);
+        pos = ngx_copy(pos,
+            conf->autogenerated.direct_instance_request_address.data,
+            conf->autogenerated.direct_instance_request_address.len);
+        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+    }
     if (conf->autogenerated.load_shell_envvars != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_LOAD_SHELL_ENVVARS: ",
@@ -428,6 +460,17 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         }
     }
 
+    if (conf->autogenerated.preload_bundler != NGX_CONF_UNSET) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_PRELOAD_BUNDLER: ",
+            sizeof("!~PASSENGER_PRELOAD_BUNDLER: ") - 1);
+        if (conf->autogenerated.preload_bundler) {
+            pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
+        } else {
+            pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
+        }
+    }
+
     if (conf->autogenerated.max_request_queue_size != NGX_CONF_UNSET_UINT) {
         pos = ngx_copy(pos,
             "!~PASSENGER_MAX_REQUEST_QUEUE_SIZE: ",
@@ -501,6 +544,17 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
+    if (conf->autogenerated.spawn_exception_status_code != NGX_CONF_UNSET) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE: ",
+            sizeof("!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE: ") - 1);
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%d",
+            conf->autogenerated.spawn_exception_status_code);
+        pos = ngx_copy(pos, int_buf, end - int_buf);
+        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+    }
     if (conf->autogenerated.sticky_sessions != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_STICKY_SESSIONS: ",

data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c

@@ -291,6 +291,20 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
             (const char *) plcf->autogenerated.spawn_method.data,
             plcf->autogenerated.spawn_method.len);
     }
+    if (plcf->autogenerated.direct_instance_request_address_explicitly_set) {
+        find_or_create_manifest_app_and_loc_options_containers(ctx,
+            plcf, cscf, clcf, &app_options_container, &loc_options_container);
+        option_container = find_or_create_manifest_option_container(ctx,
+            app_options_container,
+            "passenger_direct_instance_request_address",
+            sizeof("passenger_direct_instance_request_address") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.direct_instance_request_address_source_file,
+            plcf->autogenerated.direct_instance_request_address_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.direct_instance_request_address.data,
+            plcf->autogenerated.direct_instance_request_address.len);
+    }
     if (plcf->autogenerated.load_shell_envvars_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -304,6 +318,19 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         psg_json_value_set_bool(hierarchy_member, "value",
             plcf->autogenerated.load_shell_envvars);
     }
+    if (plcf->autogenerated.preload_bundler_explicitly_set) {
+        find_or_create_manifest_app_and_loc_options_containers(ctx,
+            plcf, cscf, clcf, &app_options_container, &loc_options_container);
+        option_container = find_or_create_manifest_option_container(ctx,
+            app_options_container,
+            "passenger_preload_bundler",
+            sizeof("passenger_preload_bundler") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.preload_bundler_source_file,
+            plcf->autogenerated.preload_bundler_source_line);
+        psg_json_value_set_bool(hierarchy_member, "value",
+            plcf->autogenerated.preload_bundler);
+    }
     if (plcf->autogenerated.max_request_queue_size_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -582,6 +609,19 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         psg_json_value_set_int(hierarchy_member, "value",
             plcf->autogenerated.request_queue_overflow_status_code);
     }
+    if (plcf->autogenerated.spawn_exception_status_code_explicitly_set) {
+        find_or_create_manifest_app_and_loc_options_containers(ctx,
+            plcf, cscf, clcf, &app_options_container, &loc_options_container);
+        option_container = find_or_create_manifest_option_container(ctx,
+            loc_options_container,
+            "passenger_spawn_exception_status_code",
+            sizeof("passenger_spawn_exception_status_code") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.spawn_exception_status_code_source_file,
+            plcf->autogenerated.spawn_exception_status_code_source_line);
+        psg_json_value_set_int(hierarchy_member, "value",
+            plcf->autogenerated.spawn_exception_status_code);
+    }
     if (plcf->autogenerated.buffer_upload_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);

data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c

@@ -101,9 +101,15 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_str_value(conf->spawn_method,
         prev->spawn_method,
         NULL);
+    ngx_conf_merge_str_value(conf->direct_instance_request_address,
+        prev->direct_instance_request_address,
+        "127.0.0.1");
     ngx_conf_merge_value(conf->load_shell_envvars,
         prev->load_shell_envvars,
         1);
+    ngx_conf_merge_value(conf->preload_bundler,
+        prev->preload_bundler,
+        0);
     ngx_conf_merge_uint_value(conf->max_request_queue_size,
         prev->max_request_queue_size,
         100);
@@ -148,6 +154,9 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_value(conf->request_queue_overflow_status_code,
         prev->request_queue_overflow_status_code,
         503);
+    ngx_conf_merge_value(conf->spawn_exception_status_code,
+        prev->spawn_exception_status_code,
+        500);
     ngx_conf_merge_value(conf->buffer_upload,
         prev->buffer_upload,
         0);

data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h

@@ -56,7 +56,9 @@ typedef struct {
     ngx_uint_t max_requests;
     ngx_uint_t min_instances;
     ngx_array_t *monitor_log_file;
+    ngx_flag_t preload_bundler;
     ngx_int_t request_queue_overflow_status_code;
+    ngx_int_t spawn_exception_status_code;
     ngx_uint_t start_timeout;
     ngx_flag_t sticky_sessions;
     ngx_str_t app_group_name;
@@ -65,6 +67,7 @@ typedef struct {
     ngx_str_t app_root;
     ngx_str_t app_start_command;
     ngx_str_t app_type;
+    ngx_str_t direct_instance_request_address;
     ngx_str_t document_root;
     ngx_str_t environment;
     ngx_str_t group;
@@ -90,6 +93,7 @@ typedef struct {
     ngx_str_t base_uris_source_file;
     ngx_str_t buffer_upload_source_file;
     ngx_str_t debugger_source_file;
+    ngx_str_t direct_instance_request_address_source_file;
     ngx_str_t document_root_source_file;
     ngx_str_t enabled_source_file;
     ngx_str_t env_vars_source_file;
@@ -108,10 +112,12 @@ typedef struct {
     ngx_str_t min_instances_source_file;
     ngx_str_t monitor_log_file_source_file;
     ngx_str_t nodejs_source_file;
+    ngx_str_t preload_bundler_source_file;
     ngx_str_t python_source_file;
     ngx_str_t request_queue_overflow_status_code_source_file;
     ngx_str_t restart_dir_source_file;
     ngx_str_t ruby_source_file;
+    ngx_str_t spawn_exception_status_code_source_file;
     ngx_str_t spawn_method_source_file;
     ngx_str_t start_timeout_source_file;
     ngx_str_t startup_file_source_file;
@@ -142,6 +148,7 @@ typedef struct {
     ngx_uint_t base_uris_source_line;
     ngx_uint_t buffer_upload_source_line;
     ngx_uint_t debugger_source_line;
+    ngx_uint_t direct_instance_request_address_source_line;
     ngx_uint_t document_root_source_line;
     ngx_uint_t enabled_source_line;
     ngx_uint_t env_vars_source_line;
@@ -160,10 +167,12 @@ typedef struct {
     ngx_uint_t min_instances_source_line;
     ngx_uint_t monitor_log_file_source_line;
     ngx_uint_t nodejs_source_line;
+    ngx_uint_t preload_bundler_source_line;
     ngx_uint_t python_source_line;
     ngx_uint_t request_queue_overflow_status_code_source_line;
     ngx_uint_t restart_dir_source_line;
     ngx_uint_t ruby_source_line;
+    ngx_uint_t spawn_exception_status_code_source_line;
     ngx_uint_t spawn_method_source_line;
     ngx_uint_t start_timeout_source_line;
     ngx_uint_t startup_file_source_line;
@@ -194,6 +203,7 @@ typedef struct {
     ngx_int_t base_uris_explicitly_set;
     ngx_int_t buffer_upload_explicitly_set;
     ngx_int_t debugger_explicitly_set;
+    ngx_int_t direct_instance_request_address_explicitly_set;
     ngx_int_t document_root_explicitly_set;
     ngx_int_t enabled_explicitly_set;
     ngx_int_t env_vars_explicitly_set;
@@ -212,10 +222,12 @@ typedef struct {
     ngx_int_t min_instances_explicitly_set;
     ngx_int_t monitor_log_file_explicitly_set;
     ngx_int_t nodejs_explicitly_set;
+    ngx_int_t preload_bundler_explicitly_set;
     ngx_int_t python_explicitly_set;
     ngx_int_t request_queue_overflow_status_code_explicitly_set;
     ngx_int_t restart_dir_explicitly_set;
     ngx_int_t ruby_explicitly_set;
+    ngx_int_t spawn_exception_status_code_explicitly_set;
     ngx_int_t spawn_method_explicitly_set;
     ngx_int_t start_timeout_explicitly_set;
     ngx_int_t startup_file_explicitly_set;

data/src/nginx_module/config

@@ -123,6 +123,8 @@ nginx_micro_version=`echo "$nginx_version" | cut -d . -f 3`
 have=PASSENGER_NGINX_MICRO_VERSION value="$nginx_micro_version"
 . auto/define
 
+have=NGX_HTTP_PASSENGER_TEMP_PATH value="\"passenger_temp\""
+. auto/define
 
 ngx_addon_name=ngx_http_passenger_module