passenger 5.2.3 → 5.3.0

data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c

@@ -46,19 +46,6 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
     PsgJsonValue *loc_options_container = NULL;
     PsgJsonValue *option_container, *hierarchy_member;
 
-    if (plcf->autogenerated.enabled_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_enabled",
-            sizeof("passenger_enabled") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.enabled_source_file,
-            plcf->autogenerated.enabled_source_line);
-        psg_json_value_set_bool(hierarchy_member, "value",
-            plcf->autogenerated.enabled);
-    }
     if (plcf->autogenerated.ruby_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -155,19 +142,6 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         psg_json_value_set_uint(hierarchy_member, "value",
             plcf->autogenerated.min_instances);
     }
-    if (plcf->autogenerated.max_requests_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_max_requests",
-            sizeof("passenger_max_requests") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.max_requests_source_file,
-            plcf->autogenerated.max_requests_source_line);
-        psg_json_value_set_uint(hierarchy_member, "value",
-            plcf->autogenerated.max_requests);
-    }
     if (plcf->autogenerated.start_timeout_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -178,36 +152,9 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
             &plcf->autogenerated.start_timeout_source_file,
             plcf->autogenerated.start_timeout_source_line);
-        psg_json_value_set_int(hierarchy_member, "value",
+        psg_json_value_set_uint(hierarchy_member, "value",
             plcf->autogenerated.start_timeout);
     }
-    if (plcf->autogenerated.base_uris_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_base_uri",
-            sizeof("passenger_base_uri") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.base_uris_source_file,
-            plcf->autogenerated.base_uris_source_line);
-        psg_json_value_set_str_array(hierarchy_member, "value",
-            plcf->autogenerated.base_uris);
-    }
-    if (plcf->autogenerated.document_root_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_document_root",
-            sizeof("passenger_document_root") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.document_root_source_file,
-            plcf->autogenerated.document_root_source_line);
-        psg_json_value_set_str(hierarchy_member, "value",
-            (const char *) plcf->autogenerated.document_root.data,
-            plcf->autogenerated.document_root.len);
-    }
     if (plcf->autogenerated.user_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -330,6 +277,167 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         psg_json_value_set_str_keyval(hierarchy_member, "value",
             plcf->autogenerated.env_vars);
     }
+    if (plcf->autogenerated.spawn_method_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_spawn_method",
+            sizeof("passenger_spawn_method") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.spawn_method_source_file,
+            plcf->autogenerated.spawn_method_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.spawn_method.data,
+            plcf->autogenerated.spawn_method.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);
+        option_container = find_or_create_manifest_option_container(ctx,
+            app_options_container,
+            "passenger_load_shell_envvars",
+            sizeof("passenger_load_shell_envvars") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.load_shell_envvars_source_file,
+            plcf->autogenerated.load_shell_envvars_source_line);
+        psg_json_value_set_bool(hierarchy_member, "value",
+            plcf->autogenerated.load_shell_envvars);
+    }
+    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);
+        option_container = find_or_create_manifest_option_container(ctx,
+            app_options_container,
+            "passenger_max_request_queue_size",
+            sizeof("passenger_max_request_queue_size") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.max_request_queue_size_source_file,
+            plcf->autogenerated.max_request_queue_size_source_line);
+        psg_json_value_set_uint(hierarchy_member, "value",
+            plcf->autogenerated.max_request_queue_size);
+    }
+    if (plcf->autogenerated.app_type_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_app_type",
+            sizeof("passenger_app_type") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.app_type_source_file,
+            plcf->autogenerated.app_type_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.app_type.data,
+            plcf->autogenerated.app_type.len);
+    }
+    if (plcf->autogenerated.startup_file_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_startup_file",
+            sizeof("passenger_startup_file") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.startup_file_source_file,
+            plcf->autogenerated.startup_file_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.startup_file.data,
+            plcf->autogenerated.startup_file.len);
+    }
+    if (plcf->autogenerated.restart_dir_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_restart_dir",
+            sizeof("passenger_restart_dir") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.restart_dir_source_file,
+            plcf->autogenerated.restart_dir_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.restart_dir.data,
+            plcf->autogenerated.restart_dir.len);
+    }
+    if (plcf->autogenerated.abort_websockets_on_process_shutdown_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_abort_websockets_on_process_shutdown",
+            sizeof("passenger_abort_websockets_on_process_shutdown") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.abort_websockets_on_process_shutdown_source_file,
+            plcf->autogenerated.abort_websockets_on_process_shutdown_source_line);
+        psg_json_value_set_bool(hierarchy_member, "value",
+            plcf->autogenerated.abort_websockets_on_process_shutdown);
+    }
+    if (plcf->autogenerated.force_max_concurrent_requests_per_process_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_force_max_concurrent_requests_per_process",
+            sizeof("passenger_force_max_concurrent_requests_per_process") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.force_max_concurrent_requests_per_process_source_file,
+            plcf->autogenerated.force_max_concurrent_requests_per_process_source_line);
+        psg_json_value_set_int(hierarchy_member, "value",
+            plcf->autogenerated.force_max_concurrent_requests_per_process);
+    }
+    if (plcf->autogenerated.enabled_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_enabled",
+            sizeof("passenger_enabled") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.enabled_source_file,
+            plcf->autogenerated.enabled_source_line);
+        psg_json_value_set_bool(hierarchy_member, "value",
+            plcf->autogenerated.enabled);
+    }
+    if (plcf->autogenerated.max_requests_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_max_requests",
+            sizeof("passenger_max_requests") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.max_requests_source_file,
+            plcf->autogenerated.max_requests_source_line);
+        psg_json_value_set_uint(hierarchy_member, "value",
+            plcf->autogenerated.max_requests);
+    }
+    if (plcf->autogenerated.base_uris_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_base_uri",
+            sizeof("passenger_base_uri") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.base_uris_source_file,
+            plcf->autogenerated.base_uris_source_line);
+        psg_json_value_set_str_array(hierarchy_member, "value",
+            plcf->autogenerated.base_uris);
+    }
+    if (plcf->autogenerated.document_root_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_document_root",
+            sizeof("passenger_document_root") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.document_root_source_file,
+            plcf->autogenerated.document_root_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.document_root.data,
+            plcf->autogenerated.document_root.len);
+    }
     if (plcf->autogenerated.headers_source_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -434,46 +542,6 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         psg_json_value_set_bool(hierarchy_member, "value",
             plcf->upstream_config.intercept_errors);
     }
-    if (plcf->autogenerated.spawn_method_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_spawn_method",
-            sizeof("passenger_spawn_method") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.spawn_method_source_file,
-            plcf->autogenerated.spawn_method_source_line);
-        psg_json_value_set_str(hierarchy_member, "value",
-            (const char *) plcf->autogenerated.spawn_method.data,
-            plcf->autogenerated.spawn_method.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);
-        option_container = find_or_create_manifest_option_container(ctx,
-            app_options_container,
-            "passenger_load_shell_envvars",
-            sizeof("passenger_load_shell_envvars") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.load_shell_envvars_source_file,
-            plcf->autogenerated.load_shell_envvars_source_line);
-        psg_json_value_set_bool(hierarchy_member, "value",
-            plcf->autogenerated.load_shell_envvars);
-    }
-    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);
-        option_container = find_or_create_manifest_option_container(ctx,
-            app_options_container,
-            "passenger_max_request_queue_size",
-            sizeof("passenger_max_request_queue_size") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.max_request_queue_size_source_file,
-            plcf->autogenerated.max_request_queue_size_source_line);
-        psg_json_value_set_uint(hierarchy_member, "value",
-            plcf->autogenerated.max_request_queue_size);
-    }
     if (plcf->autogenerated.request_queue_overflow_status_code_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -487,48 +555,6 @@ 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.restart_dir_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_restart_dir",
-            sizeof("passenger_restart_dir") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.restart_dir_source_file,
-            plcf->autogenerated.restart_dir_source_line);
-        psg_json_value_set_str(hierarchy_member, "value",
-            (const char *) plcf->autogenerated.restart_dir.data,
-            plcf->autogenerated.restart_dir.len);
-    }
-    if (plcf->autogenerated.app_type_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_app_type",
-            sizeof("passenger_app_type") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.app_type_source_file,
-            plcf->autogenerated.app_type_source_line);
-        psg_json_value_set_str(hierarchy_member, "value",
-            (const char *) plcf->autogenerated.app_type.data,
-            plcf->autogenerated.app_type.len);
-    }
-    if (plcf->autogenerated.startup_file_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_startup_file",
-            sizeof("passenger_startup_file") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.startup_file_source_file,
-            plcf->autogenerated.startup_file_source_line);
-        psg_json_value_set_str(hierarchy_member, "value",
-            (const char *) plcf->autogenerated.startup_file.data,
-            plcf->autogenerated.startup_file.len);
-    }
     if (plcf->autogenerated.sticky_sessions_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -570,31 +596,19 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
             (const char *) plcf->autogenerated.vary_turbocache_by_cookie.data,
             plcf->autogenerated.vary_turbocache_by_cookie.len);
     }
-    if (plcf->autogenerated.abort_websockets_on_process_shutdown_explicitly_set) {
+    if (plcf->autogenerated.app_log_file_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_abort_websockets_on_process_shutdown",
-            sizeof("passenger_abort_websockets_on_process_shutdown") - 1);
+            "passenger_app_log_file",
+            sizeof("passenger_app_log_file") - 1);
         hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.abort_websockets_on_process_shutdown_source_file,
-            plcf->autogenerated.abort_websockets_on_process_shutdown_source_line);
-        psg_json_value_set_bool(hierarchy_member, "value",
-            plcf->autogenerated.abort_websockets_on_process_shutdown);
-    }
-    if (plcf->autogenerated.force_max_concurrent_requests_per_process_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_force_max_concurrent_requests_per_process",
-            sizeof("passenger_force_max_concurrent_requests_per_process") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &plcf->autogenerated.force_max_concurrent_requests_per_process_source_file,
-            plcf->autogenerated.force_max_concurrent_requests_per_process_source_line);
-        psg_json_value_set_int(hierarchy_member, "value",
-            plcf->autogenerated.force_max_concurrent_requests_per_process);
+            &plcf->autogenerated.app_log_file_source_file,
+            plcf->autogenerated.app_log_file_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.app_log_file.data,
+            plcf->autogenerated.app_log_file.len);
     }
 
     /*

data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c

@@ -46,8 +46,8 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_uint_value(conf->app_file_descriptor_ulimit,
         prev->app_file_descriptor_ulimit,
         NGX_CONF_UNSET_UINT);
-    ngx_conf_merge_value(conf->enabled,
-        prev->enabled,
+    ngx_conf_merge_uint_value(conf->max_instances_per_app,
+        prev->max_instances_per_app,
         0);
     ngx_conf_merge_str_value(conf->ruby,
         prev->ruby,
@@ -70,23 +70,9 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_uint_value(conf->min_instances,
         prev->min_instances,
         1);
-    ngx_conf_merge_uint_value(conf->max_instances_per_app,
-        prev->max_instances_per_app,
-        0);
-    ngx_conf_merge_uint_value(conf->max_requests,
-        prev->max_requests,
-        0);
-    ngx_conf_merge_value(conf->start_timeout,
+    ngx_conf_merge_uint_value(conf->start_timeout,
         prev->start_timeout,
         90);
-    if (merge_string_array(cf, &prev->base_uris, &conf->base_uris) != NGX_OK) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-            "cannot merge \"passenger_base_uri\" configurations");
-        return 0;
-    }
-    ngx_conf_merge_str_value(conf->document_root,
-        prev->document_root,
-        NULL);
     ngx_conf_merge_str_value(conf->user,
         prev->user,
         NULL);
@@ -118,12 +104,6 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
             "cannot merge \"passenger_env_var\" configurations");
         return 0;
     }
-    ngx_conf_merge_uint_value(conf->headers_hash_max_size,
-        prev->headers_hash_max_size,
-        512);
-    ngx_conf_merge_uint_value(conf->headers_hash_bucket_size,
-        prev->headers_hash_bucket_size,
-        64);
     ngx_conf_merge_str_value(conf->spawn_method,
         prev->spawn_method,
         NULL);
@@ -133,18 +113,44 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_uint_value(conf->max_request_queue_size,
         prev->max_request_queue_size,
         100);
-    ngx_conf_merge_value(conf->request_queue_overflow_status_code,
-        prev->request_queue_overflow_status_code,
-        503);
-    ngx_conf_merge_str_value(conf->restart_dir,
-        prev->restart_dir,
-        "tmp");
     ngx_conf_merge_str_value(conf->app_type,
         prev->app_type,
         NULL);
     ngx_conf_merge_str_value(conf->startup_file,
         prev->startup_file,
         NULL);
+    ngx_conf_merge_str_value(conf->restart_dir,
+        prev->restart_dir,
+        "tmp");
+    ngx_conf_merge_value(conf->abort_websockets_on_process_shutdown,
+        prev->abort_websockets_on_process_shutdown,
+        1);
+    ngx_conf_merge_value(conf->force_max_concurrent_requests_per_process,
+        prev->force_max_concurrent_requests_per_process,
+        -1);
+    ngx_conf_merge_value(conf->enabled,
+        prev->enabled,
+        0);
+    ngx_conf_merge_uint_value(conf->max_requests,
+        prev->max_requests,
+        0);
+    if (merge_string_array(cf, &prev->base_uris, &conf->base_uris) != NGX_OK) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+            "cannot merge \"passenger_base_uri\" configurations");
+        return 0;
+    }
+    ngx_conf_merge_str_value(conf->document_root,
+        prev->document_root,
+        NULL);
+    ngx_conf_merge_uint_value(conf->headers_hash_max_size,
+        prev->headers_hash_max_size,
+        512);
+    ngx_conf_merge_uint_value(conf->headers_hash_bucket_size,
+        prev->headers_hash_bucket_size,
+        64);
+    ngx_conf_merge_value(conf->request_queue_overflow_status_code,
+        prev->request_queue_overflow_status_code,
+        503);
     ngx_conf_merge_value(conf->sticky_sessions,
         prev->sticky_sessions,
         0);
@@ -154,12 +160,9 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_str_value(conf->vary_turbocache_by_cookie,
         prev->vary_turbocache_by_cookie,
         NULL);
-    ngx_conf_merge_value(conf->abort_websockets_on_process_shutdown,
-        prev->abort_websockets_on_process_shutdown,
-        1);
-    ngx_conf_merge_value(conf->force_max_concurrent_requests_per_process,
-        prev->force_max_concurrent_requests_per_process,
-        -1);
+    ngx_conf_merge_str_value(conf->app_log_file,
+        prev->app_log_file,
+        NULL);
 
     return 1;
 }