passenger 6.0.6 → 6.0.7

data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c

@@ -280,6 +280,13 @@ set_manifest_autogenerated_app_conf_defaults(manifest_gen_ctx_t *ctx, PsgJsonVal
         "'smart' for Ruby apps, 'direct' for all other apps",
         sizeof("'smart' for Ruby apps, 'direct' for all other apps") - 1);
 
+    add_manifest_options_container_static_default_str(ctx,
+        options_container,
+        "passenger_direct_instance_request_address",
+        sizeof("passenger_direct_instance_request_address") - 1,
+        "127.0.0.1",
+        sizeof("127.0.0.1") - 1);
+
     add_manifest_options_container_static_default_bool(ctx,
         options_container,
         "passenger_load_shell_envvars",

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -685,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;

data/src/nginx_module/Configuration.c

@@ -1095,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/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;
@@ -172,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;

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
@@ -417,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: ",

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);

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);

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;
@@ -90,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;
@@ -142,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;
@@ -194,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;

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,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.6'
+  VERSION_STRING = '6.0.7'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
   PREFERRED_NGINX_VERSION = '1.18.0'
@@ -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,

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -58,6 +58,7 @@ 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"
@@ -116,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

@@ -317,7 +317,11 @@ module PhusionPassenger
         elsif ActiveRecord::Base.respond_to?(:clear_active_connections!)
           ActiveRecord::Base.clear_active_connections!
         end
-        ActiveRecord::Base.establish_connection
+        begin
+          ActiveRecord::Base.establish_connection
+        rescue
+          DebugLogging.debug('ActiveRecord is not configured, start it yourself')
+        end
       end
 
       # Fire off events.

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,

data/src/ruby_supportlib/phusion_passenger/platform_info/apache.rb

@@ -890,7 +890,7 @@ module PhusionPassenger
             # On macOS >= 10.13 High Sierra /usr/include no longer
             # exists.
             xcode_prefix = `/usr/bin/xcode-select -p`.strip
-            ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1" \
+            ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1 " \
              "-I#{xcode_prefix}/SDKs/MacOSX.sdk/usr/include/apr-1",
              '-laprutil-1']
           else

data/src/ruby_supportlib/phusion_passenger/request_handler.rb

@@ -99,7 +99,7 @@ module PhusionPassenger
       if should_use_unix_sockets?
         @main_socket_address, @main_socket = create_unix_socket_on_filesystem(options)
       else
-        @main_socket_address, @main_socket = create_tcp_socket
+        @main_socket_address, @main_socket = create_tcp_socket(options)
       end
       @server_sockets[:main] = {
         :address     => @main_socket_address,
@@ -109,7 +109,7 @@ module PhusionPassenger
         :accept_http_requests => true
       }
 
-      @http_socket_address, @http_socket = create_tcp_socket
+      @http_socket_address, @http_socket = create_tcp_socket(options)
       @server_sockets[:http] = {
         :address     => @http_socket_address,
         :socket      => @http_socket,
@@ -309,16 +309,17 @@ module PhusionPassenger
       end
     end
 
-    def create_tcp_socket
-      # We use "0.0.0.0" as address in order to force
+    def create_tcp_socket(options)
+      # We default to "127.0.0.1" as address in order to force
       # TCPv4 instead of TCPv6.
-      socket = TCPServer.new('0.0.0.0', 0)
+      bind_address = options.fetch('bind_address', '127.0.0.1')
+      socket = TCPServer.new(bind_address, 0)
       socket.listen(BACKLOG_SIZE)
       socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       socket.binmode
       socket.sync = true
       socket.close_on_exec!
-      socket_address = "tcp://127.0.0.1:#{socket.addr[1]}"
+      socket_address = "tcp://#{bind_address}:#{socket.addr[1]}"
       return [socket_address, socket]
     end
 

data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb

@@ -258,6 +258,13 @@ module PhusionPassenger
         :default   => PlatformInfo.ruby_supports_fork? ? DEFAULT_SPAWN_METHOD : 'direct',
         :desc      => 'The spawn method to use. Default: see docs'
       },
+      {
+        :name      => :direct_instance_request_address,
+        :type      => :hostname,
+        :type_desc => 'HOST',
+        :default   => '127.0.0.1',
+        :desc      => "The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.\nDefault: %DEFAULT%"
+      },
       {
         :name      => :static_files_dir,
         :type      => :path,

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb

@@ -231,7 +231,7 @@ module PhusionPassenger
             abort "The '#{option_name}' feature is only available in #{PROGRAM_NAME} " +
               "Enterprise. You are currently running the open source #{PROGRAM_NAME}. " +
               "Please learn more about and/or buy #{PROGRAM_NAME} Enterprise at " +
-              "https://www.phusionpassenger.com/enterprise"
+              "https://www.phusionpassenger.com/features#premium-features"
           end
         end
 
@@ -240,7 +240,7 @@ module PhusionPassenger
             abort "The '#{option_name}' feature is only available in #{PROGRAM_NAME} " +
               "Enterprise. You are currently running the open source #{PROGRAM_NAME}. " +
               "Please learn more about and/or buy #{PROGRAM_NAME} Enterprise at " +
-              "https://www.phusionpassenger.com/enterprise"
+              "https://www.phusionpassenger.com/features#premium-features"
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.0.7
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -4445,7 +4445,7 @@ homepage: https://www.phusionpassenger.com/
 licenses: []
 metadata:
   bug_tracker_uri: https://github.com/phusion/passenger/issues
-  changelog_uri: https://github.com/phusion/passenger/blob/stable-6.0.6/CHANGELOG
+  changelog_uri: https://github.com/phusion/passenger/blob/stable-6.0/CHANGELOG
   documentation_uri: https://www.phusionpassenger.com/docs/
   homepage_uri: https://www.phusionpassenger.com/
   source_code_uri: https://github.com/phusion/passenger