passenger 6.0.26 → 6.1.0

data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c

@@ -169,6 +169,19 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         psg_json_value_set_uint(hierarchy_member, "value",
             plcf->autogenerated.start_timeout);
     }
+    if (plcf->autogenerated.app_connect_timeout_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_app_connect_timeout",
+            sizeof("passenger_app_connect_timeout") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.app_connect_timeout_source_file,
+            plcf->autogenerated.app_connect_timeout_source_line);
+        psg_json_value_set_uint(hierarchy_member, "value",
+            plcf->autogenerated.app_connect_timeout);
+    }
     if (plcf->autogenerated.user_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

@@ -70,6 +70,9 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_uint_value(conf->start_timeout,
         prev->start_timeout,
         90);
+    ngx_conf_merge_uint_value(conf->app_connect_timeout,
+        prev->app_connect_timeout,
+        30);
     ngx_conf_merge_str_value(conf->user,
         prev->user,
         NULL);

data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h

@@ -40,6 +40,7 @@
 
 typedef struct {
     ngx_flag_t abort_websockets_on_process_shutdown;
+    ngx_uint_t app_connect_timeout;
     ngx_array_t *base_uris;
     ngx_flag_t buffer_upload;
     ngx_flag_t debugger;
@@ -85,6 +86,7 @@ typedef struct {
     ngx_str_t vary_turbocache_by_cookie;
 
     ngx_str_t abort_websockets_on_process_shutdown_source_file;
+    ngx_str_t app_connect_timeout_source_file;
     ngx_str_t app_group_name_source_file;
     ngx_str_t app_log_file_source_file;
     ngx_str_t app_rights_source_file;
@@ -141,6 +143,7 @@ typedef struct {
     ngx_str_t vary_turbocache_by_cookie_source_file;
 
     ngx_uint_t abort_websockets_on_process_shutdown_source_line;
+    ngx_uint_t app_connect_timeout_source_line;
     ngx_uint_t app_group_name_source_line;
     ngx_uint_t app_log_file_source_line;
     ngx_uint_t app_rights_source_line;
@@ -197,6 +200,7 @@ typedef struct {
     ngx_uint_t vary_turbocache_by_cookie_source_line;
 
     ngx_int_t abort_websockets_on_process_shutdown_explicitly_set;
+    ngx_int_t app_connect_timeout_explicitly_set;
     ngx_int_t app_group_name_explicitly_set;
     ngx_int_t app_log_file_explicitly_set;
     ngx_int_t app_rights_explicitly_set;

data/src/nginx_module/MainConfig/AutoGeneratedCreateFunction.c

@@ -81,14 +81,6 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->show_version_in_header = NGX_CONF_UNSET;
     conf->app_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
     conf->max_instances_per_app = NGX_CONF_UNSET_UINT;
-    conf->admin_panel_url.data = NULL;
-    conf->admin_panel_url.len  = 0;
-    conf->admin_panel_auth_type.data = NULL;
-    conf->admin_panel_auth_type.len  = 0;
-    conf->admin_panel_username.data = NULL;
-    conf->admin_panel_username.len  = 0;
-    conf->admin_panel_password.data = NULL;
-    conf->admin_panel_password.len  = 0;
 
     conf->root_dir_source_file.data = NULL;
     conf->root_dir_source_file.len = 0;
@@ -210,21 +202,5 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->max_instances_per_app_source_file.len = 0;
     conf->max_instances_per_app_source_line = 0;
     conf->max_instances_per_app_explicitly_set = 0;
-    conf->admin_panel_url_source_file.data = NULL;
-    conf->admin_panel_url_source_file.len = 0;
-    conf->admin_panel_url_source_line = 0;
-    conf->admin_panel_url_explicitly_set = 0;
-    conf->admin_panel_auth_type_source_file.data = NULL;
-    conf->admin_panel_auth_type_source_file.len = 0;
-    conf->admin_panel_auth_type_source_line = 0;
-    conf->admin_panel_auth_type_explicitly_set = 0;
-    conf->admin_panel_username_source_file.data = NULL;
-    conf->admin_panel_username_source_file.len = 0;
-    conf->admin_panel_username_source_line = 0;
-    conf->admin_panel_username_explicitly_set = 0;
-    conf->admin_panel_password_source_file.data = NULL;
-    conf->admin_panel_password_source_file.len = 0;
-    conf->admin_panel_password_source_line = 0;
-    conf->admin_panel_password_explicitly_set = 0;
 }
 

data/src/nginx_module/MainConfig/AutoGeneratedManifestGeneration.c

@@ -385,54 +385,6 @@ generate_config_manifest_for_autogenerated_main_conf(manifest_gen_ctx_t *ctx, pa
         psg_json_value_set_uint(hierarchy_member, "value",
             conf->autogenerated.max_instances_per_app);
     }
-    if (conf->autogenerated.admin_panel_url_explicitly_set) {
-        option_container = find_or_create_manifest_option_container(ctx,
-            ctx->global_config_container,
-            "passenger_admin_panel_url",
-            sizeof("passenger_admin_panel_url") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &conf->autogenerated.admin_panel_url_source_file,
-            conf->autogenerated.admin_panel_url_source_line);
-        psg_json_value_set_str(hierarchy_member, "value",
-            (const char *) conf->autogenerated.admin_panel_url.data,
-            conf->autogenerated.admin_panel_url.len);
-    }
-    if (conf->autogenerated.admin_panel_auth_type_explicitly_set) {
-        option_container = find_or_create_manifest_option_container(ctx,
-            ctx->global_config_container,
-            "passenger_admin_panel_auth_type",
-            sizeof("passenger_admin_panel_auth_type") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &conf->autogenerated.admin_panel_auth_type_source_file,
-            conf->autogenerated.admin_panel_auth_type_source_line);
-        psg_json_value_set_str(hierarchy_member, "value",
-            (const char *) conf->autogenerated.admin_panel_auth_type.data,
-            conf->autogenerated.admin_panel_auth_type.len);
-    }
-    if (conf->autogenerated.admin_panel_username_explicitly_set) {
-        option_container = find_or_create_manifest_option_container(ctx,
-            ctx->global_config_container,
-            "passenger_admin_panel_username",
-            sizeof("passenger_admin_panel_username") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &conf->autogenerated.admin_panel_username_source_file,
-            conf->autogenerated.admin_panel_username_source_line);
-        psg_json_value_set_str(hierarchy_member, "value",
-            (const char *) conf->autogenerated.admin_panel_username.data,
-            conf->autogenerated.admin_panel_username.len);
-    }
-    if (conf->autogenerated.admin_panel_password_explicitly_set) {
-        option_container = find_or_create_manifest_option_container(ctx,
-            ctx->global_config_container,
-            "passenger_admin_panel_password",
-            sizeof("passenger_admin_panel_password") - 1);
-        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
-            &conf->autogenerated.admin_panel_password_source_file,
-            conf->autogenerated.admin_panel_password_source_line);
-        psg_json_value_set_str(hierarchy_member, "value",
-            (const char *) conf->autogenerated.admin_panel_password.data,
-            conf->autogenerated.admin_panel_password.len);
-    }
 
     /*
      * No autogenerated code for:

data/src/nginx_module/MainConfig/AutoGeneratedStruct.h

@@ -58,10 +58,6 @@ typedef struct {
     ngx_uint_t stat_throttle_rate;
     ngx_flag_t turbocaching;
     ngx_flag_t user_switching;
-    ngx_str_t admin_panel_auth_type;
-    ngx_str_t admin_panel_password;
-    ngx_str_t admin_panel_url;
-    ngx_str_t admin_panel_username;
     ngx_str_t anonymous_telemetry_proxy;
     ngx_str_t data_buffer_dir;
     ngx_str_t default_group;
@@ -75,10 +71,6 @@ typedef struct {
     ngx_str_t spawn_dir;
 
     ngx_str_t abort_on_startup_error_source_file;
-    ngx_str_t admin_panel_auth_type_source_file;
-    ngx_str_t admin_panel_password_source_file;
-    ngx_str_t admin_panel_url_source_file;
-    ngx_str_t admin_panel_username_source_file;
     ngx_str_t anonymous_telemetry_proxy_source_file;
     ngx_str_t app_file_descriptor_ulimit_source_file;
     ngx_str_t core_file_descriptor_ulimit_source_file;
@@ -110,10 +102,6 @@ typedef struct {
     ngx_str_t user_switching_source_file;
 
     ngx_uint_t abort_on_startup_error_source_line;
-    ngx_uint_t admin_panel_auth_type_source_line;
-    ngx_uint_t admin_panel_password_source_line;
-    ngx_uint_t admin_panel_url_source_line;
-    ngx_uint_t admin_panel_username_source_line;
     ngx_uint_t anonymous_telemetry_proxy_source_line;
     ngx_uint_t app_file_descriptor_ulimit_source_line;
     ngx_uint_t core_file_descriptor_ulimit_source_line;
@@ -145,10 +133,6 @@ typedef struct {
     ngx_uint_t user_switching_source_line;
 
     ngx_int_t abort_on_startup_error_explicitly_set;
-    ngx_int_t admin_panel_auth_type_explicitly_set;
-    ngx_int_t admin_panel_password_explicitly_set;
-    ngx_int_t admin_panel_url_explicitly_set;
-    ngx_int_t admin_panel_username_explicitly_set;
     ngx_int_t anonymous_telemetry_proxy_explicitly_set;
     ngx_int_t app_file_descriptor_ulimit_explicitly_set;
     ngx_int_t core_file_descriptor_ulimit_explicitly_set;

data/src/nginx_module/ngx_http_passenger_module.c

@@ -384,10 +384,6 @@ start_watchdog(ngx_cycle_t *cycle) {
     psg_json_value_set_ngx_uint  (w_config, "max_instances_per_app", autogenerated_main_conf->max_instances_per_app);
     psg_json_value_set_ngx_uint  (w_config, "response_buffer_high_watermark", autogenerated_main_conf->response_buffer_high_watermark);
     psg_json_value_set_ngx_uint  (w_config, "stat_throttle_rate", autogenerated_main_conf->stat_throttle_rate);
-    psg_json_value_set_ngx_str_ne(w_config, "admin_panel_url", &autogenerated_main_conf->admin_panel_url);
-    psg_json_value_set_ngx_str_ne(w_config, "admin_panel_auth_type", &autogenerated_main_conf->admin_panel_auth_type);
-    psg_json_value_set_ngx_str_ne(w_config, "admin_panel_username", &autogenerated_main_conf->admin_panel_username);
-    psg_json_value_set_ngx_str_ne(w_config, "admin_panel_password", &autogenerated_main_conf->admin_panel_password);
 
     if (autogenerated_main_conf->prestart_uris != NGX_CONF_UNSET_PTR) {
         psg_json_value_set_strset(w_config, "prestart_urls", (ngx_str_t *) autogenerated_main_conf->prestart_uris->elts,

data/src/ruby_native_extension/passenger_native_support.c

@@ -577,6 +577,22 @@ fs_watcher_free(void *obj) {
 	free(watcher);
 }
 
+static size_t
+fs_watcher_size(const void *obj) {
+	return sizeof(FSWatcher);
+}
+
+static const rb_data_type_t fs_watcher_type = {
+	.wrap_struct_name = "fs_watcher",
+	.function = {
+		.dmark = NULL,
+		.dfree = fs_watcher_free,
+		.dsize = fs_watcher_size,
+	},
+	.data = NULL,
+	.flags = 0, // we unlock gvl so probably can't use RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static VALUE
 fs_watcher_init(VALUE arg) {
 	FSWatcher *watcher = (FSWatcher *) arg;
@@ -672,7 +688,7 @@ end:
 		watcher->fds = NULL;
 		watcher->fds_len = 0;
 	}
-	return Data_Wrap_Struct(watcher->klass, NULL, fs_watcher_free, watcher);
+	return TypedData_Wrap_Struct(watcher->klass, &fs_watcher_type, watcher);
 }
 
 static VALUE
@@ -789,7 +805,7 @@ fs_watcher_wait_for_change(VALUE self) {
 	int e, interrupted = 0;
 	FSWatcherReadByteData read_data;
 
-	Data_Get_Struct(self, FSWatcher, watcher);
+	TypedData_Get_Struct(self, FSWatcher, &fs_watcher_type, watcher);
 
 	if (watcher->preparation_error) {
 		return Qfalse;
@@ -881,7 +897,7 @@ fs_watcher_wait_for_change(VALUE self) {
 static VALUE
 fs_watcher_close(VALUE self) {
 	FSWatcher *watcher;
-	Data_Get_Struct(self, FSWatcher, watcher);
+	TypedData_Get_Struct(self, FSWatcher, &fs_watcher_type, watcher);
 	fs_watcher_real_close(watcher);
 	return Qnil;
 }

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

@@ -299,30 +299,6 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :default   => 0,
     :desc      => 'The maximum number of simultaneously alive application instances a single application may occupy.'
   },
-  {
-    :name      => 'PassengerAdminPanelUrl',
-    :type      => :string,
-    :context   => :global,
-    :desc      => 'Connect to an admin panel at the given connector URL'
-  },
-  {
-    :name      => 'PassengerAdminPanelAuthType',
-    :type      => :string,
-    :context   => :global,
-    :desc      => 'The authentication type to use when connecting to the admin panel'
-  },
-  {
-    :name      => 'PassengerAdminPanelUsername',
-    :type      => :string,
-    :context   => :global,
-    :desc      => 'The username to use when connecting to the admin panel using basic authentication'
-  },
-  {
-    :name      => 'PassengerAdminPanelPassword',
-    :type      => :string,
-    :context   => :global,
-    :desc      => 'The password to use when connecting to the admin panel using basic authentication'
-  },
 
 
   ###### Per-application configuration ######
@@ -422,6 +398,14 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :default_expr => 'DEFAULT_START_TIMEOUT / 1000',
     :desc      => 'A timeout for application startup.'
   },
+  {
+    :name      => "PassengerAppConnectTimeout",
+    :type      => :integer,
+    :min_value => 1,
+    :default   => DEFAULT_CONNECT_TIMEOUT,
+    :default_expr => 'DEFAULT_CONNECT_TIMEOUT',
+    :desc      => 'A timeout for application to accept socket connections.'
+  },
   {
     :name      => 'PassengerMaxRequestQueueSize',
     :type      => :integer,

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -383,9 +383,6 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'JsonTools/CBindings.o',
     :source   => 'JsonTools/CBindings.cpp',
     :category => :json_tools
-  define_component 'FileTools/LargeFiles.o',
-    :source   => 'FileTools/LargeFiles.cpp',
-    :category => :file_tools_large_files
   define_component 'FileTools/PathManipCBindings.o',
     :source   => 'FileTools/PathManipCBindings.cpp',
     :category => :file_tools_path_manip_cbindings

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -55,6 +55,7 @@ module PhusionPassenger
     DEFAULT_POOL_IDLE_TIME = 300
     DEFAULT_MAX_PRELOADER_IDLE_TIME = 5 * 60
     DEFAULT_START_TIMEOUT = 90_000
+    DEFAULT_CONNECT_TIMEOUT = 30
     DEFAULT_WEB_APP_USER = "nobody"
     DEFAULT_APP_ENV = "production"
     DEFAULT_SPAWN_METHOD = "smart"

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

@@ -343,34 +343,6 @@ NGINX_CONFIGURATION_OPTIONS = [
     :default  => 0,
     :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
   },
-  {
-    :name     => 'passenger_admin_panel_url',
-    :scope    => :global,
-    :type     => :string,
-    :context  => [:main],
-    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
-  },
-  {
-    :name     => 'passenger_admin_panel_auth_type',
-    :scope    => :global,
-    :type     => :string,
-    :context  => [:main],
-    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
-  },
-  {
-    :name     => 'passenger_admin_panel_username',
-    :scope    => :global,
-    :type     => :string,
-    :context  => [:main],
-    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
-  },
-  {
-    :name     => 'passenger_admin_panel_password',
-    :scope    => :global,
-    :type     => :string,
-    :context  => [:main],
-    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
-  },
 
 
   ###### Per-application configuration ######
@@ -429,6 +401,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :uinteger,
     :default  => DEFAULT_START_TIMEOUT / 1000
   },
+  {
+    :name     => 'passenger_app_connect_timeout',
+    :scope    => :application,
+    :type     => :uinteger,
+    :default  => DEFAULT_CONNECT_TIMEOUT
+  },
   {
     :name     => 'passenger_user',
     :scope    => :application,

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

@@ -481,6 +481,13 @@ module PhusionPassenger
     end
     memoize :cxx_block_support_ok?, true
 
+    def self.cxx_supports_wno_vla_cxx_extension_flag?
+      return try_compile_with_warning_flag(
+        "Checking for C++ compiler '-Wno-vla-cxx-extension' support",
+        :cxx, '', '-Wno-vla-cxx-extension')
+    end
+    memoize :cxx_supports_wno_vla_cxx_extension_flag?, true
+
     # Returns whether compiling C++ with -fvisibility=hidden might result
     # in tons of useless warnings, like this:
     # http://code.google.com/p/phusion-passenger/issues/detail?id=526
@@ -508,7 +515,7 @@ module PhusionPassenger
     def self.address_sanitizer_flags
       if cc_is_clang?
         if `#{cc} --help` =~ /-fsanitize=/
-          "-fsanitize=address -fsanitize-address-use-after-return=always -fsanitize-address-use-after-scope"
+          "-fsanitize=address -fsanitize-address-use-after-return=always"
         else
           "-faddress-sanitizer"
         end
@@ -525,25 +532,21 @@ module PhusionPassenger
       end
     end
 
-    def self.cxx_11_flag
-      # C++11 support on FreeBSD 10.0 + Clang seems to be bugged.
-      # http://llvm.org/bugs/show_bug.cgi?id=18310
-      return nil if os_name_simple == "freebsd"
-
+    def self.cxx_14_flag
       source = %{
         struct Foo {
           Foo(Foo &&f) { }
         };
       }
-      if try_compile("Checking for C++ -std=gnu++11 compiler flag", :cxx, source, '-std=gnu++11')
-        return "-std=gnu++11"
-      elsif try_compile("Checking for C++ -std=c++11 compiler flag", :cxx, source, '-std=c++11')
-        return "-std=c++11"
+      if try_compile("Checking for C++ -std=gnu++14 compiler flag", :cxx, source, '-std=gnu++14')
+        return "-std=gnu++14"
+      elsif try_compile("Checking for C++ -std=c++14 compiler flag", :cxx, source, '-std=c++14')
+        return "-std=c++14"
       else
         return nil
       end
     end
-    memoize :cxx_11_flag, true
+    memoize :cxx_14_flag, true
 
     def self.has_rt_library?
       return try_link("Checking for -lrt support",
@@ -563,12 +566,6 @@ module PhusionPassenger
     end
     memoize :has_dl_library?, true
 
-    def self.has_alloca_h?
-      return try_compile("Checking for alloca.h",
-        :c, '#include <alloca.h>')
-    end
-    memoize :has_alloca_h?, true
-
     def self.has_accept4?
       return try_compile("Checking for accept4()", :c, %Q{
         #define _GNU_SOURCE
@@ -603,7 +600,7 @@ module PhusionPassenger
       # -ggdb instead.
       #
       # In any case we'll always want to use -ggdb for better GDB debugging.
-      if cc_is_gcc?
+      if cxx_is_gcc?
         result = '-ggdb'
       else
         result = '-g'

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

@@ -58,20 +58,6 @@ module PhusionPassenger
     memoize :default_extra_cxxflags, true
 
   private
-    def self.check_unordered_map(flags, class_name, header_name, macro_name)
-      ok = try_compile("Checking for unordered_map", :cxx, %Q{
-        #include <#{header_name}>
-        int
-        main() {
-          #{class_name}<int, int> m;
-          return 0;
-        }
-      })
-      flags << "-D#{macro_name}" if ok
-      return ok
-    end
-    private_class_method :check_unordered_map
-
     def self.check_hash_map(flags)
       hash_namespace = nil
       ok = false
@@ -147,32 +133,21 @@ module PhusionPassenger
         end
       end
 
-      flags << '-DHAS_ALLOCA_H' if has_alloca_h?
       flags << '-DHAVE_ACCEPT4' if has_accept4?
-      flags << '-DHAS_SFENCE' if supports_sfence_instruction?
-      flags << '-DHAS_LFENCE' if supports_lfence_instruction?
       flags << "-DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
 
       if cc_or_cxx == :cxx
         flags << debugging_cxxflags
-        flags << cxx_11_flag if cxx_11_flag
+        flags << cxx_14_flag if cxx_14_flag
 
         if cxx_supports_wno_unused_local_typedefs_flag?
           # Avoids some compilaton warnings with Boost on Ubuntu 14.04.
           flags << "-Wno-unused-local-typedefs"
         end
 
-        if cxx_supports_wno_format_nonliteral_flag?
-          # SystemTools/UserDatabase.cpp uses snprintf() with a non-literal
-          # format string.
-          flags << '-Wno-format-nonliteral'
+        if cxx_supports_wno_vla_cxx_extension_flag?
+          flags << "-Wno-vla-cxx-extension"
         end
-
-        # There are too many implementations of of the hash map!
-        # Figure out the right one.
-        check_unordered_map(flags, "std::unordered_map", "unordered_map", "HAS_UNORDERED_MAP") ||
-          check_unordered_map(flags, "std::tr1::unordered_map", "unordered_map", "HAS_TR1_UNORDERED_MAP") ||
-          check_hash_map(flags)
       else
         flags << debugging_cflags
       end
@@ -217,7 +192,7 @@ module PhusionPassenger
 
     def self.portability_c_or_cxx_ldflags(cc_or_cxx)
       result = ''
-      result << cxx_11_flag if cc_or_cxx == :cxx && cxx_11_flag
+      result << cxx_14_flag if cc_or_cxx == :cxx && cxx_14_flag
       if os_name_simple == "solaris"
         result << ' -lxnet -lsocket -lnsl -lpthread'
       else

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

@@ -216,36 +216,6 @@ module PhusionPassenger
       defined?(File::LOCK_EX) && os_name_simple != 'solaris'
     end
 
-    # Returns whether the OS's main CPU architecture supports the
-    # x86/x86_64 sfence instruction.
-    def self.supports_sfence_instruction?
-      arch = cpu_architectures[0]
-      return arch == "x86_64" || (arch == "x86" &&
-        try_compile_and_run("Checking for sfence instruction support", :c, %Q{
-          int
-          main() {
-            __asm__ __volatile__ ("sfence" ::: "memory");
-            return 0;
-          }
-        }))
-    end
-    memoize :supports_sfence_instruction?, true
-
-    # Returns whether the OS's main CPU architecture supports the
-    # x86/x86_64 lfence instruction.
-    def self.supports_lfence_instruction?
-      arch = cpu_architectures[0]
-      return arch == "x86_64" || (arch == "x86" &&
-        try_compile_and_run("Checking for lfence instruction support", :c, %Q{
-          int
-          main() {
-            __asm__ __volatile__ ("lfence" ::: "memory");
-            return 0;
-          }
-        }))
-    end
-    memoize :supports_lfence_instruction?, true
-
     def self.requires_no_tls_direct_seg_refs?
       return File.exist?("/proc/xen/capabilities") && cpu_architectures[0] == "x86"
     end

data/src/ruby_supportlib/phusion_passenger/rack_handler.rb

@@ -41,7 +41,7 @@ require 'rbconfig'
 require 'rackup' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
 
 # Rackup was removed in Rack 3, it is now a separate gem
-if Object.const_defined? :Rackup
+if Object.const_defined?(:Rackup) && ::Rackup.const_defined?(:Handler)
   module Rackup
     module Handler
       module PhusionPassenger
@@ -57,7 +57,7 @@ if Object.const_defined? :Rackup
       register :passenger, PhusionPassenger
     end
   end
-elsif Object.const_defined?(:Rack) && Rack.release < '3'
+elsif Object.const_defined?(:Rack) && ::Rack.release < '3'
   module Rack
     module Handler
       module PhusionPassenger

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

@@ -392,6 +392,14 @@ module PhusionPassenger
                       "take to start up, after which it will be killed\n" \
                       "with SIGKILL, and logged with an error.\nDefault: #{DEFAULT_START_TIMEOUT / 1000}"
       },
+      {
+        :name      => :app_connect_timeout,
+        :type      => :integer,
+        :type_desc => 'SECONDS',
+        :desc      => "The maximum time an application process may\n" \
+                      "take to accept a socket connection\n" \
+                      "Default: #{DEFAULT_CONNECT_TIMEOUT}"
+      },
       {
         :name      => :concurrency_model,
         :type_desc => 'NAME',
@@ -597,26 +605,6 @@ module PhusionPassenger
         :type      => :boolean,
         :desc      => "Disable prefixing log statements with PID and channel."
       },
-      {
-        :name      => :admin_panel_url,
-        :type      => :string,
-        :desc      => 'Connect to an admin panel at the given connector URL'
-      },
-      {
-        :name      => :admin_panel_auth_type,
-        :type      => :string,
-        :desc      => 'Authentication type to use when connecting to the admin panel'
-      },
-      {
-        :name      => :admin_panel_username,
-        :type      => :string,
-        :desc      => 'Username to use when authenticating with the admin panel'
-      },
-      {
-        :name      => :admin_panel_password,
-        :type      => :string,
-        :desc      => 'Password to use when authenticating with the admin panel'
-      },
       {
         :name      => :auto,
         :type      => :boolean,

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.26'
+  VERSION_STRING = '6.1.0'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha256 <VERSION>
-  PREFERRED_NGINX_VERSION = '1.26.2'
-  NGINX_SHA256_CHECKSUM = '627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738'
+  PREFERRED_NGINX_VERSION = '1.26.3'
+  NGINX_SHA256_CHECKSUM = '69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa'
 
   # 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.26.2'
-  PACKAGING_NGINX_SHA256_CHECKSUM = '627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.26.3'
+  PACKAGING_NGINX_SHA256_CHECKSUM = '69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa'
 
   # sha256sum of the .tar.gz
-  PREFERRED_PCRE_VERSION  = '10.39'
-  PCRE_SHA256_CHECKSUM = '0781bd2536ef5279b1943471fdcdbd9961a2845e1d2c9ad849b9bd98ba1a9bd4'
+  PREFERRED_PCRE_VERSION  = '10.45'
+  PCRE_SHA256_CHECKSUM = '0e138387df7835d7403b8351e2226c1377da804e0737db0e071b48f07c9d12ee'
 
   STANDALONE_INTERFACE_VERSION  = 1