passenger 6.0.0 → 6.0.5

data/src/nginx_module/Configuration.c

@@ -577,10 +577,14 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                                        |NGX_HTTP_UPSTREAM_FT_OFF;
     }
 
-    ngx_conf_merge_path_value(cf,
+    if (ngx_conf_merge_path_value(cf,
                               &conf->upstream_config.temp_path,
                               prev->upstream_config.temp_path,
-                              &ngx_http_proxy_temp_path);
+                              &ngx_http_proxy_temp_path)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
 
 #if (NGX_HTTP_CACHE)
 
@@ -831,7 +835,7 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
                 return NGX_ERROR;
             }
 
-            copy->code = (ngx_http_script_code_pt)
+            copy->code = (ngx_http_script_code_pt) (void *)
                                                  ngx_http_script_copy_len_code;
             copy->len = src[i].key.len + sizeof(": ") - 1
                         + src[i].value.len + sizeof(CRLF) - 1;
@@ -866,7 +870,7 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
                 return NGX_ERROR;
             }
 
-            copy->code = (ngx_http_script_code_pt)
+            copy->code = (ngx_http_script_code_pt) (void *)
                                                  ngx_http_script_copy_len_code;
             copy->len = src[i].key.len + sizeof(": ") - 1;
 
@@ -907,7 +911,7 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
                 return NGX_ERROR;
             }
 
-            copy->code = (ngx_http_script_code_pt)
+            copy->code = (ngx_http_script_code_pt) (void *)
                                                  ngx_http_script_copy_len_code;
             copy->len = sizeof(CRLF) - 1;
 

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

@@ -89,9 +89,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;
@@ -217,6 +220,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 +280,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 +292,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

@@ -238,6 +238,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;
@@ -515,6 +521,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

@@ -582,6 +582,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 +622,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 +667,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

@@ -148,12 +148,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;
@@ -74,6 +75,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,6 +88,7 @@ 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 document_root_source_file;
     ngx_str_t enabled_source_file;
@@ -113,6 +116,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 +128,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,6 +140,7 @@ 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 document_root_source_line;
     ngx_uint_t enabled_source_line;
@@ -162,6 +168,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 +180,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,6 +192,7 @@ 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 document_root_explicitly_set;
     ngx_int_t enabled_explicitly_set;
@@ -211,6 +220,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 +232,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

@@ -49,6 +49,7 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->log_level = NGX_CONF_UNSET_UINT;
     conf->log_file.data = NULL;
     conf->log_file.len  = 0;
+    conf->disable_log_prefix = NGX_CONF_UNSET;
     conf->file_descriptor_log_file.data = NULL;
     conf->file_descriptor_log_file.len  = 0;
     conf->data_buffer_dir.data = NULL;
@@ -64,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;
@@ -110,6 +113,10 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->log_file_source_file.len = 0;
     conf->log_file_source_line = 0;
     conf->log_file_explicitly_set = 0;
+    conf->disable_log_prefix_source_file.data = NULL;
+    conf->disable_log_prefix_source_file.len = 0;
+    conf->disable_log_prefix_source_line = 0;
+    conf->disable_log_prefix_explicitly_set = 0;
     conf->file_descriptor_log_file_source_file.data = NULL;
     conf->file_descriptor_log_file_source_file.len = 0;
     conf->file_descriptor_log_file_source_line = 0;
@@ -150,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;

data/src/nginx_module/MainConfig/AutoGeneratedManifestGeneration.c

@@ -113,6 +113,17 @@ generate_config_manifest_for_autogenerated_main_conf(manifest_gen_ctx_t *ctx, pa
             (const char *) conf->autogenerated.log_file.data,
             conf->autogenerated.log_file.len);
     }
+    if (conf->autogenerated.disable_log_prefix_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_disable_log_prefix",
+            sizeof("passenger_disable_log_prefix") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.disable_log_prefix_source_file,
+            conf->autogenerated.disable_log_prefix_source_line);
+        psg_json_value_set_bool(hierarchy_member, "value",
+            conf->autogenerated.disable_log_prefix);
+    }
     if (conf->autogenerated.file_descriptor_log_file_explicitly_set) {
         option_container = find_or_create_manifest_option_container(ctx,
             ctx->global_config_container,
@@ -228,6 +239,18 @@ generate_config_manifest_for_autogenerated_main_conf(manifest_gen_ctx_t *ctx, pa
             (const char *) conf->autogenerated.instance_registry_dir.data,
             conf->autogenerated.instance_registry_dir.len);
     }
+    if (conf->autogenerated.spawn_dir_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_spawn_dir",
+            sizeof("passenger_spawn_dir") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.spawn_dir_source_file,
+            conf->autogenerated.spawn_dir_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) conf->autogenerated.spawn_dir.data,
+            conf->autogenerated.spawn_dir.len);
+    }
     if (conf->autogenerated.turbocaching_explicitly_set) {
         option_container = find_or_create_manifest_option_container(ctx,
             ctx->global_config_container,

data/src/nginx_module/MainConfig/AutoGeneratedStruct.h

@@ -44,6 +44,7 @@ typedef struct {
     ngx_uint_t core_file_descriptor_ulimit;
     ngx_array_t *ctl;
     ngx_flag_t disable_anonymous_telemetry;
+    ngx_flag_t disable_log_prefix;
     ngx_flag_t disable_security_update_check;
     ngx_uint_t log_level;
     ngx_uint_t max_instances_per_app;
@@ -70,6 +71,7 @@ typedef struct {
     ngx_str_t log_file;
     ngx_str_t root_dir;
     ngx_str_t security_update_check_proxy;
+    ngx_str_t spawn_dir;
 
     ngx_str_t abort_on_startup_error_source_file;
     ngx_str_t admin_panel_auth_type_source_file;
@@ -84,6 +86,7 @@ typedef struct {
     ngx_str_t default_group_source_file;
     ngx_str_t default_user_source_file;
     ngx_str_t disable_anonymous_telemetry_source_file;
+    ngx_str_t disable_log_prefix_source_file;
     ngx_str_t disable_security_update_check_source_file;
     ngx_str_t dump_config_manifest_source_file;
     ngx_str_t file_descriptor_log_file_source_file;
@@ -99,6 +102,7 @@ typedef struct {
     ngx_str_t security_update_check_proxy_source_file;
     ngx_str_t show_version_in_header_source_file;
     ngx_str_t socket_backlog_source_file;
+    ngx_str_t spawn_dir_source_file;
     ngx_str_t stat_throttle_rate_source_file;
     ngx_str_t turbocaching_source_file;
     ngx_str_t user_switching_source_file;
@@ -116,6 +120,7 @@ typedef struct {
     ngx_uint_t default_group_source_line;
     ngx_uint_t default_user_source_line;
     ngx_uint_t disable_anonymous_telemetry_source_line;
+    ngx_uint_t disable_log_prefix_source_line;
     ngx_uint_t disable_security_update_check_source_line;
     ngx_uint_t dump_config_manifest_source_line;
     ngx_uint_t file_descriptor_log_file_source_line;
@@ -131,6 +136,7 @@ typedef struct {
     ngx_uint_t security_update_check_proxy_source_line;
     ngx_uint_t show_version_in_header_source_line;
     ngx_uint_t socket_backlog_source_line;
+    ngx_uint_t spawn_dir_source_line;
     ngx_uint_t stat_throttle_rate_source_line;
     ngx_uint_t turbocaching_source_line;
     ngx_uint_t user_switching_source_line;
@@ -148,6 +154,7 @@ typedef struct {
     ngx_int_t default_group_explicitly_set;
     ngx_int_t default_user_explicitly_set;
     ngx_int_t disable_anonymous_telemetry_explicitly_set;
+    ngx_int_t disable_log_prefix_explicitly_set;
     ngx_int_t disable_security_update_check_explicitly_set;
     ngx_int_t dump_config_manifest_explicitly_set;
     ngx_int_t file_descriptor_log_file_explicitly_set;
@@ -163,6 +170,7 @@ typedef struct {
     ngx_int_t security_update_check_proxy_explicitly_set;
     ngx_int_t show_version_in_header_explicitly_set;
     ngx_int_t socket_backlog_explicitly_set;
+    ngx_int_t spawn_dir_explicitly_set;
     ngx_int_t stat_throttle_rate_explicitly_set;
     ngx_int_t turbocaching_explicitly_set;
     ngx_int_t user_switching_explicitly_set;

data/src/nginx_module/ngx_http_passenger_module.c

@@ -362,10 +362,12 @@ start_watchdog(ngx_cycle_t *cycle) {
     psg_json_value_set_value     (w_config, "config_manifest", -1, passenger_main_conf.manifest);
     psg_json_value_set_ngx_uint  (w_config, "log_level", autogenerated_main_conf->log_level);
     psg_json_value_set_ngx_str_ne(w_config, "file_descriptor_log_target", &autogenerated_main_conf->file_descriptor_log_file);
+    psg_json_value_set_ngx_flag  (w_config, "disable_log_prefix", autogenerated_main_conf->disable_log_prefix);
     psg_json_value_set_ngx_uint  (w_config, "core_file_descriptor_ulimit", autogenerated_main_conf->core_file_descriptor_ulimit);
     psg_json_value_set_ngx_uint  (w_config, "controller_socket_backlog", autogenerated_main_conf->socket_backlog);
     psg_json_value_set_ngx_str_ne(w_config, "controller_file_buffered_channel_buffer_dir", &autogenerated_main_conf->data_buffer_dir);
     psg_json_value_set_ngx_str_ne(w_config, "instance_registry_dir", &autogenerated_main_conf->instance_registry_dir);
+    psg_json_value_set_ngx_str_ne(w_config, "spawn_dir", &autogenerated_main_conf->spawn_dir);
     psg_json_value_set_ngx_flag  (w_config, "security_update_checker_disabled", autogenerated_main_conf->disable_security_update_check);
     psg_json_value_set_ngx_str_ne(w_config, "security_update_checker_proxy_url", &autogenerated_main_conf->security_update_check_proxy);
     psg_json_value_set_ngx_flag  (w_config, "telemetry_collector_disabled", autogenerated_main_conf->disable_anonymous_telemetry);

data/src/ruby_native_extension/extconf.rb

@@ -21,6 +21,13 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
+
+# Apple has a habit of getting their Ruby headers wrong, so if we are building using system ruby we need to patch things up, sierra & mojave both did this.
+# eg https://openradar.appspot.com/46465917
+if RUBY_PLATFORM =~ /darwin/ && !File.exists?(RbConfig::CONFIG["rubyarchhdrdir"])
+  RbConfig::CONFIG["rubyarchhdrdir"].sub!(RUBY_PLATFORM.split('-').last, Dir.entries(File.dirname(RbConfig::CONFIG["rubyarchhdrdir"])).reject{|d|d.start_with?(".","ruby")}.first.split('-').last)
+end
+
 require 'mkmf'
 
 $LIBS << " -lpthread" if $LIBS !~ /-lpthread/