passenger 6.0.2 → 6.0.7

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -277,6 +277,18 @@ passenger_conf_set_instance_registry_dir(ngx_conf_t *cf, ngx_command_t *cmd, voi
     return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_spawn_dir(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_main_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.spawn_dir_explicitly_set = 1;
+    record_main_conf_source_location(cf,
+        &passenger_conf->autogenerated.spawn_dir_source_file,
+        &passenger_conf->autogenerated.spawn_dir_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_turbocaching(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_main_conf_t *passenger_conf = conf;
@@ -673,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;
@@ -913,6 +937,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_buffer_upload(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.buffer_upload_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.buffer_upload_source_file,
+        &passenger_conf->autogenerated.buffer_upload_source_line);
+
+    return ngx_conf_set_flag_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_sticky_sessions(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
@@ -937,6 +973,18 @@ passenger_conf_set_sticky_sessions_cookie_name(ngx_conf_t *cf, ngx_command_t *cm
     return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_sticky_sessions_cookie_attributes(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.sticky_sessions_cookie_attributes_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.sticky_sessions_cookie_attributes_source_file,
+        &passenger_conf->autogenerated.sticky_sessions_cookie_attributes_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_vary_turbocache_by_cookie(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;

data/src/nginx_module/Configuration.c

@@ -61,6 +61,10 @@ 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_int_t merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf,
     passenger_loc_conf_t *prev);
@@ -573,6 +577,15 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                                        |NGX_HTTP_UPSTREAM_FT_OFF;
     }
 
+    if (ngx_conf_merge_path_value(cf,
+                              &conf->upstream_config.temp_path,
+                              prev->upstream_config.temp_path,
+                              &ngx_http_proxy_temp_path)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
 #if (NGX_HTTP_CACHE)
 
     #if NGINX_VERSION_NUM >= 1007009
@@ -1082,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/ContentHandler.c

@@ -993,11 +993,15 @@ construct_request_buffer(ngx_http_request_t *r, passenger_loc_conf_t *slcf,
 
     /* D = Dechunk response
      *     Prevent Nginx from rechunking the response.
+     * B = Buffer request body
      * C = Strip 100 Continue header
      * S = SSL
      */
 
-    PUSH_STATIC_STR("!~FLAGS: DC");
+    PUSH_STATIC_STR("!~FLAGS: CD");
+    if (slcf->autogenerated.buffer_upload) {
+        PUSH_STATIC_STR("B");
+    }
     #if (NGX_HTTP_SSL)
         if (r->http_connection != NULL /* happens in sub-requests */
                 && r->http_connection->ssl) {

data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c

@@ -69,6 +69,8 @@ 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->max_request_queue_size = NGX_CONF_UNSET_UINT;
     conf->app_type.data = NULL;
@@ -89,9 +91,12 @@ 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->buffer_upload = NGX_CONF_UNSET;
     conf->sticky_sessions = NGX_CONF_UNSET;
     conf->sticky_sessions_cookie_name.data = NULL;
     conf->sticky_sessions_cookie_name.len  = 0;
+    conf->sticky_sessions_cookie_attributes.data = NULL;
+    conf->sticky_sessions_cookie_attributes.len  = 0;
     conf->vary_turbocache_by_cookie.data = NULL;
     conf->vary_turbocache_by_cookie.len  = 0;
     conf->app_log_file.data = NULL;
@@ -169,6 +174,10 @@ 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;
@@ -217,6 +226,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->document_root_source_file.len = 0;
     conf->document_root_source_line = 0;
     conf->document_root_explicitly_set = 0;
+    conf->upstream_config_temp_path_source_file.data = NULL;
+    conf->upstream_config_temp_path_source_file.len = 0;
+    conf->upstream_config_temp_path_source_line = 0;
+    conf->upstream_config_temp_path_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;
@@ -273,6 +286,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->buffer_upload_source_file.data = NULL;
+    conf->buffer_upload_source_file.len = 0;
+    conf->buffer_upload_source_line = 0;
+    conf->buffer_upload_explicitly_set = 0;
     conf->sticky_sessions_source_file.data = NULL;
     conf->sticky_sessions_source_file.len = 0;
     conf->sticky_sessions_source_line = 0;
@@ -281,6 +298,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->sticky_sessions_cookie_name_source_file.len = 0;
     conf->sticky_sessions_cookie_name_source_line = 0;
     conf->sticky_sessions_cookie_name_explicitly_set = 0;
+    conf->sticky_sessions_cookie_attributes_source_file.data = NULL;
+    conf->sticky_sessions_cookie_attributes_source_file.len = 0;
+    conf->sticky_sessions_cookie_attributes_source_line = 0;
+    conf->sticky_sessions_cookie_attributes_explicitly_set = 0;
     conf->vary_turbocache_by_cookie_source_file.data = NULL;
     conf->vary_turbocache_by_cookie_source_file.len = 0;
     conf->vary_turbocache_by_cookie_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
@@ -238,6 +244,12 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         len += sizeof("\r\n") - 1;
     }
 
+    if (conf->autogenerated.sticky_sessions_cookie_attributes.data != NULL) {
+        len += sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES: ") - 1;
+        len += conf->autogenerated.sticky_sessions_cookie_attributes.len;
+        len += sizeof("\r\n") - 1;
+    }
+
     if (conf->autogenerated.vary_turbocache_by_cookie.data != NULL) {
         len += sizeof("!~PASSENGER_VARY_TURBOCACHE_BY_COOKIE: ") - 1;
         len += conf->autogenerated.vary_turbocache_by_cookie.len;
@@ -411,6 +423,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: ",
@@ -515,6 +536,15 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
             conf->autogenerated.sticky_sessions_cookie_name.len);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
+    if (conf->autogenerated.sticky_sessions_cookie_attributes.data != NULL) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES: ",
+            sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES: ") - 1);
+        pos = ngx_copy(pos,
+            conf->autogenerated.sticky_sessions_cookie_attributes.data,
+            conf->autogenerated.sticky_sessions_cookie_attributes.len);
+        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+    }
     if (conf->autogenerated.vary_turbocache_by_cookie.data != NULL) {
         pos = ngx_copy(pos,
             "!~PASSENGER_VARY_TURBOCACHE_BY_COOKIE: ",

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);
@@ -582,6 +596,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.buffer_upload_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_buffer_upload",
+            sizeof("passenger_buffer_upload") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.buffer_upload_source_file,
+            plcf->autogenerated.buffer_upload_source_line);
+        psg_json_value_set_bool(hierarchy_member, "value",
+            plcf->autogenerated.buffer_upload);
+    }
     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);
@@ -609,6 +636,20 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
             (const char *) plcf->autogenerated.sticky_sessions_cookie_name.data,
             plcf->autogenerated.sticky_sessions_cookie_name.len);
     }
+    if (plcf->autogenerated.sticky_sessions_cookie_attributes_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_sticky_sessions_cookie_attributes",
+            sizeof("passenger_sticky_sessions_cookie_attributes") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.sticky_sessions_cookie_attributes_source_file,
+            plcf->autogenerated.sticky_sessions_cookie_attributes_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.sticky_sessions_cookie_attributes.data,
+            plcf->autogenerated.sticky_sessions_cookie_attributes.len);
+    }
     if (plcf->autogenerated.vary_turbocache_by_cookie_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -640,6 +681,7 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
 
     /*
      * No autogenerated code for:
+     * passenger_temp_path
      * passenger_ignore_headers
      * passenger_buffer_size
      * passenger_buffers

data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c

@@ -101,6 +101,9 @@ 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);
@@ -148,12 +151,18 @@ 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->buffer_upload,
+        prev->buffer_upload,
+        0);
     ngx_conf_merge_value(conf->sticky_sessions,
         prev->sticky_sessions,
         0);
     ngx_conf_merge_str_value(conf->sticky_sessions_cookie_name,
         prev->sticky_sessions_cookie_name,
         "_passenger_route");
+    ngx_conf_merge_str_value(conf->sticky_sessions_cookie_attributes,
+        prev->sticky_sessions_cookie_attributes,
+        "SameSite=Lax; Secure;");
     ngx_conf_merge_str_value(conf->vary_turbocache_by_cookie,
         prev->vary_turbocache_by_cookie,
         NULL);

data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h

@@ -41,6 +41,7 @@
 typedef struct {
     ngx_flag_t abort_websockets_on_process_shutdown;
     ngx_array_t *base_uris;
+    ngx_flag_t buffer_upload;
     ngx_flag_t debugger;
     ngx_flag_t enabled;
     ngx_array_t *env_vars;
@@ -64,6 +65,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;
@@ -74,6 +76,7 @@ typedef struct {
     ngx_str_t ruby;
     ngx_str_t spawn_method;
     ngx_str_t startup_file;
+    ngx_str_t sticky_sessions_cookie_attributes;
     ngx_str_t sticky_sessions_cookie_name;
     ngx_str_t user;
     ngx_str_t vary_turbocache_by_cookie;
@@ -86,7 +89,9 @@ typedef struct {
     ngx_str_t app_start_command_source_file;
     ngx_str_t app_type_source_file;
     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;
@@ -113,6 +118,7 @@ typedef struct {
     ngx_str_t start_timeout_source_file;
     ngx_str_t startup_file_source_file;
     ngx_str_t sticky_sessions_source_file;
+    ngx_str_t sticky_sessions_cookie_attributes_source_file;
     ngx_str_t sticky_sessions_cookie_name_source_file;
     ngx_str_t upstream_config_buffer_size_source_file;
     ngx_str_t upstream_config_buffering_source_file;
@@ -124,6 +130,7 @@ typedef struct {
     ngx_str_t upstream_config_pass_headers_source_file;
     ngx_str_t upstream_config_read_timeout_source_file;
     ngx_str_t upstream_config_request_buffering_source_file;
+    ngx_str_t upstream_config_temp_path_source_file;
     ngx_str_t user_source_file;
     ngx_str_t vary_turbocache_by_cookie_source_file;
 
@@ -135,7 +142,9 @@ typedef struct {
     ngx_uint_t app_start_command_source_line;
     ngx_uint_t app_type_source_line;
     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;
@@ -162,6 +171,7 @@ typedef struct {
     ngx_uint_t start_timeout_source_line;
     ngx_uint_t startup_file_source_line;
     ngx_uint_t sticky_sessions_source_line;
+    ngx_uint_t sticky_sessions_cookie_attributes_source_line;
     ngx_uint_t sticky_sessions_cookie_name_source_line;
     ngx_uint_t upstream_config_buffer_size_source_line;
     ngx_uint_t upstream_config_buffering_source_line;
@@ -173,6 +183,7 @@ typedef struct {
     ngx_uint_t upstream_config_pass_headers_source_line;
     ngx_uint_t upstream_config_read_timeout_source_line;
     ngx_uint_t upstream_config_request_buffering_source_line;
+    ngx_uint_t upstream_config_temp_path_source_line;
     ngx_uint_t user_source_line;
     ngx_uint_t vary_turbocache_by_cookie_source_line;
 
@@ -184,7 +195,9 @@ typedef struct {
     ngx_int_t app_start_command_explicitly_set;
     ngx_int_t app_type_explicitly_set;
     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;
@@ -211,6 +224,7 @@ typedef struct {
     ngx_int_t start_timeout_explicitly_set;
     ngx_int_t startup_file_explicitly_set;
     ngx_int_t sticky_sessions_explicitly_set;
+    ngx_int_t sticky_sessions_cookie_attributes_explicitly_set;
     ngx_int_t sticky_sessions_cookie_name_explicitly_set;
     ngx_int_t upstream_config_buffer_size_explicitly_set;
     ngx_int_t upstream_config_buffering_explicitly_set;
@@ -222,6 +236,7 @@ typedef struct {
     ngx_int_t upstream_config_pass_headers_explicitly_set;
     ngx_int_t upstream_config_read_timeout_explicitly_set;
     ngx_int_t upstream_config_request_buffering_explicitly_set;
+    ngx_int_t upstream_config_temp_path_explicitly_set;
     ngx_int_t user_explicitly_set;
     ngx_int_t vary_turbocache_by_cookie_explicitly_set;
 } passenger_autogenerated_loc_conf_t;

data/src/nginx_module/MainConfig/AutoGeneratedCreateFunction.c

@@ -65,6 +65,8 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->prestart_uris = NGX_CONF_UNSET_PTR;
     conf->instance_registry_dir.data = NULL;
     conf->instance_registry_dir.len  = 0;
+    conf->spawn_dir.data = NULL;
+    conf->spawn_dir.len  = 0;
     conf->turbocaching = NGX_CONF_UNSET;
     conf->user_switching = NGX_CONF_UNSET;
     conf->default_user.data = NULL;
@@ -155,6 +157,10 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->instance_registry_dir_source_file.len = 0;
     conf->instance_registry_dir_source_line = 0;
     conf->instance_registry_dir_explicitly_set = 0;
+    conf->spawn_dir_source_file.data = NULL;
+    conf->spawn_dir_source_file.len = 0;
+    conf->spawn_dir_source_line = 0;
+    conf->spawn_dir_explicitly_set = 0;
     conf->turbocaching_source_file.data = NULL;
     conf->turbocaching_source_file.len = 0;
     conf->turbocaching_source_line = 0;