passenger 4.0.2 → 4.0.3

data/ext/nginx/ngx_http_passenger_module.c

@@ -49,13 +49,13 @@
 #define HELPER_SERVER_PASSWORD_SIZE     64
 
 
-static int               first_start = 1;
-ngx_str_t                passenger_schema_string;
-ngx_str_t                passenger_placeholder_upstream_address;
-PassengerCachedFileStat *passenger_stat_cache;
+static int                first_start = 1;
+ngx_str_t                 passenger_schema_string;
+ngx_str_t                 passenger_placeholder_upstream_address;
+PassengerCachedFileStat  *passenger_stat_cache;
 PassengerAppTypeDetector *passenger_app_type_detector;
-AgentsStarter           *passenger_agents_starter = NULL;
-ngx_cycle_t             *passenger_current_cycle;
+PSG_AgentsStarter        *passenger_agents_starter = NULL;
+ngx_cycle_t              *passenger_current_cycle;
 
 
 /*
@@ -104,6 +104,14 @@ ngx_str_null_terminate(ngx_str_t *str) {
     return result;
 }
 
+static void
+psg_variant_map_set_ngx_str(PSG_VariantMap *m,
+    const char *name,
+    ngx_str_t *value)
+{
+    psg_variant_map_set(m, name, (const char *) value->data, value->len);
+}
+
 /**
  * Save the Nginx master process's PID into a file under the server instance directory.
  *
@@ -121,7 +129,7 @@ save_master_process_pid(ngx_cycle_t *cycle) {
     FILE *f;
     
     last = ngx_snprintf(filename, sizeof(filename) - 1, "%s/control_process.pid",
-        agents_starter_get_server_instance_dir(passenger_agents_starter));
+        psg_agents_starter_get_server_instance_dir(passenger_agents_starter));
     *last = (u_char) '\0';
     
     f = fopen((const char *) filename, "w");
@@ -241,35 +249,16 @@ start_helper_server(ngx_cycle_t *cycle) {
     ngx_uint_t       i;
     ngx_str_t       *prestart_uris;
     char           **prestart_uris_ary = NULL;
+    ngx_keyval_t    *ctl = NULL;
+    PSG_VariantMap  *params = NULL;
     u_char  filename[NGX_MAX_PATH], *last;
-    char   *debug_log_file = NULL;
-    char   *default_user = NULL;
-    char   *default_group = NULL;
     char   *passenger_root = NULL;
-    char   *default_ruby = NULL;
-    char   *temp_dir = NULL;
-    char   *analytics_log_user;
-    char   *analytics_log_group;
-    char   *union_station_gateway_address;
-    char   *union_station_gateway_cert;
-    char   *union_station_proxy_address;
     char   *error_message = NULL;
     
     core_conf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
     result    = NGX_OK;
-    
-    /* Create null-terminated versions of some strings. */
-    debug_log_file = ngx_str_null_terminate(&passenger_main_conf.debug_log_file);
-    default_user   = ngx_str_null_terminate(&passenger_main_conf.default_user);
-    default_group  = ngx_str_null_terminate(&passenger_main_conf.default_group);
+    params    = psg_variant_map_new();
     passenger_root = ngx_str_null_terminate(&passenger_main_conf.root_dir);
-    default_ruby   = ngx_str_null_terminate(&passenger_main_conf.default_ruby);
-    temp_dir       = ngx_str_null_terminate(&passenger_main_conf.temp_dir);
-    analytics_log_user = ngx_str_null_terminate(&passenger_main_conf.analytics_log_user);
-    analytics_log_group = ngx_str_null_terminate(&passenger_main_conf.analytics_log_group);
-    union_station_gateway_address = ngx_str_null_terminate(&passenger_main_conf.union_station_gateway_address);
-    union_station_gateway_cert = ngx_str_null_terminate(&passenger_main_conf.union_station_gateway_cert);
-    union_station_proxy_address = ngx_str_null_terminate(&passenger_main_conf.union_station_proxy_address);
     
     prestart_uris = (ngx_str_t *) passenger_main_conf.prestart_uris->elts;
     prestart_uris_ary = calloc(sizeof(char *), passenger_main_conf.prestart_uris->nelts);
@@ -283,22 +272,36 @@ start_helper_server(ngx_cycle_t *cycle) {
         memcpy(prestart_uris_ary[i], prestart_uris[i].data, prestart_uris[i].len);
         prestart_uris_ary[i][prestart_uris[i].len] = '\0';
     }
+
+    psg_variant_map_set_int    (params, "web_server_pid", getpid());
+    psg_variant_map_set_int    (params, "web_server_worker_uid", core_conf->user);
+    psg_variant_map_set_int    (params, "web_server_worker_gid", core_conf->group);
+    psg_variant_map_set_int    (params, "log_level", passenger_main_conf.log_level);
+    psg_variant_map_set_ngx_str(params, "debug_log_file", &passenger_main_conf.debug_log_file);
+    psg_variant_map_set_ngx_str(params, "temp_dir", &passenger_main_conf.temp_dir);
+    psg_variant_map_set_bool   (params, "user_switching", passenger_main_conf.user_switching);
+    psg_variant_map_set_ngx_str(params, "default_user", &passenger_main_conf.default_user);
+    psg_variant_map_set_ngx_str(params, "default_group", &passenger_main_conf.default_group);
+    psg_variant_map_set_ngx_str(params, "default_ruby", &passenger_main_conf.default_ruby);
+    psg_variant_map_set_int    (params, "max_pool_size", passenger_main_conf.max_pool_size);
+    psg_variant_map_set_int    (params, "pool_idle_time", passenger_main_conf.pool_idle_time);
+    psg_variant_map_set_ngx_str(params, "analytics_log_user", &passenger_main_conf.analytics_log_user);
+    psg_variant_map_set_ngx_str(params, "analytics_log_group", &passenger_main_conf.analytics_log_group);
+    psg_variant_map_set_ngx_str(params, "union_station_gateway_address", &passenger_main_conf.union_station_gateway_address);
+    psg_variant_map_set_ngx_str(params, "union_station_gateway_cert", &passenger_main_conf.union_station_gateway_cert);
+    psg_variant_map_set_ngx_str(params, "union_station_proxy_address", &passenger_main_conf.union_station_proxy_address);
+    psg_variant_map_set_strset (params, "prestart_urls", (const char **) prestart_uris_ary, passenger_main_conf.prestart_uris->nelts);
+
+    ctl = (ngx_keyval_t *) passenger_main_conf.ctl->elts;
+    for (i = 0; i < passenger_main_conf.ctl->nelts; i++) {
+        psg_variant_map_set2(params,
+            (const char *) ctl[i].key.data, ctl[i].key.len - 1,
+            (const char *) ctl[i].value.data, ctl[i].value.len - 1);
+    }
     
-    ret = agents_starter_start(passenger_agents_starter,
-        passenger_main_conf.log_level, debug_log_file, getpid(),
-        temp_dir, passenger_main_conf.user_switching,
-        default_user, default_group,
-        core_conf->user, core_conf->group,
-        passenger_root, default_ruby, passenger_main_conf.max_pool_size,
-        passenger_main_conf.max_instances_per_app,
-        passenger_main_conf.pool_idle_time,
-        "",
-        analytics_log_user, analytics_log_group,
-        union_station_gateway_address,
-        passenger_main_conf.union_station_gateway_port,
-        union_station_gateway_cert,
-        union_station_proxy_address,
-        (const char **) prestart_uris_ary, passenger_main_conf.prestart_uris->nelts,
+    ret = psg_agents_starter_start(passenger_agents_starter,
+        passenger_root,
+        params,
         starting_helper_server_after_fork,
         cycle,
         &error_message);
@@ -314,7 +317,7 @@ start_helper_server(ngx_cycle_t *cycle) {
      */
     last = ngx_snprintf(filename, sizeof(filename) - 1,
                         "%s/control_process.pid",
-                        agents_starter_get_server_instance_dir(passenger_agents_starter));
+                        psg_agents_starter_get_server_instance_dir(passenger_agents_starter));
     *last = (u_char) '\0';
     if (create_file(cycle, filename, (const u_char *) "", 0) != NGX_OK) {
         result = NGX_ERROR;
@@ -331,7 +334,7 @@ start_helper_server(ngx_cycle_t *cycle) {
     /* Create various other info files. */
     last = ngx_snprintf(filename, sizeof(filename) - 1,
                         "%s/web_server.txt",
-                        agents_starter_get_generation_dir(passenger_agents_starter));
+                        psg_agents_starter_get_generation_dir(passenger_agents_starter));
     *last = (u_char) '\0';
     if (create_file(cycle, filename, (const u_char *) NGINX_VER, strlen(NGINX_VER)) != NGX_OK) {
         result = NGX_ERROR;
@@ -340,7 +343,7 @@ start_helper_server(ngx_cycle_t *cycle) {
 
     last = ngx_snprintf(filename, sizeof(filename) - 1,
                         "%s/config_files.txt",
-                        agents_starter_get_generation_dir(passenger_agents_starter));
+                        psg_agents_starter_get_generation_dir(passenger_agents_starter));
     *last = (u_char) '\0';
     if (create_file(cycle, filename, cycle->conf_file.data, cycle->conf_file.len) != NGX_OK) {
         result = NGX_ERROR;
@@ -348,17 +351,8 @@ start_helper_server(ngx_cycle_t *cycle) {
     }
     
 cleanup:
-    free(debug_log_file);
-    free(default_user);
-    free(default_group);
+    psg_variant_map_free(params);
     free(passenger_root);
-    free(default_ruby);
-    free(temp_dir);
-    free(analytics_log_user);
-    free(analytics_log_group);
-    free(union_station_gateway_address);
-    free(union_station_gateway_cert);
-    free(union_station_proxy_address);
     free(error_message);
     if (prestart_uris_ary != NULL) {
         for (i = 0; i < passenger_main_conf.prestart_uris->nelts; i++) {
@@ -380,7 +374,7 @@ cleanup:
 static void
 shutdown_helper_server() {
     if (passenger_agents_starter != NULL) {
-        agents_starter_free(passenger_agents_starter);
+        psg_agents_starter_free(passenger_agents_starter);
         passenger_agents_starter = NULL;
     }
 }
@@ -405,7 +399,7 @@ pre_config_init(ngx_conf_t *cf)
     passenger_placeholder_upstream_address.len  = sizeof("unix:/passenger_helper_server") - 1;
     passenger_stat_cache = cached_file_stat_new(1024);
     passenger_app_type_detector = passenger_app_type_detector_new();
-    passenger_agents_starter = agents_starter_new(AS_NGINX, &error_message);
+    passenger_agents_starter = psg_agents_starter_new(AS_NGINX, &error_message);
     
     if (passenger_agents_starter == NULL) {
         ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno, "%s", error_message);
@@ -458,7 +452,7 @@ init_worker_process(ngx_cycle_t *cycle) {
         
         core_conf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
         if (core_conf->master) {
-            agents_starter_detach(passenger_agents_starter);
+            psg_agents_starter_detach(passenger_agents_starter);
         }
     }
     return NGX_OK;

data/ext/nginx/ngx_http_passenger_module.h

@@ -30,9 +30,9 @@
 
 #include <ngx_config.h>
 #include <ngx_core.h>
-#include "../common/AgentsStarter.h"
-#include "../common/ApplicationPool2/AppTypes.h"
-#include "../common/Utils/CachedFileStat.h"
+#include "common/AgentsStarter.h"
+#include "common/ApplicationPool2/AppTypes.h"
+#include "common/Utils/CachedFileStat.h"
 
 /**
  * The Nginx version number as an integer.
@@ -55,13 +55,13 @@ extern ngx_str_t                passenger_placeholder_upstream_address;
 /**
  * A CachedFileStat object used for caching stat() calls.
  */
-extern PassengerCachedFileStat *passenger_stat_cache;
+extern PassengerCachedFileStat  *passenger_stat_cache;
 
 extern PassengerAppTypeDetector *passenger_app_type_detector;
 
-extern AgentsStarter           *passenger_agents_starter;
+extern PSG_AgentsStarter        *passenger_agents_starter;
 
-extern ngx_cycle_t             *passenger_current_cycle;
+extern ngx_cycle_t              *passenger_current_cycle;
 
 #endif /* _PASSENGER_NGINX_MODULE_H_ */
 

data/lib/phusion_passenger.rb

@@ -31,10 +31,14 @@ module PhusionPassenger
 	PACKAGE_NAME = 'passenger'
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '4.0.2'
+	VERSION_STRING = '4.0.3'
 	
 	PREFERRED_NGINX_VERSION = '1.4.1'
+	NGINX_SHA256_CHECKSUM = 'bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119'
+
 	PREFERRED_PCRE_VERSION  = '8.32'
+	PCRE_SHA256_CHECKSUM = 'd5d8634b36baf3d08be442a627001099583b397f456bc795304a013383b6423a'
+
 	STANDALONE_INTERFACE_VERSION  = 1
 	
 	
@@ -58,15 +62,6 @@ module PhusionPassenger
 	# System-wide directory for storing Phusion Passenger Standalone runtime files.
 	GLOBAL_STANDALONE_RESOURCE_DIR = "/var/lib/#{GLOBAL_STANDALONE_NAMESPACE_DIRNAME}".freeze
 	
-	NATIVELY_PACKAGED_BIN_DIR                = "/usr/bin".freeze
-	NATIVELY_PACKAGED_AGENTS_DIR             = "/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents".freeze
-	NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR     = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts".freeze
-	NATIVELY_PACKAGED_RESOURCES_DIR          = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}".freeze
-	NATIVELY_PACKAGED_DOC_DIR                = "/usr/share/doc/#{GLOBAL_NAMESPACE_DIRNAME}".freeze
-	NATIVELY_PACKAGED_RUNTIME_LIBDIR         = "/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}".freeze
-	NATIVELY_PACKAGED_HEADER_DIR             = "/usr/include/#{GLOBAL_NAMESPACE_DIRNAME}".freeze
-	NATIVELY_PACKAGED_APACHE2_MODULE         = "/usr/lib/apache2/modules/mod_passenger.so".freeze
-	
 	# Follows the logic of ext/common/ResourceLocator.h, so don't forget to modify that too.
 	def self.locate_directories(source_root_or_location_configuration_file = nil)
 		source_root_or_location_configuration_file ||= find_location_configuration_file
@@ -93,8 +88,10 @@ module PhusionPassenger
 			@natively_packaged     = get_bool_option(filename, options, 'natively_packaged')
 			@bin_dir               = get_option(filename, options, 'bin').freeze
 			@agents_dir            = get_option(filename, options, 'agents').freeze
+			@lib_dir               = get_option(filename, options, 'libdir').freeze
 			@helper_scripts_dir    = get_option(filename, options, 'helper_scripts').freeze
 			@resources_dir         = get_option(filename, options, 'resources').freeze
+			@include_dir           = get_option(filename, options, 'includedir').freeze
 			@doc_dir               = get_option(filename, options, 'doc').freeze
 			@apache2_module_path   = get_option(filename, options, 'apache2_module').freeze
 			@ruby_extension_source_dir = get_option(filename, options, 'ruby_extension_source').freeze
@@ -103,8 +100,10 @@ module PhusionPassenger
 			@natively_packaged     = false
 			@bin_dir               = "#{@source_root}/bin".freeze
 			@agents_dir            = "#{@source_root}/agents".freeze
+			@lib_dir               = "#{@source_root}/libout".freeze
 			@helper_scripts_dir    = "#{@source_root}/helper-scripts".freeze
 			@resources_dir         = "#{@source_root}/resources".freeze
+			@include_dir           = "#{@source_root}/ext".freeze
 			@doc_dir               = "#{@source_root}/doc".freeze
 			@apache2_module_path   = "#{@source_root}/libout/apache2/mod_passenger.so".freeze
 			@ruby_extension_source_dir = "#{@source_root}/ext/ruby"
@@ -134,6 +133,10 @@ module PhusionPassenger
 	def self.agents_dir
 		return @agents_dir
 	end
+
+	def self.lib_dir
+		return @lib_dir
+	end
 	
 	def self.helper_scripts_dir
 		return @helper_scripts_dir
@@ -142,6 +145,10 @@ module PhusionPassenger
 	def self.resources_dir
 		return @resources_dir
 	end
+
+	def self.include_dir
+		return @include_dir
+	end
 	
 	def self.doc_dir
 		return @doc_dir

data/lib/phusion_passenger/admin_tools/server_instance.rb

@@ -39,7 +39,7 @@ class ServerInstance
 	
 	DIR_STRUCTURE_MAJOR_VERSION = 1
 	DIR_STRUCTURE_MINOR_VERSION = 0
-	GENERATION_STRUCTURE_MAJOR_VERSION = 1
+	GENERATION_STRUCTURE_MAJOR_VERSION = 2
 	GENERATION_STRUCTURE_MINOR_VERSION = 0
 	
 	STALE_TIME_THRESHOLD = 60
@@ -214,7 +214,7 @@ class ServerInstance
 			username = role_or_username
 		end
 		
-		@client = MessageClient.new(username, password, "unix:#{@generation_path}/socket")
+		@client = MessageClient.new(username, password, "unix:#{@generation_path}/helper_admin")
 		begin
 			yield self
 		ensure

data/lib/phusion_passenger/common_library.rb

@@ -408,7 +408,6 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
 		:category => :other,
 		:deps     => %w(
 			AgentsStarter.h
-			AgentsStarter.hpp
 			ResourceLocator.h
 			MessageClient.h
 			ServerInstanceDir.h

data/lib/phusion_passenger/platform_info.rb

@@ -323,8 +323,17 @@ public
 	#
 	# This function exists because system('which') doesn't always behave
 	# correctly, for some weird reason.
-	def self.find_command(name)
+	#
+	# When `is_executable` is true, this function checks whether
+	# there is an executable named `name` in $PATH. When false, it
+	# assumes that `name` is not an executable name but a command string
+	# (e.g. "ccache gcc"). It then infers the executable name ("ccache")
+	# from the command string, and checks for that instead.
+	def self.find_command(name, is_executable = true)
 		name = name.to_s
+		if !is_executable && name =~ / /
+			name = name.sub(/ .*/, '')
+		end
 		if name =~ /^\//
 			if File.executable?(name)
 				return name

data/lib/phusion_passenger/platform_info/depcheck.rb

@@ -124,8 +124,8 @@ module Depcheck
 			@checker = block
 		end
 
-		def check_for_command(name)
-			result = find_command(name)
+		def check_for_command(name, *args)
+			result = find_command(name, *args)
 			if result
 				{ :found => true,
 				  "Location" => result }
@@ -270,8 +270,8 @@ module Depcheck
 			PlatformInfo.gem_command
 		end
 
-		def find_command(command)
-			PlatformInfo.find_command(command)
+		def find_command(command, *args)
+			PlatformInfo.find_command(command, *args)
 		end
 
 		def linux_distro_tags

data/lib/phusion_passenger/platform_info/depcheck_specs/compiler_toolchain.rb

@@ -3,7 +3,7 @@ define 'gcc' do
   website "http://gcc.gnu.org/"
   define_checker do
     require 'phusion_passenger/platform_info/compiler'
-    check_for_command(PlatformInfo.cc)
+    check_for_command(PlatformInfo.cc, false)
   end
   
   on :debian do
@@ -28,7 +28,7 @@ define 'g++' do
   website "http://gcc.gnu.org/"
   define_checker do
     require 'phusion_passenger/platform_info/compiler'
-    check_for_command(PlatformInfo.cxx)
+    check_for_command(PlatformInfo.cxx, false)
   end
   
   on :debian do

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -130,6 +130,13 @@ module PlatformInfo
 			RUBY_ENGINE != "macruby" &&
 			rb_config['target_os'] !~ /mswin|windows|mingw/
 	end
+
+	# Returns whether Phusion Passenger needs Ruby development headers to
+	# be available for the current Ruby implementation.
+	def self.passenger_needs_ruby_dev_header?
+		# Too much of a trouble for JRuby. We can do without it.
+		return RUBY_ENGINE != "jruby"
+	end
 	
 	# Returns the correct 'gem' command for this Ruby interpreter.
 	def self.gem_command

data/lib/phusion_passenger/request_handler.rb

@@ -30,7 +30,6 @@ require 'phusion_passenger/public_api'
 require 'phusion_passenger/message_client'
 require 'phusion_passenger/debug_logging'
 require 'phusion_passenger/utils'
-require 'phusion_passenger/utils/robust_interruption'
 require 'phusion_passenger/utils/tmpdir'
 require 'phusion_passenger/ruby_core_enhancements'
 require 'phusion_passenger/request_handler/thread_handler'
@@ -70,10 +69,6 @@ class RequestHandler
 
 	attr_reader :concurrency
 	
-	# The number of times the main loop has iterated so far. Mostly useful
-	# for unit test assertions.
-	attr_reader :iterations
-	
 	# If a soft termination signal was received, then the main loop will quit
 	# the given amount of seconds after the last time a connection was accepted.
 	# Defaults to 3 seconds.
@@ -139,7 +134,6 @@ class RequestHandler
 		@main_loop_thread_cond = ConditionVariable.new
 		@threads = []
 		@threads_mutex = Mutex.new
-		@iterations         = 0
 		@soft_termination_linger_time = 3
 		@main_loop_running  = false
 		
@@ -203,9 +197,9 @@ class RequestHandler
 			end
 			
 			install_useful_signal_handlers
-			RobustInterruption.install
 			start_threads
-			wait_until_termination
+			wait_until_termination_requested
+			wait_until_all_threads_are_idle
 			terminate_threads
 			debug("Request handler main loop exited normally")
 
@@ -440,17 +434,14 @@ private
 			@concurrency.times do |i|
 				thread = Thread.new(i) do |number|
 					Thread.current.abort_on_exception = true
-					RobustInterruption.install
-					RobustInterruption.disable_interruptions do
-						begin
-							Thread.current[:name] = "Worker #{number + 1}"
-							handler = thread_handler.new(self, main_socket_options)
-							handler.install
-							handler.main_loop(set_initialization_state_to_true)
-						ensure
-							set_initialization_state.call(false)
-							unregister_current_thread
-						end
+					begin
+						Thread.current[:name] = "Worker #{number + 1}"
+						handler = thread_handler.new(self, main_socket_options)
+						handler.install
+						handler.main_loop(set_initialization_state_to_true)
+					ensure
+						set_initialization_state.call(false)
+						unregister_current_thread
 					end
 				end
 				@threads << thread
@@ -459,17 +450,14 @@ private
 
 			thread = Thread.new do
 				Thread.current.abort_on_exception = true
-				RobustInterruption.install
-				RobustInterruption.disable_interruptions do
-					begin
-						Thread.current[:name] = "HTTP helper worker"
-						handler = thread_handler.new(self, http_socket_options)
-						handler.install
-						handler.main_loop(set_initialization_state_to_true)
-					ensure
-						set_initialization_state.call(false)
-						unregister_current_thread
-					end
+				begin
+					Thread.current[:name] = "HTTP helper worker"
+					handler = thread_handler.new(self, http_socket_options)
+					handler.install
+					handler.main_loop(set_initialization_state_to_true)
+				ensure
+					set_initialization_state.call(false)
+					unregister_current_thread
 				end
 			end
 			@threads << thread
@@ -490,7 +478,7 @@ private
 		end
 	end
 
-	def wait_until_termination
+	def wait_until_termination_requested
 		ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
 		if ruby_engine == "jruby"
 			# On JRuby, selecting on an input TTY always returns, so
@@ -528,32 +516,121 @@ private
 		end
 	end
 
-	def terminate_threads
-		debug("Stopping all threads")
-		done = false
-		while !done
+	def wakeup_all_threads
+		threads = []
+		if get_socket_address_type(@server_sockets[:main][:address]) == :unix &&
+		   !File.exist?(@server_sockets[:main][:address].sub(/^unix:/, ''))
+			# It looks like someone deleted the Unix domain socket we listen on.
+			# This makes it impossible to wake up the worker threads gracefully,
+			# so we hard kill them.
+			warn("Unix domain socket gone; force aborting all threads")
 			@threads_mutex.synchronize do
 				@threads.each do |thread|
-					Utils::RobustInterruption.raise(thread)
+					thread.raise(RuntimeError.new("Force abort"))
+				end
+			end
+		else
+			@concurrency.times do
+				Thread.abort_on_exception = true
+				threads << Thread.new(@server_sockets[:main][:address]) do |address|
+					begin
+						debug("Shutting down worker thread by connecting to #{address}")
+						connect_to_server(address).close
+					rescue Errno::ECONNREFUSED
+						debug("Worker thread listening on #{address} already exited")
+					rescue SystemCallError, IOError => e
+						debug("Error shutting down worker thread (#{address}): #{e} (#{e.class})")
+					end
 				end
-				done = @threads.empty?
 			end
-			sleep 0.02 if !done
+		end
+		threads << Thread.new(@server_sockets[:http][:address]) do |address|
+			Thread.abort_on_exception = true
+			begin
+				debug("Shutting down HTTP thread by connecting to #{address}")
+				connect_to_server(address).close
+			rescue Errno::ECONNREFUSED
+				debug("Worker thread listening on #{address} already exited")
+			rescue SystemCallError, IOError => e
+				debug("Error shutting down HTTP thread (#{address}): #{e} (#{e.class})")
+			end
+		end
+		return threads
+	end
+
+	def terminate_threads
+		debug("Stopping all threads")
+		threads = @threads_mutex.synchronize do
+			@threads.dup
+		end
+		threads.each do |thr|
+			thr.raise(ThreadHandler::Interrupted.new)
+		end
+		threads.each do |thr|
+			thr.join
 		end
 		debug("All threads stopped")
 	end
 	
 	def wait_until_all_threads_are_idle
 		debug("Waiting until all threads have become idle...")
+
+		# We wait until 100 ms have passed since all handlers have become
+		# interruptable and remained in the same iterations.
+		
 		done = false
+
 		while !done
-			@threads_mutex.synchronize do
-				done = @threads.all? do |thread|
-					thread[:handler].idle?
+			handlers = @threads_mutex.synchronize do
+				@threads.map do |thr|
+					thr[:passenger_thread_handler]
+				end
+			end
+			debug("There are currently #{handlers.size} threads")
+			if handlers.empty?
+				# There are no threads, so we're done.
+				done = true
+				break
+			end
+
+			# Record initial state.
+			handlers.each { |h| h.stats_mutex.lock }
+			iterations = handlers.map { |h| h.iteration }
+			handlers.each { |h| h.stats_mutex.unlock }
+
+			start_time = Time.now
+			sleep 0.01
+			
+			while true
+				if handlers.size != @threads_mutex.synchronize { @threads.size }
+					debug("The number of threads changed. Restarting waiting algorithm")
+					break
+				end
+
+				# Record current state.
+				handlers.each { |h| h.stats_mutex.lock }
+				all_interruptable = handlers.all? { |h| h.interruptable }
+				new_iterations    = handlers.map  { |h| h.iteration }
+
+				# Are all threads interruptable and has there been no activity
+				# since last time we checked?
+				if all_interruptable && new_iterations == iterations
+					# Yes. If enough time has passed then we're done.
+					handlers.each { |h| h.stats_mutex.unlock }
+					if Time.now >= start_time + 0.1
+						done = true
+						break
+					end
+				else
+					# No. We reset the timer and check again later.
+					handlers.each { |h| h.stats_mutex.unlock }
+					iterations = new_iterations
+					start_time = Time.now
+					sleep 0.01
 				end
 			end
-			sleep 0.02 if !done
 		end
+
 		debug("All threads are now idle")
 	end
 end