passenger 5.2.3 → 5.3.0

data/src/nginx_module/ConfigGeneral/ManifestGeneration.c

@@ -420,18 +420,18 @@ find_or_create_manifest_app_and_loc_options_containers(manifest_gen_ctx_t *ctx,
         *app_options_container = psg_json_value_get(app_config_container, "options", -1);
         *loc_options_container = psg_json_value_get(app_config_container, "default_location_configuration", -1);
 
-        /* Create a default value for passenger_app_root
-         * if we just created this config container
+        /* Create a default value for passenger_app_group_name and
+         * passenger_app_root if we just created this config container
          */
         if (psg_json_value_size(*app_options_container) == 0) {
-            add_manifest_options_container_static_default_str(ctx,
+            add_manifest_options_container_inferred_default_str(ctx,
                 *app_options_container,
                 "passenger_app_group_name", -1,
                 (const char *) app_group_name.data, app_group_name.len);
 
             default_app_root.data = infer_default_app_root(
                 ctx, clcf, &default_app_root.len);
-            add_manifest_options_container_static_default_str(ctx,
+            add_manifest_options_container_inferred_default_str(ctx,
                 *app_options_container,
                 "passenger_app_root", -1,
                 (const char *) default_app_root.data, default_app_root.len);
@@ -551,8 +551,9 @@ add_manifest_options_container_dynamic_default(manifest_gen_ctx_t *ctx,
 }
 
 static PsgJsonValue *
-add_manifest_options_container_static_default(manifest_gen_ctx_t *ctx,
-    PsgJsonValue *options_container, const char *option_name, size_t option_name_len)
+add_manifest_options_container_default(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *options_container, const char *default_type,
+    const char *option_name, size_t option_name_len)
 {
     PsgJsonValue *option_container, *hierarchy, *hierarchy_member, *source, *result;
 
@@ -563,7 +564,7 @@ add_manifest_options_container_static_default(manifest_gen_ctx_t *ctx,
     hierarchy = psg_json_value_get(option_container, "value_hierarchy", -1);
 
     source = psg_json_value_new_with_type(PSG_JSON_VALUE_TYPE_OBJECT);
-    psg_json_value_set_str(source, "type", "default", -1);
+    psg_json_value_set_str(source, "type", default_type, -1);
 
     hierarchy_member = psg_json_value_new_with_type(PSG_JSON_VALUE_TYPE_OBJECT);
     psg_json_value_set_value(hierarchy_member, "source", -1, source);
@@ -581,8 +582,8 @@ add_manifest_options_container_static_default_str(manifest_gen_ctx_t *ctx,
     PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
     const char *value, size_t value_len)
 {
-    PsgJsonValue *hierarchy_member = add_manifest_options_container_static_default(
-        ctx, options_container, option_name, option_name_len);
+    PsgJsonValue *hierarchy_member = add_manifest_options_container_default(
+        ctx, options_container, "default", option_name, option_name_len);
     psg_json_value_set_str(hierarchy_member, "value", value, value_len);
 }
 
@@ -591,8 +592,8 @@ add_manifest_options_container_static_default_int(manifest_gen_ctx_t *ctx,
     PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
     int value)
 {
-    PsgJsonValue *hierarchy_member = add_manifest_options_container_static_default(
-        ctx, options_container, option_name, option_name_len);
+    PsgJsonValue *hierarchy_member = add_manifest_options_container_default(
+        ctx, options_container, "default", option_name, option_name_len);
     psg_json_value_set_int(hierarchy_member, "value", value);
 }
 
@@ -601,8 +602,8 @@ add_manifest_options_container_static_default_uint(manifest_gen_ctx_t *ctx,
     PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
     unsigned int value)
 {
-    PsgJsonValue *hierarchy_member = add_manifest_options_container_static_default(
-        ctx, options_container, option_name, option_name_len);
+    PsgJsonValue *hierarchy_member = add_manifest_options_container_default(
+        ctx, options_container, "default", option_name, option_name_len);
     psg_json_value_set_uint(hierarchy_member, "value", value);
 }
 
@@ -611,11 +612,21 @@ add_manifest_options_container_static_default_bool(manifest_gen_ctx_t *ctx,
     PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
     int value)
 {
-    PsgJsonValue *hierarchy_member = add_manifest_options_container_static_default(
-        ctx, options_container, option_name, option_name_len);
+    PsgJsonValue *hierarchy_member = add_manifest_options_container_default(
+        ctx, options_container, "default", option_name, option_name_len);
     psg_json_value_set_bool(hierarchy_member, "value", value);
 }
 
+static void
+add_manifest_options_container_inferred_default_str(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
+    const char *value, size_t value_len)
+{
+    PsgJsonValue *hierarchy_member = add_manifest_options_container_default(
+        ctx, options_container, "inferred-default", option_name, option_name_len);
+    psg_json_value_set_str(hierarchy_member, "value", value, value_len);
+}
+
 static void
 manifest_inherit_application_value_hierarchies(manifest_gen_ctx_t *ctx) {
     PsgJsonValue *app_config_container, *options_container, *option_container, *default_app_config;

data/src/nginx_module/ConfigGeneral/ManifestGeneration.h

@@ -88,6 +88,9 @@ static void add_manifest_options_container_static_default_uint(manifest_gen_ctx_
 static void add_manifest_options_container_static_default_bool(manifest_gen_ctx_t *ctx,
     PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
     int value);
+static void add_manifest_options_container_inferred_default_str(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
+    const char *value, size_t value_len);
 
 static void manifest_inherit_application_value_hierarchies(manifest_gen_ctx_t *ctx);
 static void manifest_inherit_location_value_hierarchies(manifest_gen_ctx_t *ctx);

data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c

@@ -41,7 +41,7 @@
 static void
 passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *conf) {
     conf->app_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
-    conf->enabled = NGX_CONF_UNSET;
+    conf->max_instances_per_app = NGX_CONF_UNSET_UINT;
     conf->ruby.data = NULL;
     conf->ruby.len  = 0;
     conf->python.data = NULL;
@@ -54,12 +54,7 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->environment.len  = 0;
     conf->friendly_error_pages = NGX_CONF_UNSET;
     conf->min_instances = NGX_CONF_UNSET_UINT;
-    conf->max_instances_per_app = NGX_CONF_UNSET_UINT;
-    conf->max_requests = NGX_CONF_UNSET_UINT;
-    conf->start_timeout = NGX_CONF_UNSET;
-    conf->base_uris = NGX_CONF_UNSET_PTR;
-    conf->document_root.data = NULL;
-    conf->document_root.len  = 0;
+    conf->start_timeout = NGX_CONF_UNSET_UINT;
     conf->user.data = NULL;
     conf->user.len  = 0;
     conf->group.data = NULL;
@@ -74,35 +69,42 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->debugger = NGX_CONF_UNSET;
     conf->max_preloader_idle_time = NGX_CONF_UNSET;
     conf->env_vars = NULL;
-    conf->headers_hash_max_size = NGX_CONF_UNSET_UINT;
-    conf->headers_hash_bucket_size = NGX_CONF_UNSET_UINT;
     conf->spawn_method.data = NULL;
     conf->spawn_method.len  = 0;
     conf->load_shell_envvars = NGX_CONF_UNSET;
     conf->max_request_queue_size = NGX_CONF_UNSET_UINT;
-    conf->request_queue_overflow_status_code = NGX_CONF_UNSET;
-    conf->restart_dir.data = NULL;
-    conf->restart_dir.len  = 0;
     conf->app_type.data = NULL;
     conf->app_type.len  = 0;
     conf->startup_file.data = NULL;
     conf->startup_file.len  = 0;
+    conf->restart_dir.data = NULL;
+    conf->restart_dir.len  = 0;
+    conf->abort_websockets_on_process_shutdown = NGX_CONF_UNSET;
+    conf->force_max_concurrent_requests_per_process = NGX_CONF_UNSET;
+    conf->enabled = NGX_CONF_UNSET;
+    conf->max_requests = NGX_CONF_UNSET_UINT;
+    conf->base_uris = NGX_CONF_UNSET_PTR;
+    conf->document_root.data = NULL;
+    conf->document_root.len  = 0;
+    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->sticky_sessions = NGX_CONF_UNSET;
     conf->sticky_sessions_cookie_name.data = NULL;
     conf->sticky_sessions_cookie_name.len  = 0;
     conf->vary_turbocache_by_cookie.data = NULL;
     conf->vary_turbocache_by_cookie.len  = 0;
-    conf->abort_websockets_on_process_shutdown = NGX_CONF_UNSET;
-    conf->force_max_concurrent_requests_per_process = NGX_CONF_UNSET;
+    conf->app_log_file.data = NULL;
+    conf->app_log_file.len  = 0;
 
     conf->app_file_descriptor_ulimit_source_file.data = NULL;
     conf->app_file_descriptor_ulimit_source_file.len = 0;
     conf->app_file_descriptor_ulimit_source_line = 0;
     conf->app_file_descriptor_ulimit_explicitly_set = 0;
-    conf->enabled_source_file.data = NULL;
-    conf->enabled_source_file.len = 0;
-    conf->enabled_source_line = 0;
-    conf->enabled_explicitly_set = 0;
+    conf->max_instances_per_app_source_file.data = NULL;
+    conf->max_instances_per_app_source_file.len = 0;
+    conf->max_instances_per_app_source_line = 0;
+    conf->max_instances_per_app_explicitly_set = 0;
     conf->ruby_source_file.data = NULL;
     conf->ruby_source_file.len = 0;
     conf->ruby_source_line = 0;
@@ -131,26 +133,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->min_instances_source_file.len = 0;
     conf->min_instances_source_line = 0;
     conf->min_instances_explicitly_set = 0;
-    conf->max_instances_per_app_source_file.data = NULL;
-    conf->max_instances_per_app_source_file.len = 0;
-    conf->max_instances_per_app_source_line = 0;
-    conf->max_instances_per_app_explicitly_set = 0;
-    conf->max_requests_source_file.data = NULL;
-    conf->max_requests_source_file.len = 0;
-    conf->max_requests_source_line = 0;
-    conf->max_requests_explicitly_set = 0;
     conf->start_timeout_source_file.data = NULL;
     conf->start_timeout_source_file.len = 0;
     conf->start_timeout_source_line = 0;
     conf->start_timeout_explicitly_set = 0;
-    conf->base_uris_source_file.data = NULL;
-    conf->base_uris_source_file.len = 0;
-    conf->base_uris_source_line = 0;
-    conf->base_uris_explicitly_set = 0;
-    conf->document_root_source_file.data = NULL;
-    conf->document_root_source_file.len = 0;
-    conf->document_root_source_line = 0;
-    conf->document_root_explicitly_set = 0;
     conf->user_source_file.data = NULL;
     conf->user_source_file.len = 0;
     conf->user_source_line = 0;
@@ -183,14 +169,62 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->max_preloader_idle_time_source_file.len = 0;
     conf->max_preloader_idle_time_source_line = 0;
     conf->max_preloader_idle_time_explicitly_set = 0;
-    conf->upstream_config_ignore_headers_source_file.data = NULL;
-    conf->upstream_config_ignore_headers_source_file.len = 0;
-    conf->upstream_config_ignore_headers_source_line = 0;
-    conf->upstream_config_ignore_headers_explicitly_set = 0;
     conf->env_vars_source_file.data = NULL;
     conf->env_vars_source_file.len = 0;
     conf->env_vars_source_line = 0;
     conf->env_vars_explicitly_set = 0;
+    conf->spawn_method_source_file.data = NULL;
+    conf->spawn_method_source_file.len = 0;
+    conf->spawn_method_source_line = 0;
+    conf->spawn_method_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->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;
+    conf->max_request_queue_size_explicitly_set = 0;
+    conf->app_type_source_file.data = NULL;
+    conf->app_type_source_file.len = 0;
+    conf->app_type_source_line = 0;
+    conf->app_type_explicitly_set = 0;
+    conf->startup_file_source_file.data = NULL;
+    conf->startup_file_source_file.len = 0;
+    conf->startup_file_source_line = 0;
+    conf->startup_file_explicitly_set = 0;
+    conf->restart_dir_source_file.data = NULL;
+    conf->restart_dir_source_file.len = 0;
+    conf->restart_dir_source_line = 0;
+    conf->restart_dir_explicitly_set = 0;
+    conf->abort_websockets_on_process_shutdown_source_file.data = NULL;
+    conf->abort_websockets_on_process_shutdown_source_file.len = 0;
+    conf->abort_websockets_on_process_shutdown_source_line = 0;
+    conf->abort_websockets_on_process_shutdown_explicitly_set = 0;
+    conf->force_max_concurrent_requests_per_process_source_file.data = NULL;
+    conf->force_max_concurrent_requests_per_process_source_file.len = 0;
+    conf->force_max_concurrent_requests_per_process_source_line = 0;
+    conf->force_max_concurrent_requests_per_process_explicitly_set = 0;
+    conf->enabled_source_file.data = NULL;
+    conf->enabled_source_file.len = 0;
+    conf->enabled_source_line = 0;
+    conf->enabled_explicitly_set = 0;
+    conf->max_requests_source_file.data = NULL;
+    conf->max_requests_source_file.len = 0;
+    conf->max_requests_source_line = 0;
+    conf->max_requests_explicitly_set = 0;
+    conf->base_uris_source_file.data = NULL;
+    conf->base_uris_source_file.len = 0;
+    conf->base_uris_source_line = 0;
+    conf->base_uris_explicitly_set = 0;
+    conf->document_root_source_file.data = NULL;
+    conf->document_root_source_file.len = 0;
+    conf->document_root_source_line = 0;
+    conf->document_root_explicitly_set = 0;
+    conf->upstream_config_ignore_headers_source_file.data = NULL;
+    conf->upstream_config_ignore_headers_source_file.len = 0;
+    conf->upstream_config_ignore_headers_source_line = 0;
+    conf->upstream_config_ignore_headers_explicitly_set = 0;
     conf->headers_source_source_file.data = NULL;
     conf->headers_source_source_file.len = 0;
     conf->headers_source_source_line = 0;
@@ -235,34 +269,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->upstream_config_intercept_errors_source_file.len = 0;
     conf->upstream_config_intercept_errors_source_line = 0;
     conf->upstream_config_intercept_errors_explicitly_set = 0;
-    conf->spawn_method_source_file.data = NULL;
-    conf->spawn_method_source_file.len = 0;
-    conf->spawn_method_source_line = 0;
-    conf->spawn_method_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->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;
-    conf->max_request_queue_size_explicitly_set = 0;
     conf->request_queue_overflow_status_code_source_file.data = NULL;
     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->restart_dir_source_file.data = NULL;
-    conf->restart_dir_source_file.len = 0;
-    conf->restart_dir_source_line = 0;
-    conf->restart_dir_explicitly_set = 0;
-    conf->app_type_source_file.data = NULL;
-    conf->app_type_source_file.len = 0;
-    conf->app_type_source_line = 0;
-    conf->app_type_explicitly_set = 0;
-    conf->startup_file_source_file.data = NULL;
-    conf->startup_file_source_file.len = 0;
-    conf->startup_file_source_line = 0;
-    conf->startup_file_explicitly_set = 0;
     conf->sticky_sessions_source_file.data = NULL;
     conf->sticky_sessions_source_file.len = 0;
     conf->sticky_sessions_source_line = 0;
@@ -275,13 +285,9 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->vary_turbocache_by_cookie_source_file.len = 0;
     conf->vary_turbocache_by_cookie_source_line = 0;
     conf->vary_turbocache_by_cookie_explicitly_set = 0;
-    conf->abort_websockets_on_process_shutdown_source_file.data = NULL;
-    conf->abort_websockets_on_process_shutdown_source_file.len = 0;
-    conf->abort_websockets_on_process_shutdown_source_line = 0;
-    conf->abort_websockets_on_process_shutdown_explicitly_set = 0;
-    conf->force_max_concurrent_requests_per_process_source_file.data = NULL;
-    conf->force_max_concurrent_requests_per_process_source_file.len = 0;
-    conf->force_max_concurrent_requests_per_process_source_line = 0;
-    conf->force_max_concurrent_requests_per_process_explicitly_set = 0;
+    conf->app_log_file_source_file.data = NULL;
+    conf->app_log_file_source_file.len = 0;
+    conf->app_log_file_source_line = 0;
+    conf->app_log_file_explicitly_set = 0;
 }
 

data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c

@@ -59,6 +59,16 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         len += sizeof("\r\n") - 1;
     }
 
+    if (conf->autogenerated.max_instances_per_app != NGX_CONF_UNSET_UINT) {
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%ui",
+            conf->autogenerated.max_instances_per_app);
+        len += sizeof("!~PASSENGER_MAX_PROCESSES: ") - 1;
+        len += end - int_buf;
+        len += sizeof("\r\n") - 1;
+    }
+
     if (conf->autogenerated.ruby.data != NULL) {
         len += sizeof("!~PASSENGER_RUBY: ") - 1;
         len += conf->autogenerated.ruby.len;
@@ -106,30 +116,10 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->autogenerated.max_instances_per_app != NGX_CONF_UNSET_UINT) {
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%ui",
-            conf->autogenerated.max_instances_per_app);
-        len += sizeof("!~PASSENGER_MAX_PROCESSES: ") - 1;
-        len += end - int_buf;
-        len += sizeof("\r\n") - 1;
-    }
-
-    if (conf->autogenerated.max_requests != NGX_CONF_UNSET_UINT) {
+    if (conf->autogenerated.start_timeout != NGX_CONF_UNSET_UINT) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%ui",
-            conf->autogenerated.max_requests);
-        len += sizeof("!~PASSENGER_MAX_REQUESTS: ") - 1;
-        len += end - int_buf;
-        len += sizeof("\r\n") - 1;
-    }
-
-    if (conf->autogenerated.start_timeout != NGX_CONF_UNSET) {
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%d",
             conf->autogenerated.start_timeout);
         len += sizeof("!~PASSENGER_START_TIMEOUT: ") - 1;
         len += end - int_buf;
@@ -206,25 +196,52 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->autogenerated.request_queue_overflow_status_code != NGX_CONF_UNSET) {
+    if (conf->autogenerated.startup_file.data != NULL) {
+        len += sizeof("!~PASSENGER_STARTUP_FILE: ") - 1;
+        len += conf->autogenerated.startup_file.len;
+        len += sizeof("\r\n") - 1;
+    }
+
+    if (conf->autogenerated.restart_dir.data != NULL) {
+        len += sizeof("!~PASSENGER_RESTART_DIR: ") - 1;
+        len += conf->autogenerated.restart_dir.len;
+        len += sizeof("\r\n") - 1;
+    }
+
+    if (conf->autogenerated.abort_websockets_on_process_shutdown != NGX_CONF_UNSET) {
+        len += sizeof("!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ") - 1;
+        len += conf->autogenerated.abort_websockets_on_process_shutdown
+            ? sizeof("t\r\n") - 1
+            : sizeof("f\r\n") - 1;
+    }
+
+    if (conf->autogenerated.force_max_concurrent_requests_per_process != NGX_CONF_UNSET) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
             "%d",
-            conf->autogenerated.request_queue_overflow_status_code);
-        len += sizeof("!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ") - 1;
+            conf->autogenerated.force_max_concurrent_requests_per_process);
+        len += sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ") - 1;
         len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->autogenerated.restart_dir.data != NULL) {
-        len += sizeof("!~PASSENGER_RESTART_DIR: ") - 1;
-        len += conf->autogenerated.restart_dir.len;
+    if (conf->autogenerated.max_requests != NGX_CONF_UNSET_UINT) {
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%ui",
+            conf->autogenerated.max_requests);
+        len += sizeof("!~PASSENGER_MAX_REQUESTS: ") - 1;
+        len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->autogenerated.startup_file.data != NULL) {
-        len += sizeof("!~PASSENGER_STARTUP_FILE: ") - 1;
-        len += conf->autogenerated.startup_file.len;
+    if (conf->autogenerated.request_queue_overflow_status_code != NGX_CONF_UNSET) {
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%d",
+            conf->autogenerated.request_queue_overflow_status_code);
+        len += sizeof("!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ") - 1;
+        len += end - int_buf;
         len += sizeof("\r\n") - 1;
     }
 
@@ -247,20 +264,9 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         len += sizeof("\r\n") - 1;
     }
 
-    if (conf->autogenerated.abort_websockets_on_process_shutdown != NGX_CONF_UNSET) {
-        len += sizeof("!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ") - 1;
-        len += conf->autogenerated.abort_websockets_on_process_shutdown
-            ? sizeof("t\r\n") - 1
-            : sizeof("f\r\n") - 1;
-    }
-
-    if (conf->autogenerated.force_max_concurrent_requests_per_process != NGX_CONF_UNSET) {
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%d",
-            conf->autogenerated.force_max_concurrent_requests_per_process);
-        len += sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ") - 1;
-        len += end - int_buf;
+    if (conf->autogenerated.app_log_file.data != NULL) {
+        len += sizeof("!~PASSENGER_APP_LOG_FILE: ") - 1;
+        len += conf->autogenerated.app_log_file.len;
         len += sizeof("\r\n") - 1;
     }
 
@@ -282,6 +288,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.max_instances_per_app != NGX_CONF_UNSET_UINT) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_MAX_PROCESSES: ",
+            sizeof("!~PASSENGER_MAX_PROCESSES: ") - 1);
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%ui",
+            conf->autogenerated.max_instances_per_app);
+        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.ruby.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_RUBY: ",
@@ -349,35 +366,13 @@ 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.max_instances_per_app != NGX_CONF_UNSET_UINT) {
-        pos = ngx_copy(pos,
-            "!~PASSENGER_MAX_PROCESSES: ",
-            sizeof("!~PASSENGER_MAX_PROCESSES: ") - 1);
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%ui",
-            conf->autogenerated.max_instances_per_app);
-        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.max_requests != NGX_CONF_UNSET_UINT) {
-        pos = ngx_copy(pos,
-            "!~PASSENGER_MAX_REQUESTS: ",
-            sizeof("!~PASSENGER_MAX_REQUESTS: ") - 1);
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%ui",
-            conf->autogenerated.max_requests);
-        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.start_timeout != NGX_CONF_UNSET) {
+    if (conf->autogenerated.start_timeout != NGX_CONF_UNSET_UINT) {
         pos = ngx_copy(pos,
             "!~PASSENGER_START_TIMEOUT: ",
             sizeof("!~PASSENGER_START_TIMEOUT: ") - 1);
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
-            "%d",
+            "%ui",
             conf->autogenerated.start_timeout);
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
@@ -480,15 +475,13 @@ 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.request_queue_overflow_status_code != NGX_CONF_UNSET) {
+    if (conf->autogenerated.startup_file.data != NULL) {
         pos = ngx_copy(pos,
-            "!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ",
-            sizeof("!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ") - 1);
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%d",
-            conf->autogenerated.request_queue_overflow_status_code);
-        pos = ngx_copy(pos, int_buf, end - int_buf);
+            "!~PASSENGER_STARTUP_FILE: ",
+            sizeof("!~PASSENGER_STARTUP_FILE: ") - 1);
+        pos = ngx_copy(pos,
+            conf->autogenerated.startup_file.data,
+            conf->autogenerated.startup_file.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
     if (conf->autogenerated.restart_dir.data != NULL) {
@@ -500,13 +493,48 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
             conf->autogenerated.restart_dir.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->autogenerated.startup_file.data != NULL) {
+    if (conf->autogenerated.abort_websockets_on_process_shutdown != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
-            "!~PASSENGER_STARTUP_FILE: ",
-            sizeof("!~PASSENGER_STARTUP_FILE: ") - 1);
+            "!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ",
+            sizeof("!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ") - 1);
+        if (conf->autogenerated.abort_websockets_on_process_shutdown) {
+            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.force_max_concurrent_requests_per_process != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
-            conf->autogenerated.startup_file.data,
-            conf->autogenerated.startup_file.len);
+            "!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ",
+            sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ") - 1);
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%d",
+            conf->autogenerated.force_max_concurrent_requests_per_process);
+        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.max_requests != NGX_CONF_UNSET_UINT) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_MAX_REQUESTS: ",
+            sizeof("!~PASSENGER_MAX_REQUESTS: ") - 1);
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%ui",
+            conf->autogenerated.max_requests);
+        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.request_queue_overflow_status_code != NGX_CONF_UNSET) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ",
+            sizeof("!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ") - 1);
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%d",
+            conf->autogenerated.request_queue_overflow_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) {
@@ -538,26 +566,13 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
             conf->autogenerated.vary_turbocache_by_cookie.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
-    if (conf->autogenerated.abort_websockets_on_process_shutdown != NGX_CONF_UNSET) {
+    if (conf->autogenerated.app_log_file.data != NULL) {
         pos = ngx_copy(pos,
-            "!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ",
-            sizeof("!~PASSENGER_ABORT_WEBSOCKETS_ON_PROCESS_SHUTDOWN: ") - 1);
-        if (conf->autogenerated.abort_websockets_on_process_shutdown) {
-            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.force_max_concurrent_requests_per_process != NGX_CONF_UNSET) {
+            "!~PASSENGER_APP_LOG_FILE: ",
+            sizeof("!~PASSENGER_APP_LOG_FILE: ") - 1);
         pos = ngx_copy(pos,
-            "!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ",
-            sizeof("!~PASSENGER_FORCE_MAX_CONCURRENT_REQUESTS_PER_PROCESS: ") - 1);
-        end = ngx_snprintf(int_buf,
-            sizeof(int_buf) - 1,
-            "%d",
-            conf->autogenerated.force_max_concurrent_requests_per_process);
-        pos = ngx_copy(pos, int_buf, end - int_buf);
+            conf->autogenerated.app_log_file.data,
+            conf->autogenerated.app_log_file.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }