passenger 6.0.3 → 6.0.7

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)
 
@@ -1091,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

@@ -1824,8 +1824,6 @@ passenger_content_handler(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    //u->pipe->temp_file->path = u->conf->temp_path;
-
     u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
     u->pipe->input_ctx = r;
 

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;
@@ -93,6 +95,8 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     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;
@@ -170,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;
@@ -218,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;
@@ -286,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);
@@ -622,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);
@@ -653,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);
@@ -157,6 +160,9 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     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

@@ -65,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;
@@ -75,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;
@@ -89,6 +91,7 @@ typedef struct {
     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;
@@ -115,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;
@@ -126,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;
 
@@ -139,6 +144,7 @@ typedef struct {
     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;
@@ -165,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;
@@ -176,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;
 
@@ -189,6 +197,7 @@ typedef struct {
     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;
@@ -215,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;
@@ -226,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/ngx_http_passenger_module.c

@@ -43,9 +43,9 @@
 
 #define MODP_B64_DONT_INCLUDE_BOOST_ENDIANNESS_HEADERS
 #if NGX_HAVE_LITTLE_ENDIAN
-    #define BOOST_LITTLE_ENDIAN
+    #define BOOST_ENDIAN_LITTLE_BYTE
 #else
-    #define BOOST_BIG_ENDIAN
+    #define BOOST_ENDIAN_BIG_BYTE
 #endif
 
 #include "ngx_http_passenger_module.h"

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,20 +31,20 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.3'
+  VERSION_STRING = '6.0.7'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
-  PREFERRED_NGINX_VERSION = '1.17.3'
-  NGINX_SHA256_CHECKSUM = '3b84fe1c2cf9ca22fde370e486a9ab16b6427df1b6ea62cdb61978c9f34d0f3c'
+  PREFERRED_NGINX_VERSION = '1.18.0'
+  NGINX_SHA256_CHECKSUM = '4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99'
 
   # Packaging may be locked to an older version due to the specific module configuration being
   # incompatible with the version we prefer (latest stable).
-  PACKAGING_PREFERRED_NGINX_VERSION = '1.17.3'
-  PACKAGING_NGINX_SHA256_CHECKSUM = '3b84fe1c2cf9ca22fde370e486a9ab16b6427df1b6ea62cdb61978c9f34d0f3c'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.18.0'
+  PACKAGING_NGINX_SHA256_CHECKSUM = '4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99'
 
   # sha256sum of the .tar.gz
-  PREFERRED_PCRE_VERSION  = '8.43'
-  PCRE_SHA256_CHECKSUM = '0b8e7465dc5e98c757cc3650a20a7843ee4c3edf50aaf60bb33fd879690d2c73'
+  PREFERRED_PCRE_VERSION  = '8.44'
+  PCRE_SHA256_CHECKSUM = 'aecafd4af3bd0f3935721af77b889d9024b2e01d96b58471bd91a3063fb47728'
 
   STANDALONE_INTERFACE_VERSION  = 1
 
@@ -258,7 +258,7 @@ module PhusionPassenger
   end
 
 
-private
+  private
   def self.infer_install_spec
     filename = ENV['PASSENGER_LOCATION_CONFIGURATION_FILE']
     return filename if filename && !filename.empty?

data/src/ruby_supportlib/phusion_passenger/admin_tools/memory_stats.rb

@@ -294,7 +294,7 @@ module PhusionPassenger
         else
           return total
         end
-      rescue Errno::EACCES, Errno::ENOENT
+      rescue Errno::EACCES, Errno::ENOENT, Errno::ESRCH
         return nil
       end
 

data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb

@@ -444,6 +444,12 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :desc      => 'The spawn method to use.',
     :function  => 'cmd_passenger_spawn_method'
   },
+  {
+    :name      => 'PassengerDirectInstanceRequestAddress',
+    :type      => :string,
+    :default   => DEFAULT_BIND_ADDRESS,
+    :desc      => 'The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.'
+  },
   {
     :name      => 'PassengerFriendlyErrorPages',
     :type      => :flag,
@@ -547,6 +553,15 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :default_expr => 'DEFAULT_STICKY_SESSIONS_COOKIE_NAME',
     :desc      => 'The cookie name to use for sticky sessions.'
   },
+  {
+    :name      => 'PassengerStickySessionsCookieAttributes',
+    :type      => :string,
+    :context   => :location,
+    :htaccess_context => ['OR_ALL'],
+    :default   => DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES,
+    :default_expr => 'DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES',
+    :desc      => 'The attributes to use for the sticky session cookie.'
+  },
   {
     :name      => 'PassengerBufferResponse',
     :type      => :flag,

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -58,10 +58,12 @@ module PhusionPassenger
     DEFAULT_WEB_APP_USER = "nobody"
     DEFAULT_APP_ENV = "production"
     DEFAULT_SPAWN_METHOD = "smart"
+    DEFAULT_BIND_ADDRESS = "127.0.0.1"
     # Apache's unixd.h also defines DEFAULT_USER, so we avoid naming clash here.
     PASSENGER_DEFAULT_USER = "nobody"
     DEFAULT_CONCURRENCY_MODEL = "process"
     DEFAULT_STICKY_SESSIONS_COOKIE_NAME = "_passenger_route"
+    DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES = "SameSite=Lax; Secure;"
     DEFAULT_APP_THREAD_COUNT = 1
     DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK = 1024 * 1024 * 128
     DEFAULT_MAX_REQUEST_QUEUE_SIZE = 100
@@ -115,7 +117,7 @@ module PhusionPassenger
     PROGRAM_WEBSITE     = "https://www.phusionpassenger.com"
     PROGRAM_AUTHOR      = "Phusion"
     SUPPORT_URL         = "https://www.phusionpassenger.com/support"
-    ENTERPRISE_URL      = "https://www.phusionpassenger.com/enterprise"
+    ENTERPRISE_URL      = "https://www.phusionpassenger.com/features#premium-features"
     GLOBAL_NAMESPACE_DIRNAME            = PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME_
     # Subdirectory under $HOME to use for storing stuff.
     USER_NAMESPACE_DIRNAME              = PhusionPassenger::USER_NAMESPACE_DIRNAME_

data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb

@@ -316,9 +316,11 @@ module PhusionPassenger
           ActiveRecord::Base.clear_all_connections!
         elsif ActiveRecord::Base.respond_to?(:clear_active_connections!)
           ActiveRecord::Base.clear_active_connections!
-        elsif ActiveRecord::Base.respond_to?(:connected?) &&
-              ActiveRecord::Base.connected?
+        end
+        begin
           ActiveRecord::Base.establish_connection
+        rescue
+          DebugLogging.debug('ActiveRecord is not configured, start it yourself')
         end
       end
 

data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb

@@ -476,6 +476,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :dynamic_default => "'smart' for Ruby apps, 'direct' for all other apps",
     :type     => :string
   },
+  {
+    :name     => 'passenger_direct_instance_request_address',
+    :scope    => :application,
+    :default  => DEFAULT_BIND_ADDRESS,
+    :type     => :string
+  },
   {
     :name     => 'passenger_load_shell_envvars',
     :scope    => :application,
@@ -556,6 +562,14 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :header   => nil
   },
+  {
+    :name     => 'passenger_temp_path',
+    :scope    => :location,
+    :type     => :string,
+    :function => 'ngx_conf_set_path_slot',
+    :field    => 'upstream_config.temp_path',
+    :auto_generate_nginx_tracking_code => false
+  },
   {
     :name     => 'passenger_ignore_headers',
     :scope    => :location,
@@ -681,6 +695,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :default  => DEFAULT_STICKY_SESSIONS_COOKIE_NAME
   },
+  {
+    :name     => 'passenger_sticky_sessions_cookie_attributes',
+    :scope    => :location,
+    :type     => :string,
+    :default  => DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES
+  },
   {
     :name     => 'passenger_vary_turbocache_by_cookie',
     :scope    => :location,