passenger 3.9.2.beta → 4.0.0.rc4

data/ext/common/ApplicationPool2/Spawner.h

@@ -60,6 +60,7 @@
 #include <boost/make_shared.hpp>
 #include <boost/shared_array.hpp>
 #include <boost/bind.hpp>
+#include <boost/foreach.hpp>
 #include <oxt/system_calls.hpp>
 #include <oxt/backtrace.hpp>
 #include <sys/types.h>
@@ -69,8 +70,6 @@
 #include <cerrno>
 #include <cassert>
 #include <unistd.h>
-#include <pthread.h>
-#include <limits.h>  // for PTHREAD_STACK_MIN
 #include <pwd.h>
 #include <grp.h>
 #include <dirent.h>
@@ -83,6 +82,7 @@
 #include <ResourceLocator.h>
 #include <StaticString.h>
 #include <ServerInstanceDir.h>
+#include <Utils.h>
 #include <Utils/BufferedIO.h>
 #include <Utils/ScopeGuard.h>
 #include <Utils/Timer.h>
@@ -117,7 +117,8 @@ protected:
 	class BackgroundIOCapturer {
 	private:
 		FileDescriptor fd;
-		int target;
+		string prefix;
+		bool print;
 		boost::mutex dataSyncher;
 		string data;
 		oxt::thread *thr;
@@ -145,18 +146,28 @@ protected:
 						lock_guard<boost::mutex> l(dataSyncher);
 						data.append(buf, ret);
 					}
-					if (target != -1) {
-						UPDATE_TRACE_POINT();
-						writeExact(target, buf, ret);
+					UPDATE_TRACE_POINT();
+					if (print && ret == 1 && buf[0] == '\n') {
+						P_INFO(prefix);
+					} else if (print) {
+						vector<StaticString> lines;
+						if (ret > 0 && buf[ret - 1] == '\n') {
+							ret--;
+						}
+						split(StaticString(buf, ret), '\n', lines);
+						foreach (const StaticString line, lines) {
+							P_INFO(prefix << line);
+						}
 					}
 				}
 			}
 		}
 		
 	public:
-		BackgroundIOCapturer(const FileDescriptor &_fd, int _target)
+		BackgroundIOCapturer(const FileDescriptor &_fd, const string &_prefix, bool _print)
 			: fd(_fd),
-			  target(_target),
+			  prefix(_prefix),
+			  print(_print),
 			  thr(NULL)
 			{ }
 		
@@ -257,6 +268,12 @@ protected:
 
 	typedef shared_ptr<DebugDir> DebugDirPtr;
 
+	/**
+	 * Contains information that will be used after fork()ing but before exec()ing,
+	 * such as the intended app root, the UID it should switch to, the
+	 * groups it should assume, etc. This structure is allocated before forking
+	 * because after forking and before exec() it may not be safe to allocate memory.
+	 */
 	struct SpawnPreparationInfo {
 		// General
 
@@ -302,9 +319,21 @@ protected:
 	 * the spawning protocol.
 	 */
 	struct NegotiationDetails {
-		// Arguments.
+		/****** Arguments ******/
+
+		/** The preparation info of the process we're negotiating with. It's used
+		 * by security validators to check whether the information sent back by the
+		 * process make any sense. */
+		SpawnPreparationInfo *preparation;
+		/** The SafeLibev that the returned Process should be initialized with. */
 		SafeLibevPtr libev;
+		/** This object captures the process's stderr while negotiation is in progress.
+		 * (Recall that negotiation is performed over the process's stdout while stderr
+		 * is used purely for outputting messages.)
+		 * If the negotiation protocol fails, then any output captured by this object
+		 * will be stored into the resulting SpawnException's error page. */
 		BackgroundIOCapturerPtr stderrCapturer;
+		/** The PID of the process we're negotiating with. */
 		pid_t pid;
 		FileDescriptor adminSocket;
 		FileDescriptor errorPipe;
@@ -313,7 +342,7 @@ protected:
 		int forwardStderrTo;
 		DebugDirPtr debugDir;
 		
-		// Working state.
+		/****** Working state ******/
 		BufferedIO io;
 		string gupid;
 		string connectPassword;
@@ -321,6 +350,7 @@ protected:
 		unsigned long long timeout;
 		
 		NegotiationDetails() {
+			preparation = NULL;
 			pid = 0;
 			options = NULL;
 			forwardStderr = false;
@@ -329,31 +359,6 @@ protected:
 			timeout = 0;
 		}
 	};
-
-	/**
-	 * Structure containing arguments and working state for negotiating
-	 * the preloader startup protocol.
-	 */
-	struct StartupDetails {
-		// Arguments.
-		FileDescriptor adminSocket;
-		BufferedIO io;
-		BackgroundIOCapturerPtr stderrCapturer;
-		DebugDirPtr debugDir;
-		const Options *options;
-		bool forwardStderr;
-		int forwardStderrTo;
-
-		// Working state.
-		unsigned long long timeout;
-
-		StartupDetails() {
-			options = NULL;
-			forwardStderr = false;
-			forwardStderrTo = STDERR_FILENO;
-			timeout = 0;
-		}
-	};
 	
 	
 private:
@@ -394,8 +399,12 @@ private:
 				data.append(key + ": " + value + "\n");
 			}
 
+			vector<StaticString> lines;
+			split(data, '\n', lines);
+			foreach (const StaticString line, lines) {
+				P_DEBUG("[App " << details.pid << " stdin >>] " << line);
+			}
 			writeExact(details.adminSocket, data, &details.timeout);
-			P_TRACE(2, "Spawn request for " << details.options->appRoot << ":\n" << data);
 			writeExact(details.adminSocket, "\n", &details.timeout);
 		} catch (const SystemException &e) {
 			if (e.code() == EPIPE) {
@@ -465,6 +474,13 @@ private:
 				vector<string> args;
 				split(value, ';', args);
 				if (args.size() == 4) {
+					string error = validateSocketAddress(details, args[1]);
+					if (!error.empty()) {
+						throwAppSpawnException(
+							"An error occurred while starting the web application. " + error,
+							SpawnException::APP_STARTUP_PROTOCOL_ERROR,
+							details);
+					}
 					sockets->add(args[0],
 						fixupSocketAddress(*details.options, args[1]),
 						args[2],
@@ -501,7 +517,6 @@ private:
 	
 protected:
 	ResourceLocator resourceLocator;
-	RandomGeneratorPtr randomGenerator;
 	ServerInstanceDir::GenerationPtr generation;
 	SpawnerConfigPtr config;
 	
@@ -555,6 +570,73 @@ protected:
 		}
 	}
 
+	bool isAbsolutePath(const StaticString &path) const {
+		if (path.empty() || path[0] != '/') {
+			return false;
+		} else {
+			vector<string> components;
+			string component;
+
+			split(path, '/', components);
+			components.erase(components.begin());
+			foreach (component, components) {
+				if (component.empty() || component == "." || component == "..") {
+					return false;
+				}
+			}
+			return true;
+		}
+	}
+
+	/**
+	 * Given a 'socket:' information string obtained from the spawned process,
+	 * validates whether it is correct.
+	 */
+	string validateSocketAddress(NegotiationDetails &details, const string &_address) const {
+		string address = _address;
+		stringstream error;
+
+		switch (getSocketAddressType(address)) {
+		case SAT_UNIX: {
+			address = fixupSocketAddress(*details.options, address);
+			string filename = parseUnixSocketAddress(address);
+
+			// Verify that the socket filename is absolute.
+			if (!isAbsolutePath(filename)) {
+				error << "It reported a non-absolute socket filename: \"" <<
+					cEscapeString(filename) << "\"";
+				break;
+			}
+
+			// Verify that the process owns the socket.
+			struct stat buf;
+			if (lstat(filename.c_str(), &buf) == -1) {
+				int e = errno;
+				error << "It reported an inaccessible socket filename: \"" <<
+					cEscapeString(filename) << "\" (lstat() failed with errno " <<
+					e << ": " << strerror(e) << ")";
+				break;
+			}
+			if (buf.st_uid != details.preparation->uid) {
+				error << "It advertised a Unix domain socket that has a different " <<
+					"owner than expected (should be UID " << details.preparation->uid <<
+					", but actual UID was " << buf.st_uid << ")";
+				break;
+			}
+			break;
+		}
+		case SAT_TCP:
+			// TODO: validate that the socket is localhost.
+			break;
+		default:
+			error << "It reported an unsupported socket address type: \"" <<
+				cEscapeString(address) << "\"";
+			break;
+		}
+
+		return error.str();
+	}
+
 	static void checkChrootDirectories(const Options &options) {
 		if (!options.preexecChroot.empty()) {
 			// TODO: check whether appRoot is a child directory of preexecChroot
@@ -633,22 +715,28 @@ protected:
 	}
 
 	template<typename Details>
-	static string readMessageLine(Details &details) {
+	string readMessageLine(Details &details) {
 		TRACE_POINT();
 		while (true) {
 			string result = details.io.readLine(1024 * 4, &details.timeout);
+			string line = result;
+			if (!line.empty() && line[line.size() - 1] == '\n') {
+				line.erase(line.size() - 1, 1);
+			}
+			
 			if (result.empty()) {
+				// EOF
 				return result;
 			} else if (startsWith(result, "!> ")) {
+				P_DEBUG("[App " << details.pid << " stdout] " << line);
 				result.erase(0, sizeof("!> ") - 1);
 				return result;
 			} else {
 				if (details.stderrCapturer != NULL) {
 					details.stderrCapturer->appendToBuffer(result);
 				}
-				if (details.forwardStderr) {
-					write(details.forwardStderrTo, result.data(), result.size());
-				}
+				P_LOG(config->forwardStdout ? LVL_INFO : LVL_DEBUG,
+					"[App " << details.pid << " stdout] " << line);
 			}
 		}
 	}
@@ -783,7 +871,6 @@ protected:
 			gid_t groups[1024];
 			info.ngroups = sizeof(groups) / sizeof(gid_t);
 		#endif
-		int ret;
 		info.switchUser = true;
 		info.username = userInfo->pw_name;
 		info.groupname = groupInfo->gr_name;
@@ -795,7 +882,7 @@ protected:
 			#define HAVE_GETGROUPLIST
 		#endif
 		#ifdef HAVE_GETGROUPLIST
-			ret = getgrouplist(userInfo->pw_name, groupInfo->gr_gid,
+			int ret = getgrouplist(userInfo->pw_name, groupInfo->gr_gid,
 				groups, &info.ngroups);
 			if (ret == -1) {
 				int e = errno;
@@ -847,13 +934,13 @@ protected:
 		if (!options.baseURI.empty() && options.baseURI != "/") {
 			appendNullTerminatedKeyValue(result,
 				"RAILS_RELATIVE_URL_ROOT",
-				options.environment);
+				options.baseURI);
 			appendNullTerminatedKeyValue(result,
 				"RACK_BASE_URI",
-				options.environment);
+				options.baseURI);
 			appendNullTerminatedKeyValue(result,
 				"PASSENGER_BASE_URI",
-				options.environment);
+				options.baseURI);
 		}
 		
 		it  = options.environmentVariables.begin();
@@ -1001,12 +1088,15 @@ protected:
 		}
 	}
 	
+	/**
+	 * Execute the process spawning negotiation protocol.
+	 */
 	ProcessPtr negotiateSpawn(NegotiationDetails &details) {
 		TRACE_POINT();
 		details.spawnStartTime = SystemTime::getUsec();
 		details.gupid = integerToHex(SystemTime::get() / 60) + "-" +
-			randomGenerator->generateAsciiString(11);
-		details.connectPassword = randomGenerator->generateAsciiString(43);
+			config->randomGenerator->generateAsciiString(11);
+		details.connectPassword = config->randomGenerator->generateAsciiString(43);
 		details.timeout = details.options->startTimeout * 1000;
 		
 		string result;
@@ -1025,6 +1115,7 @@ protected:
 				details);
 		}
 		
+		protocol_begin:
 		if (result == "I have control 1.0\n") {
 			UPDATE_TRACE_POINT();
 			sendSpawnRequest(details);
@@ -1046,6 +1137,8 @@ protected:
 				return handleSpawnResponse(details);
 			} else if (result == "Error\n") {
 				handleSpawnErrorResponse(details);
+			} else if (result == "I have control 1.0\n") {
+				goto protocol_begin;
 			} else {
 				handleInvalidSpawnResponseType(result, details);
 			}
@@ -1161,1107 +1254,6 @@ public:
 typedef shared_ptr<Spawner> SpawnerPtr;
 
 
-class SmartSpawner: public Spawner, public enable_shared_from_this<SmartSpawner> {
-private:
-	struct SpawnResult {
-		pid_t pid;
-		FileDescriptor adminSocket;
-		BufferedIO io;
-	};
-
-	/** The event loop that created Process objects should use, and that I/O forwarding
-	 * functions should use. For example data on the error pipe is forwarded using this event loop.
-	 */
-	SafeLibevPtr libev;
-	const vector<string> preloaderCommand;
-	map<string, string> preloaderAnnotations;
-	Options options;
-	ev::io preloaderOutputWatcher;
-	shared_ptr<PipeWatcher> preloaderErrorWatcher;
-	
-	// Protects m_lastUsed and pid.
-	mutable boost::mutex simpleFieldSyncher;
-	// Protects everything else.
-	mutable boost::mutex syncher;
-
-	pid_t pid;
-	FileDescriptor adminSocket;
-	string socketAddress;
-	unsigned long long m_lastUsed;
-	
-	void onPreloaderOutputReadable(ev::io &io, int revents) {
-		char buf[1024 * 8];
-		ssize_t ret;
-		
-		ret = syscalls::read(adminSocket, buf, sizeof(buf));
-		if (ret <= 0) {
-			preloaderOutputWatcher.stop();
-		} else if (config->forwardStdout) {
-			write(config->forwardStdoutTo, buf, ret);
-		}
-	}
-
-	string getPreloaderCommandString() const {
-		string result;
-		unsigned int i;
-		
-		for (i = 0; i < preloaderCommand.size(); i++) {
-			if (i != 0) {
-				result.append(1, '\0');
-			}
-			result.append(preloaderCommand[i]);
-		}
-		return result;
-	}
-	
-	vector<string> createRealPreloaderCommand(const Options &options,
-		shared_array<const char *> &args)
-	{
-		string agentsDir = resourceLocator.getAgentsDir();
-		vector<string> command;
-		
-		if (options.loadShellEnvvars) {
-			command.push_back("bash");
-			command.push_back("bash");
-			command.push_back("-lc");
-			command.push_back("exec \"$@\"");
-			command.push_back("SpawnPreparerShell");
-		} else {
-			command.push_back(agentsDir + "/SpawnPreparer");
-		}
-		command.push_back(agentsDir + "/SpawnPreparer");
-		command.push_back(serializeEnvvarsFromPoolOptions(options));
-		command.push_back(preloaderCommand[0]);
-		command.push_back("Passenger AppPreloader: " + options.appRoot);
-		for (unsigned int i = 1; i < preloaderCommand.size(); i++) {
-			command.push_back(preloaderCommand[i]);
-		}
-		
-		createCommandArgs(command, args);
-		return command;
-	}
-	
-	void throwPreloaderSpawnException(const string &msg,
-		SpawnException::ErrorKind errorKind,
-		StartupDetails &details)
-	{
-		throwPreloaderSpawnException(msg, errorKind, details.stderrCapturer,
-			details.debugDir);
-	}
-
-	void throwPreloaderSpawnException(const string &msg,
-		SpawnException::ErrorKind errorKind,
-		BackgroundIOCapturerPtr &stderrCapturer,
-		const DebugDirPtr &debugDir)
-	{
-		TRACE_POINT();
-		// Stop the stderr capturing thread and get the captured stderr
-		// output so far.
-		string stderrOutput;
-		if (stderrCapturer != NULL) {
-			stderrOutput = stderrCapturer->stop();
-		}
-		
-		// If the exception wasn't due to a timeout, try to capture the
-		// remaining stderr output for at most 2 seconds.
-		if (errorKind != SpawnException::PRELOADER_STARTUP_TIMEOUT
-		 && errorKind != SpawnException::APP_STARTUP_TIMEOUT
-		 && stderrCapturer != NULL) {
-			bool done = false;
-			unsigned long long timeout = 2000;
-			while (!done) {
-				char buf[1024 * 32];
-				unsigned int ret;
-				
-				try {
-					ret = readExact(stderrCapturer->getFd(), buf,
-						sizeof(buf), &timeout);
-					if (ret == 0) {
-						done = true;
-					} else {
-						stderrOutput.append(buf, ret);
-					}
-				} catch (const SystemException &e) {
-					P_WARN("Stderr I/O capture error: " << e.what());
-					done = true;
-				} catch (const TimeoutException &) {
-					done = true;
-				}
-			}
-		}
-		stderrCapturer.reset();
-		
-		// Now throw SpawnException with the captured stderr output
-		// as error response.
-		SpawnException e(msg, stderrOutput, false, errorKind);
-		e.setPreloaderCommand(getPreloaderCommandString());
-		annotatePreloaderException(e, debugDir);
-		throw e;
-	}
-
-	void annotatePreloaderException(SpawnException &e, const DebugDirPtr &debugDir) {
-		if (debugDir != NULL) {
-			e.addAnnotations(debugDir->readAll());
-		}
-	}
-
-	bool preloaderStarted() const {
-		return pid != -1;
-	}
-
-	void startPreloader() {
-		TRACE_POINT();
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
-		assert(!preloaderStarted());
-		checkChrootDirectories(options);
-		
-		shared_array<const char *> args;
-		vector<string> command = createRealPreloaderCommand(options, args);
-		SpawnPreparationInfo preparation = prepareSpawn(options);
-		SocketPair adminSocket = createUnixSocketPair();
-		Pipe errorPipe = createPipe();
-		DebugDirPtr debugDir = make_shared<DebugDir>(preparation.uid, preparation.gid);
-		pid_t pid;
-		
-		pid = syscalls::fork();
-		if (pid == 0) {
-			setenv("PASSENGER_DEBUG_DIR", debugDir->getPath().c_str(), 1);
-			purgeStdio(stdout);
-			purgeStdio(stderr);
-			resetSignalHandlersAndMask();
-			disableMallocDebugging();
-			int adminSocketCopy = dup2(adminSocket.first, 3);
-			int errorPipeCopy = dup2(errorPipe.second, 4);
-			dup2(adminSocketCopy, 0);
-			dup2(adminSocketCopy, 1);
-			dup2(errorPipeCopy, 2);
-			closeAllFileDescriptors(2);
-			setChroot(preparation);
-			switchUser(preparation);
-			setWorkingDirectory(preparation);
-			execvp(command[0].c_str(), (char * const *) args.get());
-			
-			int e = errno;
-			printf("!> Error\n");
-			printf("!> \n");
-			printf("Cannot execute \"%s\": %s (errno=%d)\n", command[0].c_str(),
-				strerror(e), e);
-			fprintf(stderr, "Cannot execute \"%s\": %s (errno=%d)\n",
-				command[0].c_str(), strerror(e), e);
-			fflush(stdout);
-			fflush(stderr);
-			_exit(1);
-			
-		} else if (pid == -1) {
-			int e = errno;
-			throw SystemException("Cannot fork a new process", e);
-			
-		} else {
-			ScopeGuard guard(boost::bind(nonInterruptableKillAndWaitpid, pid));
-			adminSocket.first.close();
-			errorPipe.second.close();
-			
-			StartupDetails details;
-			details.adminSocket = adminSocket.second;
-			details.io = BufferedIO(adminSocket.second);
-			details.stderrCapturer =
-				make_shared<BackgroundIOCapturer>(
-					errorPipe.first,
-					config->forwardStderr ? config->forwardStderrTo : -1);
-			details.stderrCapturer->start();
-			details.debugDir = debugDir;
-			details.options = &options;
-			details.timeout = options.startTimeout * 1000;
-			details.forwardStderr = config->forwardStderr;
-			details.forwardStderrTo = config->forwardStderrTo;
-			
-			{
-				this_thread::restore_interruption ri(di);
-				this_thread::restore_syscall_interruption rsi(dsi);
-				socketAddress = negotiatePreloaderStartup(details);
-			}
-			this->adminSocket = adminSocket.second;
-			{
-				lock_guard<boost::mutex> l(simpleFieldSyncher);
-				this->pid = pid;
-			}
-			preloaderOutputWatcher.set(adminSocket.second, ev::READ);
-			libev->start(preloaderOutputWatcher);
-			setNonBlocking(errorPipe.first);
-			preloaderErrorWatcher = make_shared<PipeWatcher>(libev,
-				errorPipe.first,
-				config->forwardStderr ? config->forwardStderrTo : -1);
-			preloaderErrorWatcher->start();
-			preloaderAnnotations = debugDir->readAll();
-			P_DEBUG("Preloader for " << options.appRoot <<
-				" started on PID " << pid <<
-				", listening on " << socketAddress);
-			guard.clear();
-		}
-	}
-	
-	void stopPreloader() {
-		TRACE_POINT();
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
-		
-		if (!preloaderStarted()) {
-			return;
-		}
-		adminSocket.close();
-		if (timedWaitpid(pid, NULL, 5000) == 0) {
-			P_TRACE(2, "Spawn server did not exit in time, killing it...");
-			syscalls::kill(pid, SIGKILL);
-			syscalls::waitpid(pid, NULL, 0);
-		}
-		libev->stop(preloaderOutputWatcher);
-		// Detach the error pipe; it will truly be closed after the error
-		// pipe has reached EOF.
-		preloaderErrorWatcher.reset();
-		// Delete socket after the process has exited so that it
-		// doesn't crash upon deleting a nonexistant file.
-		// TODO: in Passenger 4 we must check whether the file really was
-		// owned by the preloader, otherwise this is a potential security flaw.
-		if (getSocketAddressType(socketAddress) == SAT_UNIX) {
-			string filename = parseUnixSocketAddress(socketAddress);
-			syscalls::unlink(filename.c_str());
-		}
-		{
-			lock_guard<boost::mutex> l(simpleFieldSyncher);
-			pid = -1;
-		}
-		socketAddress.clear();
-	}
-	
-	void sendStartupRequest(StartupDetails &details) {
-		TRACE_POINT();
-		try {
-			writeExact(details.adminSocket,
-				"You have control 1.0\n"
-				"passenger_root: " + resourceLocator.getRoot() + "\n"
-				"ruby_libdir: " + resourceLocator.getRubyLibDir() + "\n"
-				"passenger_version: " PASSENGER_VERSION "\n"
-				"generation_dir: " + generation->getPath() + "\n",
-				&details.timeout);
-
-			vector<string> args;
-			vector<string>::const_iterator it, end;
-			details.options->toVector(args, resourceLocator);
-			for (it = args.begin(); it != args.end(); it++) {
-				const string &key = *it;
-				it++;
-				const string &value = *it;
-				writeExact(details.adminSocket,
-					key + ": " + value + "\n",
-					&details.timeout);
-			}
-			writeExact(details.adminSocket, "\n", &details.timeout);
-		} catch (const SystemException &e) {
-			if (e.code() == EPIPE) {
-				/* Ignore this. Process might have written an
-				 * error response before reading the arguments,
-				 * in which case we'll want to show that instead.
-				 */
-			} else {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. There was an I/O error while "
-					"sending the startup request message to it: " +
-					e.sys(),
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			}
-		} catch (const TimeoutException &) {
-			throwPreloaderSpawnException("An error occurred while starting up the "
-				"preloader: it did not read the startup request message in time.",
-				SpawnException::PRELOADER_STARTUP_TIMEOUT,
-				details);
-		}
-	}
-	
-	string handleStartupResponse(StartupDetails &details) {
-		TRACE_POINT();
-		string socketAddress;
-		
-		while (true) {
-			string line;
-			
-			try {
-				line = readMessageLine(details);
-			} catch (const SystemException &e) {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. There was an I/O error while reading its "
-					"startup response: " + e.sys(),
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			} catch (const TimeoutException &) {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader: it did not write a startup response in time.",
-					SpawnException::PRELOADER_STARTUP_TIMEOUT,
-					details);
-			}
-			
-			if (line.empty()) {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. It unexpected closed the connection while "
-					"sending its startup response.",
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			} else if (line[line.size() - 1] != '\n') {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. It sent a line without a newline character "
-					"in its startup response.",
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			} else if (line == "\n") {
-				break;
-			}
-			
-			string::size_type pos = line.find(": ");
-			if (pos == string::npos) {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. It sent a startup response line without "
-					"separator.",
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			}
-			
-			string key = line.substr(0, pos);
-			string value = line.substr(pos + 2, line.size() - pos - 3);
-			if (key == "socket") {
-				socketAddress = fixupSocketAddress(options, value);
-			} else {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. It sent an unknown startup response line "
-					"called '" + key + "'.",
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			}
-		}
-		
-		if (socketAddress.empty()) {
-			throwPreloaderSpawnException("An error occurred while starting up "
-				"the preloader. It did not report a socket address in its "
-				"startup response.",
-				SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-				details);
-		}
-		
-		return socketAddress;
-	}
-	
-	void handleErrorResponse(StartupDetails &details) {
-		TRACE_POINT();
-		map<string, string> attributes;
-		
-		while (true) {
-			string line;
-			
-			try {
-				line = readMessageLine(details);
-			} catch (const SystemException &e) {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. There was an I/O error while reading its "
-					"startup response: " + e.sys(),
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			} catch (const TimeoutException &) {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader: it did not write a startup response in time.",
-					SpawnException::PRELOADER_STARTUP_TIMEOUT,
-					details);
-			}
-			
-			if (line.empty()) {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. It unexpected closed the connection while "
-					"sending its startup response.",
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			} else if (line[line.size() - 1] != '\n') {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. It sent a line without a newline character "
-					"in its startup response.",
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			} else if (line == "\n") {
-				break;
-			}
-			
-			string::size_type pos = line.find(": ");
-			if (pos == string::npos) {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. It sent a startup response line without "
-					"separator.",
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			}
-			
-			string key = line.substr(0, pos);
-			string value = line.substr(pos + 2, line.size() - pos - 3);
-			attributes[key] = value;
-		}
-		
-		try {
-			string message = details.io.readAll(&details.timeout);
-			SpawnException e("An error occured while starting up the preloader.",
-				message,
-				attributes["html"] == "true",
-				SpawnException::PRELOADER_STARTUP_EXPLAINABLE_ERROR);
-			e.setPreloaderCommand(getPreloaderCommandString());
-			annotatePreloaderException(e, details.debugDir);
-			throw e;
-		} catch (const SystemException &e) {
-			throwPreloaderSpawnException("An error occurred while starting up "
-				"the preloader. It tried to report an error message, but "
-				"an I/O error occurred while reading this error message: " +
-				e.sys(),
-				SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-				details);
-		} catch (const TimeoutException &) {
-			throwPreloaderSpawnException("An error occurred while starting up "
-				"the preloader. It tried to report an error message, but "
-				"it took too much time doing that.",
-				SpawnException::PRELOADER_STARTUP_TIMEOUT,
-				details);
-		}
-	}
-	
-	void handleInvalidResponseType(StartupDetails &details, const string &line) {
-		throwPreloaderSpawnException("An error occurred while starting up "
-			"the preloader. It sent an unknown response type \"" +
-			cEscapeString(line) + "\".",
-			SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-			details);
-	}
-	
-	string negotiatePreloaderStartup(StartupDetails &details) {
-		TRACE_POINT();
-		string result;
-		try {
-			result = readMessageLine(details);
-		} catch (const SystemException &e) {
-			throwPreloaderSpawnException("An error occurred while starting up "
-				"the preloader. There was an I/O error while reading its "
-				"handshake message: " + e.sys(),
-				SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-				details);
-		} catch (const TimeoutException &) {
-			throwPreloaderSpawnException("An error occurred while starting up "
-				"the preloader: it did not write a handshake message in time.",
-				SpawnException::PRELOADER_STARTUP_TIMEOUT,
-				details);
-		}
-		
-		if (result == "I have control 1.0\n") {
-			UPDATE_TRACE_POINT();
-			sendStartupRequest(details);
-			try {
-				result = readMessageLine(details);
-			} catch (const SystemException &e) {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader. There was an I/O error while reading its "
-					"startup response: " + e.sys(),
-					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-					details);
-			} catch (const TimeoutException &) {
-				throwPreloaderSpawnException("An error occurred while starting up "
-					"the preloader: it did not write a startup response in time.",
-					SpawnException::PRELOADER_STARTUP_TIMEOUT,
-					details);
-			}
-			if (result == "Ready\n") {
-				return handleStartupResponse(details);
-			} else if (result == "Error\n") {
-				handleErrorResponse(details);
-			} else {
-				handleInvalidResponseType(details, result);
-			}
-		} else {
-			UPDATE_TRACE_POINT();
-			if (result == "Error\n") {
-				handleErrorResponse(details);
-			} else {
-				handleInvalidResponseType(details, result);
-			}
-		}
-		
-		// Never reached, shut up compiler warning.
-		abort();
-		return "";
-	}
-	
-	SpawnResult sendSpawnCommand(const Options &options) {
-		TRACE_POINT();
-		FileDescriptor fd;
-		try {
-			fd = connectToServer(socketAddress);
-		} catch (const SystemException &e) {
-			BackgroundIOCapturerPtr stderrCapturer;
-			throwPreloaderSpawnException("An error occurred while starting "
-				"the application. Unable to connect to the preloader's "
-				"socket: " + string(e.what()),
-				SpawnException::APP_STARTUP_PROTOCOL_ERROR,
-				stderrCapturer,
-				DebugDirPtr());
-		}
-		
-		UPDATE_TRACE_POINT();
-		BufferedIO io(fd);
-		unsigned long long timeout = options.startTimeout * 1000;
-		string result;
-		vector<string> args;
-		vector<string>::const_iterator it;
-		
-		writeExact(fd, "spawn\n", &timeout);
-		options.toVector(args, resourceLocator);
-		for (it = args.begin(); it != args.end(); it++) {
-			const string &key = *it;
-			it++;
-			const string &value = *it;
-			writeExact(fd, key + ": " + value + "\n", &timeout);
-		}
-		writeExact(fd, "\n", &timeout);
-		
-		result = io.readLine(1024, &timeout);
-		if (result == "OK\n") {
-			UPDATE_TRACE_POINT();
-			pid_t spawnedPid;
-			
-			spawnedPid = atoi(io.readLine(1024, &timeout).c_str());
-			if (spawnedPid <= 0) {
-				BackgroundIOCapturerPtr stderrCapturer;
-				throwPreloaderSpawnException("An error occurred while starting "
-					"the web application. Its preloader responded to the "
-					"'spawn' command with an invalid PID: '" +
-					toString(spawnedPid) + "'",
-					SpawnException::APP_STARTUP_PROTOCOL_ERROR,
-					stderrCapturer,
-					DebugDirPtr());
-			}
-			// TODO: we really should be checking UID.
-			// FIXME: for Passenger 4 we *must* check the UID otherwise this is a gaping security hole.
-			if (getsid(spawnedPid) != getsid(pid)) {
-				BackgroundIOCapturerPtr stderrCapturer;
-				throwPreloaderSpawnException("An error occurred while starting "
-					"the web application. Its preloader responded to the "
-					"'spawn' command with a PID that doesn't belong to "
-					"the same session: '" + toString(spawnedPid) + "'",
-					SpawnException::APP_STARTUP_PROTOCOL_ERROR,
-					stderrCapturer,
-					DebugDirPtr());
-			}
-			
-			SpawnResult result;
-			result.pid = spawnedPid;
-			result.adminSocket = fd;
-			result.io = io;
-			return result;
-			
-		} else if (result == "Error\n") {
-			UPDATE_TRACE_POINT();
-			NegotiationDetails details;
-			details.io = io;
-			details.timeout = timeout;
-			handleSpawnErrorResponse(details);
-			
-		} else {
-			UPDATE_TRACE_POINT();
-			NegotiationDetails details;
-			handleInvalidSpawnResponseType(result, details);
-		}
-		
-		return SpawnResult(); // Never reached.
-	}
-	
-	template<typename Exception>
-	SpawnResult sendSpawnCommandAgain(const Exception &e, const Options &options) {
-		TRACE_POINT();
-		P_WARN("An error occurred while spawning a process: " << e.what());
-		P_WARN("The application preloader seems to have crashed, restarting it and trying again...");
-		stopPreloader();
-		startPreloader();
-		ScopeGuard guard(boost::bind(&SmartSpawner::stopPreloader, this));
-		SpawnResult result = sendSpawnCommand(options);
-		guard.clear();
-		return result;
-	}
-	
-protected:
-	virtual void annotateAppSpawnException(SpawnException &e, NegotiationDetails &details) {
-		Spawner::annotateAppSpawnException(e, details);
-		e.addAnnotations(preloaderAnnotations);
-	}
-
-public:
-	SmartSpawner(const SafeLibevPtr &_libev,
-		const ResourceLocator &_resourceLocator,
-		const ServerInstanceDir::GenerationPtr &_generation,
-		const vector<string> &_preloaderCommand,
-		const Options &_options,
-		const RandomGeneratorPtr &_randomGenerator = RandomGeneratorPtr(),
-		const SpawnerConfigPtr &_config = SpawnerConfigPtr())
-		: Spawner(_resourceLocator),
-		  libev(_libev),
-		  preloaderCommand(_preloaderCommand)
-	{
-		if (preloaderCommand.size() < 2) {
-			throw ArgumentException("preloaderCommand must have at least 2 elements");
-		}
-		
-		generation = _generation;
-		options    = _options.copyAndPersist().clearLogger();
-		pid        = -1;
-		m_lastUsed = SystemTime::getUsec();
-		
-		preloaderOutputWatcher.set<SmartSpawner, &SmartSpawner::onPreloaderOutputReadable>(this);
-
-		if (_randomGenerator == NULL) {
-			randomGenerator = make_shared<RandomGenerator>();
-		} else {
-			randomGenerator = _randomGenerator;
-		}
-		if (_config == NULL) {
-			config = make_shared<SpawnerConfig>();
-		} else {
-			config = _config;
-		}
-	}
-	
-	virtual ~SmartSpawner() {
-		lock_guard<boost::mutex> l(syncher);
-		stopPreloader();
-	}
-	
-	virtual ProcessPtr spawn(const Options &options) {
-		TRACE_POINT();
-		assert(options.appType == this->options.appType);
-		assert(options.appRoot == this->options.appRoot);
-		
-		P_DEBUG("Spawning new process: appRoot=" << options.appRoot);
-		possiblyRaiseInternalError(options);
-
-		{
-			lock_guard<boost::mutex> l(simpleFieldSyncher);
-			m_lastUsed = SystemTime::getUsec();
-		}
-		if (!preloaderStarted()) {
-			UPDATE_TRACE_POINT();
-			startPreloader();
-		}
-		
-		UPDATE_TRACE_POINT();
-		SpawnResult result;
-		try {
-			result = sendSpawnCommand(options);
-		} catch (const SystemException &e) {
-			result = sendSpawnCommandAgain(e, options);
-		} catch (const IOException &e) {
-			result = sendSpawnCommandAgain(e, options);
-		} catch (const SpawnException &e) {
-			result = sendSpawnCommandAgain(e, options);
-		}
-		
-		UPDATE_TRACE_POINT();
-		NegotiationDetails details;
-		details.libev = libev;
-		details.pid = result.pid;
-		details.adminSocket = result.adminSocket;
-		details.io = result.io;
-		details.options = &options;
-		details.forwardStderr = config->forwardStderr;
-		details.forwardStderrTo = config->forwardStderrTo;
-		ProcessPtr process = negotiateSpawn(details);
-		P_DEBUG("Process spawning done: appRoot=" << options.appRoot <<
-			", pid=" << process->pid);
-		return process;
-	}
-
-	virtual bool cleanable() const {
-		return true;
-	}
-	
-	virtual void cleanup() {
-		TRACE_POINT();
-		{
-			lock_guard<boost::mutex> l(simpleFieldSyncher);
-			m_lastUsed = SystemTime::getUsec();
-		}
-		lock_guard<boost::mutex> lock(syncher);
-		stopPreloader();
-	}
-
-	virtual unsigned long long lastUsed() const {
-		lock_guard<boost::mutex> lock(simpleFieldSyncher);
-		return m_lastUsed;
-	}
-	
-	pid_t getPreloaderPid() const {
-		lock_guard<boost::mutex> lock(simpleFieldSyncher);
-		return pid;
-	}
-};
-
-
-class DirectSpawner: public Spawner {
-private:
-	SafeLibevPtr libev;
-	
-	static int startBackgroundThread(void *(*mainFunction)(void *), void *arg) {
-		// Using raw pthread API because we don't want to register such
-		// trivial threads on the oxt::thread list.
-		pthread_t thr;
-		pthread_attr_t attr;
-		size_t stack_size = 96 * 1024;
-		
-		unsigned long min_stack_size;
-		bool stack_min_size_defined;
-		bool round_stack_size;
-		int ret;
-		
-		#ifdef PTHREAD_STACK_MIN
-			// PTHREAD_STACK_MIN may not be a constant macro so we need
-			// to evaluate it dynamically.
-			min_stack_size = PTHREAD_STACK_MIN;
-			stack_min_size_defined = true;
-		#else
-			// Assume minimum stack size is 128 KB.
-			min_stack_size = 128 * 1024;
-			stack_min_size_defined = false;
-		#endif
-		if (stack_size != 0 && stack_size < min_stack_size) {
-			stack_size = min_stack_size;
-			round_stack_size = !stack_min_size_defined;
-		} else {
-			round_stack_size = true;
-		}
-		
-		if (round_stack_size) {
-			// Round stack size up to page boundary.
-			long page_size;
-			#if defined(_SC_PAGESIZE)
-				page_size = sysconf(_SC_PAGESIZE);
-			#elif defined(_SC_PAGE_SIZE)
-				page_size = sysconf(_SC_PAGE_SIZE);
-			#elif defined(PAGESIZE)
-				page_size = sysconf(PAGESIZE);
-			#elif defined(PAGE_SIZE)
-				page_size = sysconf(PAGE_SIZE);
-			#else
-				page_size = getpagesize();
-			#endif
-			if (stack_size % page_size != 0) {
-				stack_size = stack_size - (stack_size % page_size) + page_size;
-			}
-		}
-		
-		pthread_attr_init(&attr);
-		pthread_attr_setdetachstate(&attr, 1);
-		pthread_attr_setstacksize(&attr, stack_size);
-		ret = pthread_create(&thr, &attr, mainFunction, arg);
-		pthread_attr_destroy(&attr);
-		return ret;
-	}
-	
-	static void *detachProcessMain(void *arg) {
-		this_thread::disable_syscall_interruption dsi;
-		pid_t pid = (pid_t) (long) arg;
-		syscalls::waitpid(pid, NULL, 0);
-		return NULL;
-	}
-	
-	void detachProcess(pid_t pid) {
-		startBackgroundThread(detachProcessMain, (void *) (long) pid);
-	}
-	
-	vector<string> createCommand(const Options &options, shared_array<const char *> &args) const {
-		vector<string> startCommandArgs;
-		string processTitle;
-		string agentsDir = resourceLocator.getAgentsDir();
-		vector<string> command;
-		
-		split(options.getStartCommand(resourceLocator), '\1', startCommandArgs);
-		if (startCommandArgs.empty()) {
-			throw RuntimeException("No startCommand given");
-		}
-		if (options.getProcessTitle().empty()) {
-			processTitle = startCommandArgs[0];
-		} else {
-			processTitle = options.getProcessTitle() + ": " + options.appRoot;
-		}
-		
-		if (options.loadShellEnvvars) {
-			command.push_back("bash");
-			command.push_back("bash");
-			command.push_back("-lc");
-			command.push_back("exec \"$@\"");
-			command.push_back("SpawnPreparerShell");
-		} else {
-			command.push_back(agentsDir + "/SpawnPreparer");
-		}
-		command.push_back(agentsDir + "/SpawnPreparer");
-		command.push_back(serializeEnvvarsFromPoolOptions(options));
-		command.push_back(startCommandArgs[0]);
-		command.push_back(processTitle);
-		for (unsigned int i = 1; i < startCommandArgs.size(); i++) {
-			command.push_back(startCommandArgs[i]);
-		}
-		
-		createCommandArgs(command, args);
-		return command;
-	}
-	
-public:
-	DirectSpawner(const SafeLibevPtr &_libev,
-		const ResourceLocator &_resourceLocator,
-		const ServerInstanceDir::GenerationPtr &_generation,
-		const RandomGeneratorPtr &_randomGenerator = RandomGeneratorPtr(),
-		const SpawnerConfigPtr &_config = SpawnerConfigPtr())
-		: Spawner(_resourceLocator),
-		  libev(_libev)
-	{
-		generation = _generation;
-		if (_randomGenerator == NULL) {
-			randomGenerator = make_shared<RandomGenerator>();
-		} else {
-			randomGenerator = _randomGenerator;
-		}
-		if (_config == NULL) {
-			config = make_shared<SpawnerConfig>();
-		} else {
-			config = _config;
-		}
-	}
-	
-	virtual ProcessPtr spawn(const Options &options) {
-		TRACE_POINT();
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
-		P_DEBUG("Spawning new process: appRoot=" << options.appRoot);
-		possiblyRaiseInternalError(options);
-
-		shared_array<const char *> args;
-		vector<string> command = createCommand(options, args);
-		SpawnPreparationInfo preparation = prepareSpawn(options);
-		SocketPair adminSocket = createUnixSocketPair();
-		Pipe errorPipe = createPipe();
-		DebugDirPtr debugDir = make_shared<DebugDir>(preparation.uid, preparation.gid);
-		pid_t pid;
-		
-		pid = syscalls::fork();
-		if (pid == 0) {
-			setenv("PASSENGER_DEBUG_DIR", debugDir->getPath().c_str(), 1);
-			purgeStdio(stdout);
-			purgeStdio(stderr);
-			resetSignalHandlersAndMask();
-			disableMallocDebugging();
-			int adminSocketCopy = dup2(adminSocket.first, 3);
-			int errorPipeCopy = dup2(errorPipe.second, 4);
-			dup2(adminSocketCopy, 0);
-			dup2(adminSocketCopy, 1);
-			dup2(errorPipeCopy, 2);
-			closeAllFileDescriptors(2);
-			setChroot(preparation);
-			switchUser(preparation);
-			setWorkingDirectory(preparation);
-			execvp(args[0], (char * const *) args.get());
-			
-			int e = errno;
-			printf("!> Error\n");
-			printf("!> \n");
-			printf("Cannot execute \"%s\": %s (errno=%d)\n", command[0].c_str(),
-				strerror(e), e);
-			fprintf(stderr, "Cannot execute \"%s\": %s (errno=%d)\n",
-				command[0].c_str(), strerror(e), e);
-			fflush(stdout);
-			fflush(stderr);
-			_exit(1);
-			
-		} else if (pid == -1) {
-			int e = errno;
-			throw SystemException("Cannot fork a new process", e);
-			
-		} else {
-			UPDATE_TRACE_POINT();
-			ScopeGuard guard(boost::bind(nonInterruptableKillAndWaitpid, pid));
-			adminSocket.first.close();
-			errorPipe.second.close();
-			
-			NegotiationDetails details;
-			details.libev = libev;
-			details.stderrCapturer =
-				make_shared<BackgroundIOCapturer>(
-					errorPipe.first,
-					config->forwardStderr ? config->forwardStderrTo : -1);
-			details.stderrCapturer->start();
-			details.pid = pid;
-			details.adminSocket = adminSocket.second;
-			details.io = BufferedIO(adminSocket.second);
-			details.errorPipe = errorPipe.first;
-			details.options = &options;
-			details.forwardStderr = config->forwardStderr;
-			details.forwardStderrTo = config->forwardStderrTo;
-			details.debugDir = debugDir;
-			
-			ProcessPtr process;
-			{
-				this_thread::restore_interruption ri(di);
-				this_thread::restore_syscall_interruption rsi(dsi);
-				process = negotiateSpawn(details);
-			}
-			detachProcess(process->pid);
-			guard.clear();
-			P_DEBUG("Process spawning done: appRoot=" << options.appRoot <<
-				", pid=" << process->pid);
-			return process;
-		}
-	}
-};
-
-
-class DummySpawner: public Spawner {
-private:
-	SpawnerConfigPtr config;
-	boost::mutex lock;
-	unsigned int count;
-	
-public:
-	unsigned int cleanCount;
-	
-	DummySpawner(const ResourceLocator &resourceLocator, const SpawnerConfigPtr &_config)
-		: Spawner(resourceLocator),
-		  config(_config)
-	{
-		count = 0;
-		cleanCount = 0;
-	}
-	
-	virtual ProcessPtr spawn(const Options &options) {
-		TRACE_POINT();
-		possiblyRaiseInternalError(options);
-
-		SocketPair adminSocket = createUnixSocketPair();
-		SocketListPtr sockets = make_shared<SocketList>();
-		sockets->add("main", "tcp://127.0.0.1:1234", "session", config->concurrency);
-		syscalls::usleep(config->spawnTime);
-		
-		lock_guard<boost::mutex> l(lock);
-		count++;
-		return make_shared<Process>(SafeLibevPtr(),
-			(pid_t) count, "gupid-" + toString(count),
-			toString(count),
-			adminSocket.second, FileDescriptor(), sockets,
-			SystemTime::getUsec(), SystemTime::getUsec());
-	}
-
-	virtual bool cleanable() const {
-		return true;
-	}
-
-	virtual void cleanup() {
-		cleanCount++;
-	}
-};
-
-typedef shared_ptr<DummySpawner> DummySpawnerPtr;
-
-
-class SpawnerFactory {
-private:
-	SafeLibevPtr libev;
-	ResourceLocator resourceLocator;
-	ServerInstanceDir::GenerationPtr generation;
-	RandomGeneratorPtr randomGenerator;
-	boost::mutex syncher;
-	SpawnerConfigPtr config;
-	DummySpawnerPtr dummySpawner;
-	
-	SpawnerPtr tryCreateSmartSpawner(const Options &options) {
-		string dir = resourceLocator.getHelperScriptsDir();
-		vector<string> preloaderCommand;
-		if (options.appType == "classic-rails") {
-			preloaderCommand.push_back(options.ruby);
-			preloaderCommand.push_back(dir + "/classic-rails-preloader.rb");
-		} else if (options.appType == "rack") {
-			preloaderCommand.push_back(options.ruby);
-			preloaderCommand.push_back(dir + "/rack-preloader.rb");
-		} else {
-			return SpawnerPtr();
-		}
-		return make_shared<SmartSpawner>(libev, resourceLocator,
-			generation, preloaderCommand, options,
-			randomGenerator);
-	}
-	
-public:
-	SpawnerFactory(const SafeLibevPtr &_libev,
-		const ResourceLocator &_resourceLocator,
-		const ServerInstanceDir::GenerationPtr &_generation,
-		const RandomGeneratorPtr &_randomGenerator = RandomGeneratorPtr(),
-		const SpawnerConfigPtr &_config = SpawnerConfigPtr())
-		: libev(_libev),
-		  resourceLocator(_resourceLocator),
-		  generation(_generation)
-	{
-		if (_randomGenerator == NULL) {
-			randomGenerator = make_shared<RandomGenerator>();
-		} else {
-			randomGenerator = _randomGenerator;
-		}
-		if (_config == NULL) {
-			config = make_shared<SpawnerConfig>();
-		} else {
-			config = _config;
-		}
-	}
-	
-	virtual ~SpawnerFactory() { }
-	
-	virtual SpawnerPtr create(const Options &options) {
-		if (options.spawnMethod == "smart" || options.spawnMethod == "smart-lv2") {
-			SpawnerPtr spawner = tryCreateSmartSpawner(options);
-			if (spawner == NULL) {
-				spawner = make_shared<DirectSpawner>(libev,
-					resourceLocator, generation,
-					randomGenerator, config);
-			}
-			return spawner;
-		} else if (options.spawnMethod == "direct" || options.spawnMethod == "conservative") {
-			shared_ptr<DirectSpawner> spawner = make_shared<DirectSpawner>(libev, resourceLocator,
-				generation, randomGenerator, config);
-			return spawner;
-		} else if (options.spawnMethod == "dummy") {
-			syscalls::usleep(config->spawnerCreationSleepTime);
-			return getDummySpawner();
-		} else {
-			throw ArgumentException("Unknown spawn method '" + options.spawnMethod + "'");
-		}
-	}
-
-	/**
-	 * SpawnerFactory always returns the same DummyFactory object upon
-	 * creating a dummy spawner. This allows unit tests to easily
-	 * set debugging options on the spawner.
-	 */
-	DummySpawnerPtr getDummySpawner() {
-		lock_guard<boost::mutex> l(syncher);
-		if (dummySpawner == NULL) {
-			dummySpawner = make_shared<DummySpawner>(resourceLocator, config);
-		}
-		return dummySpawner;
-	}
-
-	/**
-	 * All created Spawner objects share the same SpawnerConfig object.
-	 */
-	SpawnerConfigPtr getConfig() const {
-		return config;
-	}
-};
-
-typedef shared_ptr<SpawnerFactory> SpawnerFactoryPtr;
-
-
 } // namespace ApplicationPool2
 } // namespace Passenger