passenger 6.0.8 → 6.0.12

data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c

@@ -670,6 +670,14 @@
     offsetof(passenger_loc_conf_t, autogenerated.request_queue_overflow_status_code),
     NULL
 },
+{
+    ngx_string("passenger_spawn_exception_status_code"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_spawn_exception_status_code,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, autogenerated.spawn_exception_status_code),
+    NULL
+},
 {
     ngx_string("passenger_buffer_upload"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,

data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c

@@ -418,6 +418,12 @@ set_manifest_autogenerated_loc_conf_defaults(manifest_gen_ctx_t *ctx, PsgJsonVal
         sizeof("passenger_request_queue_overflow_status_code") - 1,
         503);
 
+    add_manifest_options_container_static_default_int(ctx,
+        options_container,
+        "passenger_spawn_exception_status_code",
+        sizeof("passenger_spawn_exception_status_code") - 1,
+        500);
+
     add_manifest_options_container_static_default_bool(ctx,
         options_container,
         "passenger_buffer_upload",

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -937,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_spawn_exception_status_code(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.spawn_exception_status_code_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.spawn_exception_status_code_source_file,
+        &passenger_conf->autogenerated.spawn_exception_status_code_source_line);
+
+    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;

data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c

@@ -91,6 +91,7 @@ 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->spawn_exception_status_code = NGX_CONF_UNSET;
     conf->buffer_upload = NGX_CONF_UNSET;
     conf->sticky_sessions = NGX_CONF_UNSET;
     conf->sticky_sessions_cookie_name.data = NULL;
@@ -286,6 +287,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->spawn_exception_status_code_source_file.data = NULL;
+    conf->spawn_exception_status_code_source_file.len = 0;
+    conf->spawn_exception_status_code_source_line = 0;
+    conf->spawn_exception_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;

data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c

@@ -231,6 +231,16 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         len += sizeof("\r\n") - 1;
     }
 
+    if (conf->autogenerated.spawn_exception_status_code != NGX_CONF_UNSET) {
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%d",
+            conf->autogenerated.spawn_exception_status_code);
+        len += sizeof("!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE: ") - 1;
+        len += end - int_buf;
+        len += sizeof("\r\n") - 1;
+    }
+
     if (conf->autogenerated.sticky_sessions != NGX_CONF_UNSET) {
         len += sizeof("!~PASSENGER_STICKY_SESSIONS: ") - 1;
         len += conf->autogenerated.sticky_sessions
@@ -516,6 +526,17 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
+    if (conf->autogenerated.spawn_exception_status_code != NGX_CONF_UNSET) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE: ",
+            sizeof("!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE: ") - 1);
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%d",
+            conf->autogenerated.spawn_exception_status_code);
+        pos = ngx_copy(pos, int_buf, end - int_buf);
+        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+    }
     if (conf->autogenerated.sticky_sessions != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_STICKY_SESSIONS: ",

data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c

@@ -596,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.spawn_exception_status_code_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_spawn_exception_status_code",
+            sizeof("passenger_spawn_exception_status_code") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.spawn_exception_status_code_source_file,
+            plcf->autogenerated.spawn_exception_status_code_source_line);
+        psg_json_value_set_int(hierarchy_member, "value",
+            plcf->autogenerated.spawn_exception_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);

data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c

@@ -151,6 +151,9 @@ 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->spawn_exception_status_code,
+        prev->spawn_exception_status_code,
+        500);
     ngx_conf_merge_value(conf->buffer_upload,
         prev->buffer_upload,
         0);

data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h

@@ -57,6 +57,7 @@ typedef struct {
     ngx_uint_t min_instances;
     ngx_array_t *monitor_log_file;
     ngx_int_t request_queue_overflow_status_code;
+    ngx_int_t spawn_exception_status_code;
     ngx_uint_t start_timeout;
     ngx_flag_t sticky_sessions;
     ngx_str_t app_group_name;
@@ -114,6 +115,7 @@ typedef struct {
     ngx_str_t request_queue_overflow_status_code_source_file;
     ngx_str_t restart_dir_source_file;
     ngx_str_t ruby_source_file;
+    ngx_str_t spawn_exception_status_code_source_file;
     ngx_str_t spawn_method_source_file;
     ngx_str_t start_timeout_source_file;
     ngx_str_t startup_file_source_file;
@@ -167,6 +169,7 @@ typedef struct {
     ngx_uint_t request_queue_overflow_status_code_source_line;
     ngx_uint_t restart_dir_source_line;
     ngx_uint_t ruby_source_line;
+    ngx_uint_t spawn_exception_status_code_source_line;
     ngx_uint_t spawn_method_source_line;
     ngx_uint_t start_timeout_source_line;
     ngx_uint_t startup_file_source_line;
@@ -220,6 +223,7 @@ typedef struct {
     ngx_int_t request_queue_overflow_status_code_explicitly_set;
     ngx_int_t restart_dir_explicitly_set;
     ngx_int_t ruby_explicitly_set;
+    ngx_int_t spawn_exception_status_code_explicitly_set;
     ngx_int_t spawn_method_explicitly_set;
     ngx_int_t start_timeout_explicitly_set;
     ngx_int_t startup_file_explicitly_set;

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

@@ -104,8 +104,9 @@ module PhusionPassenger
         # as the instance registry dir. See https://github.com/phusion/passenger/issues/1475
         #
         # systemd's PrivateTmp feature works like an inverted OSX, apache gets its own
-        # TMPDIR and users use /tmp
-        [string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg",*Dir['/tmp/systemd-private-*-{httpd,nginx}.service-*/tmp']].compact
+        # TMPDIR and users use /tmp, however the path is often too long because socket paths can
+        # only be up to 108 characters long.
+        [string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg",*Dir['/tmp/systemd-private-*-{httpd,nginx,apache2}.service-*/tmp']].compact
       end
 
       def string_env(name)

data/src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb

@@ -32,6 +32,7 @@ PhusionPassenger.require_passenger_lib 'config/installation_utils'
 PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'platform_info/openssl'
+PhusionPassenger.require_passenger_lib 'platform_info/pcre'
 PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 PhusionPassenger.require_passenger_lib 'utils/shellwords'
 PhusionPassenger.require_passenger_lib 'utils/progress_bar'
@@ -44,10 +45,10 @@ module PhusionPassenger
       include InstallationUtils
 
       def self.configure_script_options
-        extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags}".strip
+        extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags} #{PlatformInfo.pcre_extra_cflags}".strip
         result = "--with-cc-opt=#{Shellwords.escape extra_cflags} "
 
-        extra_ldflags = PlatformInfo.openssl_extra_ldflags
+        extra_ldflags = "#{PlatformInfo.openssl_extra_ldflags} #{PlatformInfo.pcre_extra_ldflags}".strip
         if !extra_ldflags.empty?
           result << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
         end

data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb

@@ -310,7 +310,7 @@ module PhusionPassenger
       end
 
       # If we were forked from a preloader process then clear or
-      # re-establish ActiveRecord database connections. This prevents
+      # re-establish ActiveRecord/Mongoid database connections. This prevents
       # child processes from concurrently accessing the same
       # database connection handles.
       if forked
@@ -327,6 +327,13 @@ module PhusionPassenger
           end
         end
 
+        if defined?(Mongoid::Clients)
+          Mongoid::Clients.clients.each do |name, client|
+            client.close
+            client.reconnect
+          end
+        end
+
         if defined?(Sequel)
           Sequel::DATABASES.each(&:disconnect)
         end

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

@@ -676,6 +676,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :integer,
     :default  => 503
   },
+  {
+    :name     => 'passenger_spawn_exception_status_code',
+    :scope    => :location,
+    :type     => :integer,
+    :default  => 500
+  },
   {
     :name     => 'passenger_buffer_upload',
     :type     => :flag,

data/src/ruby_supportlib/phusion_passenger/packaging.rb

@@ -93,6 +93,7 @@ module PhusionPassenger
       '.settings/**/*',
       '.vscode/**/*',
       '.cproject',
+      'compile_commands.json',
       '.gitattributes',
       '.gitignore',
       '.gitmodules',

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

@@ -64,14 +64,16 @@ module PhusionPassenger
         if RUBY_PLATFORM =~ /universal/
           ruby_arch = "universal"
         else
-          # OS X <  10.8: something like:
+          # OS X often prints something like:
           #   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable x86_64"
-          output = `file -L "#{ruby_executable}"`.strip
-          ruby_arch = output.sub(/.* /, '')
+          output = `file -L "#{ruby_executable}"`.lines.first.strip
+          ruby_arch = output.split.last
           if ruby_arch == "executable"
-            # OS X >= 10.8: something like:
+            # some OS X print something like:
             #   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable"
-            if output =~ /Mach-O 64-bit/
+            if output =~ /arm64/
+              ruby_arch = "arm"
+            elsif output =~ /Mach-O 64-bit/
               ruby_arch = "x86_64"
             else
               raise "Cannot autodetect the Ruby interpreter's architecture"
@@ -112,26 +114,28 @@ module PhusionPassenger
       if os_name_simple == "macosx"
         # RUBY_PLATFORM gives us the kernel version, but we want
         # the OS X version.
-        os_version_string = `sw_vers -productVersion`.strip
         # sw_vers returns something like "10.6.2". We're only
         # interested in the first two digits (MAJOR.MINOR) since
         # tiny releases tend to be binary compatible with each
-        # other.
-        components = os_version_string.split(".")
-        os_version = "#{components[0]}.#{components[1]}"
-        os_runtime = os_version
-
-        os_arch = cpu_architectures[0]
-        if os_version >= "10.5" && os_arch =~ /^i.86$/
-          # On Snow Leopard, 'uname -m' returns i386 but
-          # we *know* that everything is x86_64 by default.
-          os_arch = "x86_64"
-        end
+        # other. After macOS 10.15 Apple switched to bumping major
+        # versions (like 11.0, 12.0) so we need to look at that.
+        # However, if the env var SYSTEM_VERSION_COMPAT=1 then
+        # macOS 11 reports as 10.16 (and so on), so we need to deal with that too.
+        major, minor, *rest = os_version.split(".").map(&:to_i)
+        os_version_string = if major >= 11
+                       major
+                     elsif minor >= 16
+                       # 10.16 -> 11
+                       # 10.17 -> 12
+                       minor - 5
+                     else
+                       "#{major}.#{minor}"
+                     end
+        os_runtime = os_version_string.to_s
       else
-        os_arch = cpu_architectures[0]
         os_runtime = nil
       end
-
+      os_arch = cpu_architectures[0]
       return [os_arch, os_name_simple, os_runtime].compact.join("-")
     end
     memoize :cxx_binary_compatibility_id

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

@@ -44,6 +44,9 @@ module PhusionPassenger
 
     def self.curl_libs
       result = `(curl-config --libs) 2>/dev/null`.strip
+      if os_name_simple == "macosx"
+        result << ' -framework Foundation -framework SystemConfiguration'
+      end
       if result.empty?
         return nil
       else

data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/libs.rb

@@ -115,7 +115,8 @@ define 'pcre-dev' do
   name "PCRE development headers"
   website "http://www.pcre.org/"
   define_checker do
-    check_for_header('pcre.h')
+    check_for_header('pcre.h', :c,
+      PlatformInfo.pcre_extra_cflags)
   end
 
   on :debian do
@@ -124,4 +125,7 @@ define 'pcre-dev' do
   on :redhat do
     yum_install 'pcre-devel'
   end
-end
+  on :macosx do
+    brew_install "pcre"
+  end
+end

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

@@ -37,6 +37,9 @@ module PhusionPassenger
         elsif File.exist?("/usr/local/opt/openssl/include")
           # Use the one from Homebrew.
           "-I/usr/local/opt/openssl/include"
+        elsif File.exist?("/opt/homebrew/opt/openssl/include")
+          # Use the one from Homebrew on Apple Silicon
+          "-I/opt/homebrew/opt/openssl/include"
         else
           # Use the one from Macports.
           "-I/opt/local/include"
@@ -53,6 +56,8 @@ module PhusionPassenger
           ""
         elsif File.exist?("/usr/local/opt/openssl/include")
           "-L/usr/local/opt/openssl/lib"
+        elsif File.exist?("/opt/homebrew/opt/openssl/include")
+          "-L/opt/homebrew/opt/openssl/lib"
         else
           "-L/opt/local/lib"
         end