passenger 4.0.60 → 5.0.0.beta1

data/resources/templates/config/agent_compiler/confirm_enable_optimizations.txt.erb

@@ -0,0 +1,5 @@
+<banner>Compile the agent with optimizations?</banner>
+
+Compiling the agent with optimizations will make <%= PROGRAM_NAME %> faster, but
+it will take longer to compile and it requires <b>at least 2 GB of memory</b>.
+<% if @total_ram %>(You have <%= @total_ram %> GB memory.)<% end -%>

data/resources/templates/config/installation_utils/cannot_create_user_support_binaries_dir.txt.erb

@@ -0,0 +1,15 @@
+This program must be able to create this directory:
+
+  <b><%= @dir %></b>
+
+However, it was unable to do that because of incorrect permissions on parent
+directories. The parent directories must allow the <b><%= @myself %></b>b> user
+(which this program is running as) to create the directory that we want. Please
+fix the permissions on all parent directories, then re-run this program.
+
+If you don't know how to fix permissions, please search the Internet and learn
+about how Unix permissions works. These are good tutorials:
+
+ * http://www.tutorialspoint.com/unix/unix-file-permission.htm
+ * http://www.perlfect.com/articles/chmod.shtml
+ * http://www.linux.com/learn/tutorials/309527-understanding-linux-file-permissions

data/resources/templates/config/installation_utils/download_tool_missing.txt.erb

@@ -0,0 +1,7 @@
+<yellow>No download tool found</yellow>
+
+This program requires a download tool, but none can be found on your system.
+Please install one as follows:
+<% @runner.missing_dependencies.each do |dep| %>
+    - <%= dep.install_instructions %>
+<% end -%>

data/resources/templates/config/installation_utils/passenger_not_installed_as_root.txt.erb

@@ -0,0 +1,12 @@
+<red>You should not run this program as root</red>
+
+You are currently running this program as the <b>root</b> user. However,
+<%= PROGRAM_NAME %> was not installed by the root user. Instead, it was installed
+by the <b><%= @owner %></b> user. For this reason, this program has stopped itself,
+because proceeding as root can mess up all kinds of file permissions.
+
+<b>Please re-run this program as the <%= @owner %> user, not as root.</b>
+
+But if you are sure that you want to run this program as the root user
+(which this program doesn't recommend), then re-run this program using the
+--force parameter.

data/resources/templates/config/installation_utils/support_binaries_dir_not_writable_despite_running_as_root.txt.erb

@@ -0,0 +1,13 @@
+This program must be able to write to the following directory:
+
+  <b><%= @dir %></b>
+
+But it can't do that, despite the fact that it's running as root. There's
+probably a permission problem, an SELinux problem or some kind of operating
+system security problem.
+
+This installer tried its best to find out the exact reason for this failure,
+but unfortunately it couldn't figure it out, so it's up to you now. Please
+find out what's wrong with your system, fix the problems, and re-run this
+program. If you don't know it either, please contact your operating system
+vendor for support, or consult your operating system's manual.

data/resources/templates/config/installation_utils/unexpected_filesystem_problem.txt.erb

@@ -0,0 +1,16 @@
+<red>An unexpected problem occurred</red>
+
+This program must be able to create this directory:
+
+  <b><%= @dir %></b>
+
+However, some completely unexpected filesystem error occurred. Unfortunately,
+this program can't figure out what's wrong, so it's up to you now. You can
+find the system error message below. Please find out what's wrong, fix the
+problems, and re-run this program. If you don't know it either, please contact
+your operating system vendor for support, or consult your operating system's
+manual.
+
+The error message is as follows:
+
+  <b><%= @exception %></b>

data/resources/templates/nginx/nginx_module_sources_not_available.txt.erb

@@ -1,9 +1,9 @@
 <red>The necessary source files for compiling Nginx are not installed.</red>
-<% if PhusionPassenger.native_packaging_method == "deb" %>
+<% if PhusionPassenger.packaging_method == "deb" %>
 Please install them with:
 
   <b>sudo apt-get install <%= DEB_DEV_PACKAGE %></b>
-<% elsif PhusionPassenger.native_packaging_method == "rpm" %>
+<% elsif PhusionPassenger.packaging_method == "rpm" %>
 Please install them with:
 
   <b>sudo yum install <%= RPM_DEV_PACKAGE %>-<%= VERSION_STRING %></b>

data/resources/templates/standalone/config.erb

@@ -21,7 +21,7 @@
 master_process on;
 worker_processes 1;
 daemon on;
-error_log '<%= @options[:log_file] %>' <% if debugging? %>info<% end %>;
+error_log '<%= @options[:log_file] %>' <% if @options[:log_level] >= LVL_DEBUG %>info<% end %>;
 pid '<%= @options[:pid_file] %>';
 
 <% if Process.euid == 0 %>
@@ -42,12 +42,13 @@ http {
     log_format debug '[$time_local] $msec  "$request" $status conn=$connection sent=$bytes_sent body_sent=$body_bytes_sent';
     include '<%= PhusionPassenger.resources_dir %>/mime.types';
     passenger_ruby <%= PlatformInfo.ruby_command %>;
-    passenger_root '<%= location_config_filename %>';
+    passenger_root '<%= PhusionPassenger.install_spec %>';
     passenger_abort_on_startup_error on;
-    passenger_ctl cleanup_pidfiles <%= serialize_strset("#{@temp_dir}/temp_dir_toucher.pid") %>;
+    passenger_ctl cleanup_pidfiles <%= serialize_strset("#{@working_dir}/temp_dir_toucher.pid") %>;
     passenger_user_switching off;
-    passenger_max_pool_size <%= @options[:max_pool_size] %>;
-    passenger_min_instances <%= @options[:min_instances] %>;
+    <%= nginx_option :passenger_log_level, :log_level %>
+    <%= nginx_option :passenger_max_pool_size, :max_pool_size %>
+    <%= nginx_option :passenger_min_instances, :min_instances %>
     <% if @options[:user] %>
         passenger_user <%= @options[:user] %>;
         passenger_default_user <%= @options[:user] %>;
@@ -57,8 +58,8 @@ http {
         passenger_default_user <%= current_user %>;
         passenger_analytics_log_user <%= current_user %>;
     <% end %>
-    <% if debugging? %>passenger_log_level 2;<% end %>
-    <% if @options[:temp_dir] %>passenger_temp_dir '<%= @options[:temp_dir] %>';<% end %>
+    <% if @options[:instance_registry_dir] %>passenger_instance_registry_dir '<%= @options[:instance_registry_dir] %>';<% end %>
+    <% if @options[:data_buffer_dir] %>passenger_data_buffer_dir '<%= @options[:data_buffer_dir] %>';<% end %>
     <% if @options[:rolling_restarts] %>passenger_rolling_restarts on;<% end %>
     <% if @options[:resist_deployment_errors] %>passenger_resist_deployment_errors on;<% end %>
     <% if !@options[:load_shell_envvars] %>passenger_load_shell_envvars off;<% end %>
@@ -73,6 +74,10 @@ http {
         union_station_gateway_cert -;
     <% end %>
     
+    <% @options[:ctls].each do |ctl| %>
+        passenger_ctl '<%= ctl.split("=", 2)[0] %>' '<%= ctl.split("=", 2)[1] %>';
+    <% end %>
+
     default_type application/octet-stream;
     types_hash_max_size 2048;
     server_names_hash_bucket_size 64;
@@ -106,13 +111,6 @@ http {
     }
     <% end %>
 
-    <% if @options[:ping_port] %>
-    server {
-        listen <%= nginx_listen_address(@options, true) %>;
-        root '<%= PhusionPassenger.resources_dir %>/standalone_default_root';
-    }
-    <% end %>
-    
     <% for app in @apps %>
     server {
         <% if app[:ssl] %>
@@ -137,8 +135,8 @@ http {
         passenger_spawn_method <%= app[:spawn_method] %>;
         <% if app[:app_type] %>passenger_app_type <%= app[:app_type] %>;<% end %>
         <% if app[:startup_file] %>passenger_startup_file <%= app[:startup_file] %>;<% end %>
-        <% if app[:concurrency_model] != DEFAULT_CONCURRENCY_MODEL %>passenger_concurrency_model <%= app[:concurrency_model] %>;<% end %>
-        <% if app[:thread_count] != DEFAULT_THREAD_COUNT %>passenger_thread_count <%= app[:thread_count] %>;<% end %>
+        <% if app[:concurrency_model] && app[:concurrency_model] != DEFAULT_CONCURRENCY_MODEL %>passenger_concurrency_model <%= app[:concurrency_model] %>;<% end %>
+        <% if app[:thread_count] && app[:thread_count] != DEFAULT_APP_THREAD_COUNT %>passenger_thread_count <%= app[:thread_count] %>;<% end %>
         <% if app[:min_instances] %>passenger_min_instances <%= app[:min_instances] %>;<% end %>
         <% if app[:restart_dir] %>passenger_restart_dir '<%= app[:restart_dir] %>';<% end %>
         <% if @options[:sticky_sessions] %>passenger_sticky_sessions on;<% end %>

data/resources/templates/standalone/possible_solutions_for_download_and_extraction_problems.txt.erb

@@ -7,7 +7,7 @@ Possible reasons:
 
  <b>* The URL that Passenger Standalone tried to download from no longer exists.</b>
    Please file a bug report if this is the case:
-   http://code.google.com/p/phusion-passenger/issues/list
+   https://github.com/phusion/passenger/issues
 
  <b>* The download was corrupted.</b>
    Please re-run Phusion Passenger Standalone; it will re-download Nginx.

data/test/.rspec

@@ -1,3 +1,4 @@
 --colour
 --format d
 --pattern 'dont_auto_load_anything'
+--tty

data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp

@@ -8,15 +8,12 @@ using namespace Passenger::ApplicationPool2;
 
 namespace tut {
 	struct ApplicationPool2_DirectSpawnerTest {
-		ServerInstanceDirPtr serverInstanceDir;
-		ServerInstanceDir::GenerationPtr generation;
-		ProcessPtr process;
+		SpawnObject object;
 		PipeWatcher::DataCallback gatherOutput;
 		string gatheredOutput;
 		boost::mutex gatheredOutputSyncher;
 
 		ApplicationPool2_DirectSpawnerTest() {
-			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			PipeWatcher::onData = PipeWatcher::DataCallback();
 			gatherOutput = boost::bind(&ApplicationPool2_DirectSpawnerTest::_gatherOutput, this, _1, _2);
 			setLogLevel(LVL_ERROR); // TODO: change to LVL_WARN
@@ -31,8 +28,14 @@ namespace tut {
 		}
 
 		boost::shared_ptr<DirectSpawner> createSpawner(const Options &options) {
-			return boost::make_shared<DirectSpawner>(
-				generation, make_shared<SpawnerConfig>(*resourceLocator));
+			return boost::make_shared<DirectSpawner>(createSpawnerConfig());
+		}
+
+		SpawnerConfigPtr createSpawnerConfig() {
+			SpawnerConfigPtr config = boost::make_shared<SpawnerConfig>();
+			config->resourceLocator = resourceLocator;
+			config->finalize();
+			return config;
 		}
 
 		Options createOptions() {
@@ -62,12 +65,12 @@ namespace tut {
 		options.startupFile  = ".";
 		options.startTimeout = 300;
 
-		DirectSpawner spawner(generation, make_shared<SpawnerConfig>(*resourceLocator));
+		DirectSpawner spawner(createSpawnerConfig());
 		setLogLevel(LVL_CRIT);
 
 		try {
-			process = spawner.spawn(options);
-			process->requiresShutdown = false;
+			object = spawner.spawn(options);
+			object.process->requiresShutdown = false;
 			fail("Timeout expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
@@ -85,12 +88,12 @@ namespace tut {
 		options.startCommand = "perl\t" "-e\t" "print STDERR \"hello world\\n\"";
 		options.startupFile  = ".";
 
-		DirectSpawner spawner(generation, make_shared<SpawnerConfig>(*resourceLocator));
+		DirectSpawner spawner(createSpawnerConfig());
 		setLogLevel(LVL_CRIT);
 
 		try {
-			process = spawner.spawn(options);
-			process->requiresShutdown = false;
+			object = spawner.spawn(options);
+			object.process->requiresShutdown = false;
 			fail("SpawnException expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
@@ -108,12 +111,12 @@ namespace tut {
 		options.startCommand = "ruby\t" "start.rb\t" "--execself";
 		options.startupFile  = "start.rb";
 		SpawnerPtr spawner = createSpawner(options);
-		process = spawner->spawn(options);
-		process->requiresShutdown = false;
-		ensure_equals(process->sockets->size(), 1u);
+		object = spawner->spawn(options);
+		object.process->requiresShutdown = false;
+		ensure_equals(object.process->sockets.size(), 1u);
 
-		Connection conn = process->sockets->front().checkoutConnection();
-		ScopeGuard guard(boost::bind(checkin, process, &conn));
+		Connection conn = object.process->sockets.front().checkoutConnection();
+		ScopeGuard guard(boost::bind(checkin, object.process, &conn));
 		writeExact(conn.fd, "ping\n");
 		ensure_equals(readAll(conn.fd), "pong\n");
 		);

data/test/cxx/ApplicationPool2/OptionsTest.cpp

@@ -17,28 +17,14 @@ namespace tut {
 		// Test persist().
 		char appRoot[] = "appRoot";
 		char processTitle[] = "processTitle";
-		char fooKey[] = "PASSENGER_FOO";
-		char fooValue[] = "foo";
-		char barKey[] = "PASSENGER_BAR";
-		char barValue[] = "bar";
 
 		Options options;
 		options.appRoot = appRoot;
 		options.processTitle = processTitle;
-		options.environmentVariables.push_back(make_pair(fooKey, fooValue));
-		options.environmentVariables.push_back(make_pair(barKey, barValue));
 
 		Options options2 = options.copyAndPersist();
 		appRoot[0] = processTitle[0] = 'x';
-		fooKey[0]  = fooValue[0]     = 'x';
-		barKey[0]  = barValue[0]     = 'x';
-
 		ensure_equals(options2.appRoot, "appRoot");
 		ensure_equals(options2.processTitle, "processTitle");
-		ensure_equals(options2.environmentVariables.size(), 2u);
-		ensure_equals(options2.environmentVariables[0].first, "PASSENGER_FOO");
-		ensure_equals(options2.environmentVariables[0].second, "foo");
-		ensure_equals(options2.environmentVariables[1].first, "PASSENGER_BAR");
-		ensure_equals(options2.environmentVariables[1].second, "bar");
 	}
 }

data/test/cxx/ApplicationPool2/PoolTest.cpp

@@ -15,8 +15,6 @@ using namespace Passenger::ApplicationPool2;
 
 namespace tut {
 	struct ApplicationPool2_PoolTest {
-		ServerInstanceDirPtr serverInstanceDir;
-		ServerInstanceDir::GenerationPtr generation;
 		SpawnerConfigPtr spawnerConfig;
 		SpawnerFactoryPtr spawnerFactory;
 		PoolPtr pool;
@@ -31,14 +29,15 @@ namespace tut {
 		bool retainSessions;
 
 		ApplicationPool2_PoolTest() {
-			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			retainSessions = false;
-			spawnerConfig = boost::make_shared<SpawnerConfig>(*resourceLocator);
-			spawnerFactory = boost::make_shared<SpawnerFactory>(generation,
-				spawnerConfig);
+			spawnerConfig = boost::make_shared<SpawnerConfig>();
+			spawnerConfig->resourceLocator = resourceLocator;
+			spawnerConfig->finalize();
+			spawnerFactory = boost::make_shared<SpawnerFactory>(spawnerConfig);
 			pool = boost::make_shared<Pool>(spawnerFactory);
 			pool->initialize();
-			callback = boost::bind(&ApplicationPool2_PoolTest::_callback, this, _1, _2);
+			callback.func = _callback;
+			callback.userData = this;
 			setLogLevel(LVL_ERROR); // TODO: change to LVL_WARN
 			setPrintAppOutputAsDebuggingMessages(true);
 		}
@@ -90,16 +89,19 @@ namespace tut {
 			return options;
 		}
 
-		void _callback(const SessionPtr &session, const ExceptionPtr &e) {
+		static void _callback(const SessionPtr &session, const ExceptionPtr &e,
+			void *userData)
+		{
+			ApplicationPool2_PoolTest *self = (ApplicationPool2_PoolTest *) userData;
 			SessionPtr oldSession;
 			{
-				LockGuard l(syncher);
-				oldSession = currentSession;
-				currentSession = session;
-				currentException = e;
-				number++;
-				if (retainSessions && session != NULL) {
-					sessions.push_back(session);
+				LockGuard l(self->syncher);
+				oldSession = self->currentSession;
+				self->currentSession = session;
+				self->currentException = e;
+				self->number++;
+				if (self->retainSessions && session != NULL) {
+					self->sessions.push_back(session);
 				}
 			}
 			// destroy old session object outside the lock.
@@ -157,7 +159,7 @@ namespace tut {
 				NULL);
 			shutdown(currentSession->fd(), SHUT_WR);
 			string body = stripHeaders(readAll(currentSession->fd()));
-			ProcessPtr process = currentSession->getProcess();
+			ProcessPtr process = currentSession->getProcess()->shared_from_this();
 			currentSession.reset();
 			EVENTUALLY(5,
 				result = process->busyness() == 0;
@@ -181,7 +183,8 @@ namespace tut {
 		}
 
 		void disableProcess(ProcessPtr process, AtomicInt *result) {
-			*result = (int) pool->disableProcess(process->gupid);
+			*result = (int) pool->disableProcess(StaticString(process->gupid,
+				process->gupidSize));
 		}
 	};
 
@@ -229,7 +232,7 @@ namespace tut {
 		);
 
 		// Close the session so that the process is now idle.
-		ProcessPtr process = currentSession->getProcess();
+		ProcessPtr process = currentSession->getProcess()->shared_from_this();
 		currentSession.reset();
 		ensure_equals(process->busyness(), 0);
 		ensure(!process->isTotallyBusy());
@@ -257,7 +260,7 @@ namespace tut {
 			result = number == 1;
 		);
 		SessionPtr session1 = currentSession;
-		ProcessPtr process = session1->getProcess();
+		ProcessPtr process = session1->getProcess()->shared_from_this();
 		currentSession.reset();
 		ensure_equals(process->sessions, 1);
 		ensure(process->isTotallyBusy());
@@ -266,13 +269,13 @@ namespace tut {
 		pool->asyncGet(options, callback);
 		ensure_equals("callback is not yet called", number, 1);
 		ensure_equals("the get action has been put on the wait list",
-			pool->superGroups.get("test")->defaultGroup->getWaitlist.size(), 1u);
+			pool->superGroups.lookupCopy("test")->defaultGroup->getWaitlist.size(), 1u);
 
 		session1.reset();
 		ensure_equals("callback is called after the process becomes idle",
 			number, 2);
 		ensure_equals("the get wait list has been processed",
-			pool->superGroups.get("test")->defaultGroup->getWaitlist.size(), 0u);
+			pool->superGroups.lookupCopy("test")->defaultGroup->getWaitlist.size(), 0u);
 		ensure_equals(process->sessions, 1);
 	}
 
@@ -292,7 +295,7 @@ namespace tut {
 		Options options = createOptions();
 		debug->messages->send("Proceed with spawn loop iteration 1");
 		SessionPtr session1 = pool->get(options, &ticket);
-		ProcessPtr process1 = session1->getProcess();
+		ProcessPtr process1 = session1->getProcess()->shared_from_this();
 
 		// Now spawn a process that never finishes.
 		pool->asyncGet(options, callback);
@@ -304,7 +307,7 @@ namespace tut {
 			result = number == 1;
 		);
 		ensure_equals("The first process handled the second asyncGet() request",
-			currentSession->getProcess(), process1);
+			currentSession->getProcess(), process1.get());
 
 		debug->messages->send("Proceed with spawn loop iteration 2");
 		EVENTUALLY(5,
@@ -323,7 +326,7 @@ namespace tut {
 			result = number == 1;
 		);
 		SessionPtr session1 = currentSession;
-		ProcessPtr process1 = currentSession->getProcess();
+		ProcessPtr process1 = currentSession->getProcess()->shared_from_this();
 		currentSession.reset();
 
 		// As long as we don't release process1 the following get
@@ -333,7 +336,7 @@ namespace tut {
 			result = pool->getProcessCount() == 2;
 		);
 		ensure_equals(number, 2);
-		ensure(currentSession->getProcess() != process1);
+		ensure(currentSession->getProcess() != process1.get());
 	}
 
 	TEST_METHOD(7) {
@@ -351,7 +354,7 @@ namespace tut {
 			result = pool->getProcessCount() == 3;
 		);
 		SessionPtr session1 = currentSession;
-		ProcessPtr process1 = currentSession->getProcess();
+		ProcessPtr process1 = currentSession->getProcess()->shared_from_this();
 		currentSession.reset();
 
 		// Now open another session. It should complete immediately
@@ -360,7 +363,7 @@ namespace tut {
 		pool->asyncGet(options, callback, false);
 		ensure_equals("asyncGet() completed immediately", number, 2);
 		SessionPtr session2 = currentSession;
-		ProcessPtr process2 = currentSession->getProcess();
+		ProcessPtr process2 = currentSession->getProcess()->shared_from_this();
 		l.unlock();
 		currentSession.reset();
 		ensure(process2 != process1);
@@ -371,7 +374,7 @@ namespace tut {
 		pool->asyncGet(options, callback, false);
 		ensure_equals("asyncGet() completed immediately", number, 3);
 		SessionPtr session3 = currentSession;
-		ProcessPtr process3 = currentSession->getProcess();
+		ProcessPtr process3 = currentSession->getProcess()->shared_from_this();
 		l.unlock();
 		currentSession.reset();
 		ensure(process3 != process1);
@@ -400,7 +403,7 @@ namespace tut {
 		pool->asyncGet(options, callback);
 		ensure_equals(number, 1);
 		SessionPtr session1 = currentSession;
-		ProcessPtr process1 = currentSession->getProcess();
+		ProcessPtr process1 = currentSession->getProcess()->shared_from_this();
 		currentSession.reset();
 
 		// The first process now has 1 session, so next asyncGet() should
@@ -408,7 +411,7 @@ namespace tut {
 		pool->asyncGet(options, callback);
 		ensure_equals(number, 2);
 		SessionPtr session2 = currentSession;
-		ProcessPtr process2 = currentSession->getProcess();
+		ProcessPtr process2 = currentSession->getProcess()->shared_from_this();
 		currentSession.reset();
 		ensure("(1)", process1 != process2);
 
@@ -417,7 +420,7 @@ namespace tut {
 		pool->asyncGet(options, callback);
 		ensure_equals(number, 3);
 		SessionPtr session3 = currentSession;
-		ProcessPtr process3 = currentSession->getProcess();
+		ProcessPtr process3 = currentSession->getProcess()->shared_from_this();
 		currentSession.reset();
 
 		// One process now has the lowest number of sessions. Next
@@ -425,7 +428,7 @@ namespace tut {
 		pool->asyncGet(options, callback);
 		ensure_equals(number, 4);
 		SessionPtr session4 = currentSession;
-		ProcessPtr process4 = currentSession->getProcess();
+		ProcessPtr process4 = currentSession->getProcess()->shared_from_this();
 		currentSession.reset();
 		ensure(process3 != process4);
 	}
@@ -458,20 +461,20 @@ namespace tut {
 			result = pool->getProcessCount() == 2;
 		);
 
-		SuperGroupPtr superGroup = pool->superGroups.get("test");
+		SuperGroupPtr superGroup = pool->superGroups.lookupCopy("test");
 		ensure_equals(superGroup->groups[0]->getWaitlist.size(), 0u);
 		ensure(pool->atFullCapacity());
 
 		// Now try to open another session.
 		pool->asyncGet(options, callback);
 		ensure_equals("The get request has been put on the wait list",
-			pool->superGroups.get("test")->groups[0]->getWaitlist.size(), 1u);
+			pool->superGroups.lookupCopy("test")->groups[0]->getWaitlist.size(), 1u);
 
 		// Close an existing session so that one process is no
 		// longer at full utilization.
 		sessions[0].reset();
 		ensure_equals("The get request has been removed from the wait list",
-			pool->superGroups.get("test")->groups[0]->getWaitlist.size(), 0u);
+			pool->superGroups.lookupCopy("test")->groups[0]->getWaitlist.size(), 0u);
 		ensure(pool->atFullCapacity());
 	}
 
@@ -516,10 +519,10 @@ namespace tut {
 		l.unlock();
 
 		// Close one of the sessions. Now it will process the action.
-		ProcessPtr process = sessions[0]->getProcess();
+		ProcessPtr process = sessions[0]->getProcess()->shared_from_this();
 		sessions[0].reset();
 		ensure_equals(number, 5);
-		ensure_equals(currentSession->getProcess(), process);
+		ensure_equals(currentSession->getProcess(), process.get());
 		ensure_equals(group->getWaitlist.size(), 0u);
 		ensure_equals(pool->getProcessCount(), 2u);
 	}
@@ -642,8 +645,11 @@ namespace tut {
 		initPoolDebugging();
 		debug->spawning = false;
 
+		SystemTime::forceAll(1000000);
+		pool->get(options, &ticket);
+		SystemTime::forceAll(20000000);
 		touchFile("tmp.wsgi/tmp/restart.txt", 1);
-		pool->asyncGet(options, callback, false);
+		pool->asyncGet(options, callback);
 		debug->debugger->recv("About to end restarting");
 		debug->messages->send("Finish restarting");
 		EVENTUALLY(5,
@@ -668,9 +674,9 @@ namespace tut {
 		EVENTUALLY(5,
 			result = number == 1;
 		);
-		ProcessPtr process1 = currentSession->getProcess();
-		GroupPtr group1 = process1->getGroup();
-		SuperGroupPtr superGroup1 = group1->getSuperGroup();
+		ProcessPtr process1 = currentSession->getProcess()->shared_from_this();
+		GroupPtr group1 = process1->getGroup()->shared_from_this();
+		SuperGroupPtr superGroup1 = group1->getSuperGroup()->shared_from_this();
 		currentSession.reset();
 
 		// Get from /bar and keep its session open.
@@ -706,9 +712,9 @@ namespace tut {
 		EVENTUALLY(5,
 			result = number == 1;
 		);
-		ProcessPtr process1 = currentSession->getProcess();
-		GroupPtr group1 = process1->getGroup();
-		SuperGroupPtr superGroup1 = group1->getSuperGroup();
+		ProcessPtr process1 = currentSession->getProcess()->shared_from_this();
+		GroupPtr group1 = process1->getGroup()->shared_from_this();
+		SuperGroupPtr superGroup1 = group1->getSuperGroup()->shared_from_this();
 
 		// Get from /bar and keep its session open.
 		options.appRoot = "/bar";
@@ -834,7 +840,7 @@ namespace tut {
 		options2.appRoot = "bar";
 		options2.noop = true;
 		SystemTime::force(2);
-		GroupPtr barGroup = pool->get(options2, &ticket)->getGroup();
+		GroupPtr barGroup = pool->get(options2, &ticket)->getGroup()->shared_from_this();
 		{
 			LockGuard l(pool->syncher);
 			ensure_equals("(1)", barGroup->spawn(), SR_OK);
@@ -862,7 +868,7 @@ namespace tut {
 			LockGuard l(pool->syncher);
 			vector<ProcessPtr> processes = pool->getProcesses(false);
 			if (processes.size() == 1) {
-				GroupPtr group = processes[0]->getGroup();
+				GroupPtr group = processes[0]->getGroup()->shared_from_this();
 				result = group->name == "foo#default";
 			} else {
 				result = false;
@@ -924,7 +930,7 @@ namespace tut {
 			LockGuard l(pool->syncher);
 			vector<ProcessPtr> processes = pool->getProcesses(false);
 			if (processes.size() == 1) {
-				GroupPtr group = processes[0]->getGroup();
+				GroupPtr group = processes[0]->getGroup()->shared_from_this();
 				result = group->name == "foo#default";
 			} else {
 				result = false;
@@ -953,8 +959,8 @@ namespace tut {
 			result = number == 1;
 		);
 
-		ProcessPtr process = currentSession->getProcess();
-		pool->detachProcess(currentSession->getProcess());
+		ProcessPtr process = currentSession->getProcess()->shared_from_this();
+		pool->detachProcess(process);
 		{
 			LockGuard l(pool->syncher);
 			ensure(process->enabled == Process::DETACHED);
@@ -988,15 +994,15 @@ namespace tut {
 
 		{
 			LockGuard l(pool->syncher);
-			ensure_equals(pool->superGroups.get("test")->defaultGroup->getWaitlist.size(), 1u);
+			ensure_equals(pool->superGroups.lookupCopy("test")->defaultGroup->getWaitlist.size(), 1u);
 		}
 
-		pool->detachProcess(session1->getProcess());
+		pool->detachProcess(session1->getProcess()->shared_from_this());
 		{
 			LockGuard l(pool->syncher);
-			ensure(pool->superGroups.get("test")->defaultGroup->spawning());
-			ensure_equals(pool->superGroups.get("test")->defaultGroup->enabledCount, 0);
-			ensure_equals(pool->superGroups.get("test")->defaultGroup->getWaitlist.size(), 1u);
+			ensure(pool->superGroups.lookupCopy("test")->defaultGroup->spawning());
+			ensure_equals(pool->superGroups.lookupCopy("test")->defaultGroup->enabledCount, 0);
+			ensure_equals(pool->superGroups.lookupCopy("test")->defaultGroup->getWaitlist.size(), 1u);
 		}
 
 		EVENTUALLY(5,
@@ -1036,10 +1042,10 @@ namespace tut {
 		);
 		SessionPtr session1 = currentSession;
 		currentSession.reset();
-		pool->detachProcess(session1->getProcess());
+		pool->detachProcess(session1->getProcess()->shared_from_this());
 		{
 			LockGuard l(pool->syncher);
-			ensure(pool->superGroups.get("test2") != NULL);
+			ensure(pool->superGroups.lookupCopy("test2") != NULL);
 			ensure_equals(pool->getWaitlist.size(), 0u);
 		}
 		EVENTUALLY(5,
@@ -1055,9 +1061,9 @@ namespace tut {
 		EVENTUALLY(5,
 			result = number == 1;
 		);
-		ProcessPtr process = currentSession->getProcess();
+		ProcessPtr process = currentSession->getProcess()->shared_from_this();
 		currentSession.reset();
-		SuperGroupPtr superGroup = process->getSuperGroup();
+		SuperGroupPtr superGroup = process->getSuperGroup()->shared_from_this();
 		pool->detachProcess(process);
 		LockGuard l(pool->syncher);
 		ensure_equals(pool->superGroups.size(), 1u);
@@ -1072,7 +1078,7 @@ namespace tut {
 		options.spawnMethod = "direct";
 		options.minProcesses = 0;
 		SessionPtr session = pool->get(options, &ticket);
-		ProcessPtr process = session->getProcess();
+		ProcessPtr process = session->getProcess()->shared_from_this();
 
 		ensure(pool->detachProcess(process));
 		{
@@ -1100,7 +1106,7 @@ namespace tut {
 		Options options = createOptions();
 		options.spawnMethod = "direct";
 		options.minProcesses = 0;
-		ProcessPtr process = pool->get(options, &ticket)->getProcess();
+		ProcessPtr process = pool->get(options, &ticket)->getProcess()->shared_from_this();
 
 		ScopeGuard g(boost::bind(::kill, process->pid, SIGCONT));
 		kill(process->pid, SIGSTOP);
@@ -1150,17 +1156,22 @@ namespace tut {
 			result = number == 1;
 		);
 
-		ProcessPtr process = currentSession->getProcess();
-		pool->detachProcess(currentSession->getProcess());
+		ProcessPtr process = currentSession->getProcess()->shared_from_this();
+		pool->detachProcess(process);
 		debug->debugger->recv("About to start detached processes checker");
 		{
 			LockGuard l(pool->syncher);
 			ensure(process->enabled == Process::DETACHED);
 		}
 
-		pool->detachProcess(currentSession->getProcess());
+		// detachProcess() will spawn a new process. Prevent it from being
+		// spawned too soon.
+		debug->spawning = true;
+
+		pool->detachProcess(process);
 		debug->messages->send("Proceed with starting detached processes checker");
 		debug->messages->send("Proceed with starting detached processes checker");
+		debug->messages->send("Proceed with spawn loop iteration 2");
 
 		EVENTUALLY(5,
 			result = pool->getProcessCount() == 0;
@@ -1179,7 +1190,8 @@ namespace tut {
 		ensureMinProcesses(2);
 		vector<ProcessPtr> processes = pool->getProcesses();
 		ensure_equals("Disabling succeeds",
-			pool->disableProcess(processes[0]->gupid), DR_SUCCESS);
+			pool->disableProcess(StaticString(processes[0]->gupid,
+				processes[0]->gupidSize)), DR_SUCCESS);
 
 		LockGuard l(pool->syncher);
 		ensure(processes[0]->isAlive());
@@ -1205,7 +1217,7 @@ namespace tut {
 		spawnerConfig->spawnTime = 60000;
 		AtomicInt code = -1;
 		TempThread thr(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
-			this, session->getProcess(), &code));
+			this, session->getProcess()->shared_from_this(), &code));
 		EVENTUALLY2(100, 1,
 			result = pool->isSpawning();
 		);
@@ -1228,7 +1240,8 @@ namespace tut {
 		vector<ProcessPtr> processes = pool->getProcesses();
 		ensure_equals("(1)", processes.size(), 1u);
 
-		DisableResult result = pool->disableProcess(processes[0]->gupid);
+		DisableResult result = pool->disableProcess(StaticString(
+			processes[0]->gupid, processes[0]->gupidSize));
 		ensure_equals("(2)", result, DR_ERROR);
 		ensure_equals("(3)", pool->getProcessCount(), 1u);
 	}
@@ -1244,14 +1257,16 @@ namespace tut {
 		SessionPtr session1 = pool->get(options, &ticket);
 		SessionPtr session2 = pool->get(options, &ticket);
 		ensure_equals(pool->getProcessCount(), 2u);
-		GroupPtr group = session1->getGroup();
+		GroupPtr group = session1->getGroup()->shared_from_this();
+		ProcessPtr process1 = session1->getProcess()->shared_from_this();
+		ProcessPtr process2 = session2->getProcess()->shared_from_this();
 
-		AtomicInt code1 = -1, code2 = -1;
+		AtomicInt code1 = -1, code2 = -2;
 		TempThread thr(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
-			this, session1->getProcess(), &code1));
+			this, process1, &code1));
 		TempThread thr2(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
-			this, session2->getProcess(), &code2));
-		EVENTUALLY(2,
+			this, process2, &code2));
+		EVENTUALLY(5,
 			LockGuard l(pool->syncher);
 			result = group->enabledCount == 0
 				&& group->disablingCount == 2
@@ -1260,7 +1275,7 @@ namespace tut {
 		session1.reset();
 		session2.reset();
 		SHOULD_NEVER_HAPPEN(20,
-			result = code1 != -1 || code2 != -1;
+			result = code1 != -1 || code2 != -2;
 		);
 
 		debug->messages->send("Proceed with spawn loop iteration 3");
@@ -1294,11 +1309,11 @@ namespace tut {
 
 		AtomicInt code1 = -1, code2 = -1;
 		TempThread thr(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
-			this, session1->getProcess(), &code1));
+			this, session1->getProcess()->shared_from_this(), &code1));
 		TempThread thr2(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
-			this, session2->getProcess(), &code2));
+			this, session2->getProcess()->shared_from_this(), &code2));
 		EVENTUALLY(2,
-			GroupPtr group = session1->getGroup();
+			GroupPtr group = session1->getGroup()->shared_from_this();
 			LockGuard l(pool->syncher);
 			result = group->enabledCount == 0
 				&& group->disablingCount == 2
@@ -1308,7 +1323,7 @@ namespace tut {
 			result = code1 != -1 || code2 != -1;
 		);
 
-		setLogLevel(-2);
+		setLogLevel(LVL_CRIT);
 		debug->messages->send("Fail spawn loop iteration 3");
 		EVENTUALLY(5,
 			result = code1 == DR_ERROR;
@@ -1317,7 +1332,7 @@ namespace tut {
 			result = code2 == DR_ERROR;
 		);
 		{
-			GroupPtr group = session1->getGroup();
+			GroupPtr group = session1->getGroup()->shared_from_this();
 			LockGuard l(pool->syncher);
 			ensure_equals(group->enabledCount, 2);
 			ensure_equals(group->disablingCount, 0);
@@ -1348,12 +1363,12 @@ namespace tut {
 
 		AtomicInt code = -1;
 		TempThread thr(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
-			this, session->getProcess(), &code));
+			this, session->getProcess()->shared_from_this(), &code));
 		SHOULD_NEVER_HAPPEN(100,
 			result = code != -1;
 		);
 		session.reset();
-		EVENTUALLY(1,
+		EVENTUALLY(5,
 			result = code != -1;
 		);
 		ensure_equals(code, (int) DR_SUCCESS);
@@ -1372,12 +1387,13 @@ namespace tut {
 
 		vector<ProcessPtr> processes = pool->getProcesses();
 		ensure_equals(processes.size(), 2u);
-		DisableResult result = pool->disableProcess(processes[0]->gupid);
+		DisableResult result = pool->disableProcess(
+			StaticString(processes[0]->gupid, processes[0]->gupidSize));
 		ensure_equals(result, DR_SUCCESS);
 
 		{
 			ScopedLock l(pool->syncher);
-			GroupPtr group = processes[0]->getGroup();
+			GroupPtr group = processes[0]->getGroup()->shared_from_this();
 			ensure_equals(group->enabledCount, 1);
 			ensure_equals(group->disablingCount, 0);
 			ensure_equals(group->disabledCount, 1);
@@ -1443,9 +1459,11 @@ namespace tut {
 		EVENTUALLY(5,
 			result = number == 1;
 		);
-		string gupid = currentSession->getProcess()->gupid;
+		string gupid(currentSession->getProcess()->gupid,
+			currentSession->getProcess()->gupidSize);
 		ensure(!gupid.empty());
-		ensure_equals(currentSession->getProcess(), pool->findProcessByGupid(gupid));
+		ensure_equals(currentSession->getProcess(),
+			pool->findProcessByGupid(gupid).get());
 	}
 
 	TEST_METHOD(63) {
@@ -1514,6 +1532,7 @@ namespace tut {
 		options.appType = "wsgi";
 		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
+		options.statThrottleRate = 0;
 		pool->setMax(1);
 
 		// Send normal request.
@@ -1556,7 +1575,7 @@ namespace tut {
 			"sys.stderr.write('Something went wrong!')\n"
 			"exit(1)\n");
 
-		setLogLevel(-2);
+		setLogLevel(LVL_CRIT);
 		pool->asyncGet(options, callback);
 		EVENTUALLY(5,
 			result = number == 1;
@@ -1595,7 +1614,7 @@ namespace tut {
 			"	sys.stderr.write('Something went wrong!')\n"
 			"	exit(1)\n");
 
-		setLogLevel(-2);
+		setLogLevel(LVL_CRIT);
 		pool->asyncGet(options, callback);
 		EVENTUALLY(5,
 			result = number == 1;
@@ -1664,8 +1683,8 @@ namespace tut {
 			result = number == 3;
 		);
 		ensure_equals(pool->getProcessCount(), 2u);
-		SuperGroupPtr superGroup1 = pool->superGroups.get("stub/rack");
-		SuperGroupPtr superGroup2 = pool->superGroups.get("stub/rack");
+		SuperGroupPtr superGroup1 = pool->superGroups.lookupCopy("stub/rack");
+		SuperGroupPtr superGroup2 = pool->superGroups.lookupCopy("stub/rack");
 		ensure_equals(superGroup1->defaultGroup->enabledCount, 1);
 		ensure_equals(superGroup2->defaultGroup->enabledCount, 1);
 	}
@@ -1705,6 +1724,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.minProcesses = 3;
+		options.statThrottleRate = 0;
 
 		// Trigger spawn loop and freeze it at the point where it's spawning
 		// the second process.
@@ -1749,6 +1769,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.minProcesses = 2;
+		options.statThrottleRate = 0;
 		pool->asyncGet(options, callback);
 		EVENTUALLY(2,
 			result = pool->getProcessCount() == 2;
@@ -1802,7 +1823,7 @@ namespace tut {
 			"exit(1)\n");
 
 		retainSessions = true;
-		setLogLevel(-2);
+		setLogLevel(LVL_CRIT);
 		pool->asyncGet(options, callback);
 		pool->asyncGet(options, callback);
 		pool->asyncGet(options, callback);
@@ -1848,7 +1869,7 @@ namespace tut {
 			"sys.stderr.write('Something went wrong!')\n"
 			"exit(1)\n");
 		try {
-			setLogLevel(-2);
+			setLogLevel(LVL_CRIT);
 			currentSession = pool->get(options, &ticket);
 			fail("SpawnException expected");
 		} catch (const SpawnException &) {
@@ -2025,9 +2046,11 @@ namespace tut {
 		options.appType = "wsgi";
 		options.startupFile = "passenger_wsgi.py";
 		options.spawnMethod = "direct";
+		options.statThrottleRate = 0;
 
 		SessionPtr session = pool->get(options, &ticket);
-		string gupid = session->getProcess()->gupid;
+		string gupid(session->getProcess()->gupid,
+			session->getProcess()->gupidSize);
 		session.reset();
 		pool->detachProcess(gupid);
 		touchFile("tmp.wsgi/tmp/restart.txt", 1);