passenger 5.2.3 → 5.3.0

data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c

@@ -208,7 +208,7 @@ set_manifest_autogenerated_app_conf_defaults(manifest_gen_ctx_t *ctx, PsgJsonVal
         sizeof("passenger_min_instances") - 1,
         1);
 
-    add_manifest_options_container_static_default_int(ctx,
+    add_manifest_options_container_static_default_uint(ctx,
         options_container,
         "passenger_start_timeout",
         sizeof("passenger_start_timeout") - 1,
@@ -273,13 +273,6 @@ set_manifest_autogenerated_app_conf_defaults(manifest_gen_ctx_t *ctx, PsgJsonVal
         sizeof("passenger_max_request_queue_size") - 1,
         100);
 
-    add_manifest_options_container_static_default_str(ctx,
-        options_container,
-        "passenger_restart_dir",
-        sizeof("passenger_restart_dir") - 1,
-        "tmp",
-        sizeof("tmp") - 1);
-
     add_manifest_options_container_dynamic_default(ctx,
         options_container,
         "passenger_app_type",
@@ -294,6 +287,13 @@ set_manifest_autogenerated_app_conf_defaults(manifest_gen_ctx_t *ctx, PsgJsonVal
         "Autodetected",
         sizeof("Autodetected") - 1);
 
+    add_manifest_options_container_static_default_str(ctx,
+        options_container,
+        "passenger_restart_dir",
+        sizeof("passenger_restart_dir") - 1,
+        "tmp",
+        sizeof("tmp") - 1);
+
     add_manifest_options_container_static_default_bool(ctx,
         options_container,
         "passenger_abort_websockets_on_process_shutdown",
@@ -306,6 +306,13 @@ set_manifest_autogenerated_app_conf_defaults(manifest_gen_ctx_t *ctx, PsgJsonVal
         sizeof("passenger_force_max_concurrent_requests_per_process") - 1,
         -1);
 
+    add_manifest_options_container_dynamic_default(ctx,
+        options_container,
+        "passenger_app_log_file",
+        sizeof("passenger_app_log_file") - 1,
+        "passenger_log_file",
+        sizeof("passenger_log_file") - 1);
+
 }
 
 static void

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -361,6 +361,18 @@ passenger_conf_set_app_file_descriptor_ulimit(ngx_conf_t *cf, ngx_command_t *cmd
     return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_max_instances_per_app(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.max_instances_per_app_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.max_instances_per_app_source_file,
+        &passenger_conf->autogenerated.max_instances_per_app_source_line);
+
+    return ngx_conf_set_num_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_admin_panel_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_main_conf_t *passenger_conf = conf;
@@ -493,30 +505,6 @@ passenger_conf_set_min_instances(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
-static char *
-passenger_conf_set_max_instances_per_app(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-    passenger_loc_conf_t *passenger_conf = conf;
-
-    passenger_conf->autogenerated.max_instances_per_app_explicitly_set = 1;
-    record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.max_instances_per_app_source_file,
-        &passenger_conf->autogenerated.max_instances_per_app_source_line);
-
-    return ngx_conf_set_num_slot(cf, cmd, conf);
-}
-
-static char *
-passenger_conf_set_max_requests(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-    passenger_loc_conf_t *passenger_conf = conf;
-
-    passenger_conf->autogenerated.max_requests_explicitly_set = 1;
-    record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.max_requests_source_file,
-        &passenger_conf->autogenerated.max_requests_source_line);
-
-    return ngx_conf_set_num_slot(cf, cmd, conf);
-}
-
 static char *
 passenger_conf_set_start_timeout(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
@@ -529,30 +517,6 @@ passenger_conf_set_start_timeout(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
-static char *
-passenger_conf_set_base_uri(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-    passenger_loc_conf_t *passenger_conf = conf;
-
-    passenger_conf->autogenerated.base_uris_explicitly_set = 1;
-    record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.base_uris_source_file,
-        &passenger_conf->autogenerated.base_uris_source_line);
-
-    return ngx_conf_set_str_array_slot(cf, cmd, conf);
-}
-
-static char *
-passenger_conf_set_document_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-    passenger_loc_conf_t *passenger_conf = conf;
-
-    passenger_conf->autogenerated.document_root_explicitly_set = 1;
-    record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.document_root_source_file,
-        &passenger_conf->autogenerated.document_root_source_line);
-
-    return ngx_conf_set_str_slot(cf, cmd, conf);
-}
-
 static char *
 passenger_conf_set_user(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
@@ -662,242 +626,278 @@ passenger_conf_set_env_var(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
 }
 
 static char *
-passenger_conf_set_set_header(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_spawn_method(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.headers_source_explicitly_set = 1;
+    passenger_conf->autogenerated.spawn_method_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.headers_source_source_file,
-        &passenger_conf->autogenerated.headers_source_source_line);
+        &passenger_conf->autogenerated.spawn_method_source_file,
+        &passenger_conf->autogenerated.spawn_method_source_line);
 
-    return ngx_conf_set_keyval_slot(cf, cmd, conf);
+    return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_pass_header(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_load_shell_envvars(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.upstream_config_pass_headers_explicitly_set = 1;
+    passenger_conf->autogenerated.load_shell_envvars_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.upstream_config_pass_headers_source_file,
-        &passenger_conf->autogenerated.upstream_config_pass_headers_source_line);
+        &passenger_conf->autogenerated.load_shell_envvars_source_file,
+        &passenger_conf->autogenerated.load_shell_envvars_source_line);
 
-    return ngx_conf_set_str_array_slot(cf, cmd, conf);
+    return ngx_conf_set_flag_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_headers_hash_max_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_max_request_queue_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.headers_hash_max_size_explicitly_set = 1;
+    passenger_conf->autogenerated.max_request_queue_size_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.headers_hash_max_size_source_file,
-        &passenger_conf->autogenerated.headers_hash_max_size_source_line);
+        &passenger_conf->autogenerated.max_request_queue_size_source_file,
+        &passenger_conf->autogenerated.max_request_queue_size_source_line);
 
     return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_headers_hash_bucket_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_app_type(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.headers_hash_bucket_size_explicitly_set = 1;
+    passenger_conf->autogenerated.app_type_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.headers_hash_bucket_size_source_file,
-        &passenger_conf->autogenerated.headers_hash_bucket_size_source_line);
+        &passenger_conf->autogenerated.app_type_source_file,
+        &passenger_conf->autogenerated.app_type_source_line);
 
-    return ngx_conf_set_num_slot(cf, cmd, conf);
+    return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_ignore_client_abort(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_startup_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.upstream_config_ignore_client_abort_explicitly_set = 1;
+    passenger_conf->autogenerated.startup_file_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.upstream_config_ignore_client_abort_source_file,
-        &passenger_conf->autogenerated.upstream_config_ignore_client_abort_source_line);
+        &passenger_conf->autogenerated.startup_file_source_file,
+        &passenger_conf->autogenerated.startup_file_source_line);
 
-    return ngx_conf_set_flag_slot(cf, cmd, conf);
+    return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_read_timeout(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_restart_dir(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.upstream_config_read_timeout_explicitly_set = 1;
+    passenger_conf->autogenerated.restart_dir_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.upstream_config_read_timeout_source_file,
-        &passenger_conf->autogenerated.upstream_config_read_timeout_source_line);
+        &passenger_conf->autogenerated.restart_dir_source_file,
+        &passenger_conf->autogenerated.restart_dir_source_line);
 
-    return ngx_conf_set_msec_slot(cf, cmd, conf);
+    return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_buffer_response(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_abort_websockets_on_process_shutdown(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.upstream_config_buffering_explicitly_set = 1;
+    passenger_conf->autogenerated.abort_websockets_on_process_shutdown_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.upstream_config_buffering_source_file,
-        &passenger_conf->autogenerated.upstream_config_buffering_source_line);
+        &passenger_conf->autogenerated.abort_websockets_on_process_shutdown_source_file,
+        &passenger_conf->autogenerated.abort_websockets_on_process_shutdown_source_line);
 
     return ngx_conf_set_flag_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_intercept_errors(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_force_max_concurrent_requests_per_process(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.upstream_config_intercept_errors_explicitly_set = 1;
+    passenger_conf->autogenerated.force_max_concurrent_requests_per_process_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.upstream_config_intercept_errors_source_file,
-        &passenger_conf->autogenerated.upstream_config_intercept_errors_source_line);
+        &passenger_conf->autogenerated.force_max_concurrent_requests_per_process_source_file,
+        &passenger_conf->autogenerated.force_max_concurrent_requests_per_process_source_line);
 
-    return ngx_conf_set_flag_slot(cf, cmd, conf);
+    return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_spawn_method(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_max_requests(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.spawn_method_explicitly_set = 1;
+    passenger_conf->autogenerated.max_requests_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.spawn_method_source_file,
-        &passenger_conf->autogenerated.spawn_method_source_line);
+        &passenger_conf->autogenerated.max_requests_source_file,
+        &passenger_conf->autogenerated.max_requests_source_line);
+
+    return ngx_conf_set_num_slot(cf, cmd, conf);
+}
+
+static char *
+passenger_conf_set_base_uri(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.base_uris_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.base_uris_source_file,
+        &passenger_conf->autogenerated.base_uris_source_line);
+
+    return ngx_conf_set_str_array_slot(cf, cmd, conf);
+}
+
+static char *
+passenger_conf_set_document_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.document_root_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.document_root_source_file,
+        &passenger_conf->autogenerated.document_root_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_conf_set_set_header(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.load_shell_envvars_explicitly_set = 1;
+    passenger_conf->autogenerated.headers_source_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.load_shell_envvars_source_file,
-        &passenger_conf->autogenerated.load_shell_envvars_source_line);
+        &passenger_conf->autogenerated.headers_source_source_file,
+        &passenger_conf->autogenerated.headers_source_source_line);
 
-    return ngx_conf_set_flag_slot(cf, cmd, conf);
+    return ngx_conf_set_keyval_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_max_request_queue_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_pass_header(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.max_request_queue_size_explicitly_set = 1;
+    passenger_conf->autogenerated.upstream_config_pass_headers_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.max_request_queue_size_source_file,
-        &passenger_conf->autogenerated.max_request_queue_size_source_line);
+        &passenger_conf->autogenerated.upstream_config_pass_headers_source_file,
+        &passenger_conf->autogenerated.upstream_config_pass_headers_source_line);
 
-    return ngx_conf_set_num_slot(cf, cmd, conf);
+    return ngx_conf_set_str_array_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_request_queue_overflow_status_code(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_headers_hash_max_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.request_queue_overflow_status_code_explicitly_set = 1;
+    passenger_conf->autogenerated.headers_hash_max_size_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.request_queue_overflow_status_code_source_file,
-        &passenger_conf->autogenerated.request_queue_overflow_status_code_source_line);
+        &passenger_conf->autogenerated.headers_hash_max_size_source_file,
+        &passenger_conf->autogenerated.headers_hash_max_size_source_line);
 
     return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_restart_dir(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_headers_hash_bucket_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.restart_dir_explicitly_set = 1;
+    passenger_conf->autogenerated.headers_hash_bucket_size_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.restart_dir_source_file,
-        &passenger_conf->autogenerated.restart_dir_source_line);
+        &passenger_conf->autogenerated.headers_hash_bucket_size_source_file,
+        &passenger_conf->autogenerated.headers_hash_bucket_size_source_line);
 
-    return ngx_conf_set_str_slot(cf, cmd, conf);
+    return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_app_type(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_ignore_client_abort(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.app_type_explicitly_set = 1;
+    passenger_conf->autogenerated.upstream_config_ignore_client_abort_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.app_type_source_file,
-        &passenger_conf->autogenerated.app_type_source_line);
+        &passenger_conf->autogenerated.upstream_config_ignore_client_abort_source_file,
+        &passenger_conf->autogenerated.upstream_config_ignore_client_abort_source_line);
 
-    return ngx_conf_set_str_slot(cf, cmd, conf);
+    return ngx_conf_set_flag_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_startup_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_read_timeout(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.startup_file_explicitly_set = 1;
+    passenger_conf->autogenerated.upstream_config_read_timeout_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.startup_file_source_file,
-        &passenger_conf->autogenerated.startup_file_source_line);
+        &passenger_conf->autogenerated.upstream_config_read_timeout_source_file,
+        &passenger_conf->autogenerated.upstream_config_read_timeout_source_line);
 
-    return ngx_conf_set_str_slot(cf, cmd, conf);
+    return ngx_conf_set_msec_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_sticky_sessions(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_buffer_response(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.sticky_sessions_explicitly_set = 1;
+    passenger_conf->autogenerated.upstream_config_buffering_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.sticky_sessions_source_file,
-        &passenger_conf->autogenerated.sticky_sessions_source_line);
+        &passenger_conf->autogenerated.upstream_config_buffering_source_file,
+        &passenger_conf->autogenerated.upstream_config_buffering_source_line);
 
     return ngx_conf_set_flag_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_sticky_sessions_cookie_name(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_intercept_errors(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.sticky_sessions_cookie_name_explicitly_set = 1;
+    passenger_conf->autogenerated.upstream_config_intercept_errors_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.sticky_sessions_cookie_name_source_file,
-        &passenger_conf->autogenerated.sticky_sessions_cookie_name_source_line);
+        &passenger_conf->autogenerated.upstream_config_intercept_errors_source_file,
+        &passenger_conf->autogenerated.upstream_config_intercept_errors_source_line);
 
-    return ngx_conf_set_str_slot(cf, cmd, conf);
+    return ngx_conf_set_flag_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_vary_turbocache_by_cookie(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_request_queue_overflow_status_code(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.vary_turbocache_by_cookie_explicitly_set = 1;
+    passenger_conf->autogenerated.request_queue_overflow_status_code_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.vary_turbocache_by_cookie_source_file,
-        &passenger_conf->autogenerated.vary_turbocache_by_cookie_source_line);
+        &passenger_conf->autogenerated.request_queue_overflow_status_code_source_file,
+        &passenger_conf->autogenerated.request_queue_overflow_status_code_source_line);
 
-    return ngx_conf_set_str_slot(cf, cmd, conf);
+    return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_abort_websockets_on_process_shutdown(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_sticky_sessions(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.abort_websockets_on_process_shutdown_explicitly_set = 1;
+    passenger_conf->autogenerated.sticky_sessions_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.abort_websockets_on_process_shutdown_source_file,
-        &passenger_conf->autogenerated.abort_websockets_on_process_shutdown_source_line);
+        &passenger_conf->autogenerated.sticky_sessions_source_file,
+        &passenger_conf->autogenerated.sticky_sessions_source_line);
 
     return ngx_conf_set_flag_slot(cf, cmd, conf);
 }
 
 static char *
-passenger_conf_set_force_max_concurrent_requests_per_process(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+passenger_conf_set_sticky_sessions_cookie_name(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
 
-    passenger_conf->autogenerated.force_max_concurrent_requests_per_process_explicitly_set = 1;
+    passenger_conf->autogenerated.sticky_sessions_cookie_name_explicitly_set = 1;
     record_loc_conf_source_location(cf, passenger_conf,
-        &passenger_conf->autogenerated.force_max_concurrent_requests_per_process_source_file,
-        &passenger_conf->autogenerated.force_max_concurrent_requests_per_process_source_line);
+        &passenger_conf->autogenerated.sticky_sessions_cookie_name_source_file,
+        &passenger_conf->autogenerated.sticky_sessions_cookie_name_source_line);
 
-    return ngx_conf_set_num_slot(cf, cmd, conf);
+    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;
+
+    passenger_conf->autogenerated.vary_turbocache_by_cookie_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.vary_turbocache_by_cookie_source_file,
+        &passenger_conf->autogenerated.vary_turbocache_by_cookie_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
 }