passenger 5.0.9 → 5.0.10

data/ext/common/{ApplicationPool2 → SpawningKit}/Spawner.h

@@ -22,8 +22,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_APPLICATION_POOL_SPAWNER_H_
-#define _PASSENGER_APPLICATION_POOL_SPAWNER_H_
+#ifndef _PASSENGER_SPAWNING_KIT_SPAWNER_H_
+#define _PASSENGER_SPAWNING_KIT_SPAWNER_H_
 
 /*
  * This file implements application spawning support. Several classes
@@ -77,11 +77,11 @@
 #include <pwd.h>
 #include <grp.h>
 #include <dirent.h>
-#include <ApplicationPool2/Common.h>
-#include <ApplicationPool2/Process.h>
-#include <ApplicationPool2/Options.h>
-#include <ApplicationPool2/SpawnObject.h>
-#include <ApplicationPool2/PipeWatcher.h>
+#include <SpawningKit/Config.h>
+#include <SpawningKit/Options.h>
+#include <SpawningKit/Result.h>
+#include <SpawningKit/BackgroundIOCapturer.h>
+#include <SpawningKit/UserSwitchingRules.h>
 #include <FileDescriptor.h>
 #include <Exceptions.h>
 #include <StaticString.h>
@@ -100,7 +100,7 @@ namespace tut {
 }
 
 namespace Passenger {
-namespace ApplicationPool2 {
+namespace SpawningKit {
 
 using namespace std;
 using namespace boost;
@@ -112,111 +112,6 @@ protected:
 	friend struct tut::ApplicationPool2_DirectSpawnerTest;
 	friend struct tut::ApplicationPool2_SmartSpawnerTest;
 
-	/**
-	 * Given a file descriptor, captures its output in a background thread
-	 * and also forwards it immediately to a target file descriptor.
-	 * Call stop() to stop the background thread and to obtain the captured
-	 * output so far.
-	 */
-	class BackgroundIOCapturer {
-	private:
-		FileDescriptor fd;
-		pid_t pid;
-		const char *channelName;
-		boost::mutex dataSyncher;
-		string data;
-		oxt::thread *thr;
-
-		void capture() {
-			TRACE_POINT();
-			while (!this_thread::interruption_requested()) {
-				char buf[1024 * 8];
-				ssize_t ret;
-
-				UPDATE_TRACE_POINT();
-				ret = syscalls::read(fd, buf, sizeof(buf));
-				int e = errno;
-				this_thread::disable_syscall_interruption dsi;
-				if (ret == 0) {
-					break;
-				} else if (ret == -1) {
-					if (e != EAGAIN && e != EWOULDBLOCK) {
-						P_WARN("Background I/O capturer error: " <<
-							strerror(e) << " (errno=" << e << ")");
-						break;
-					}
-				} else {
-					{
-						boost::lock_guard<boost::mutex> l(dataSyncher);
-						data.append(buf, ret);
-					}
-					UPDATE_TRACE_POINT();
-					if (ret == 1 && buf[0] == '\n') {
-						printAppOutput(pid, channelName, "", 0);
-					} else {
-						vector<StaticString> lines;
-						if (ret > 0 && buf[ret - 1] == '\n') {
-							ret--;
-						}
-						split(StaticString(buf, ret), '\n', lines);
-						foreach (const StaticString line, lines) {
-							printAppOutput(pid, channelName, line.data(), line.size());
-						}
-					}
-				}
-			}
-		}
-
-	public:
-		BackgroundIOCapturer(const FileDescriptor &_fd, pid_t _pid, const char *_channelName)
-			: fd(_fd),
-			  pid(_pid),
-			  channelName(_channelName),
-			  thr(NULL)
-			{ }
-
-		~BackgroundIOCapturer() {
-			TRACE_POINT();
-			if (thr != NULL) {
-				this_thread::disable_interruption di;
-				this_thread::disable_syscall_interruption dsi;
-				thr->interrupt_and_join();
-				delete thr;
-				thr = NULL;
-			}
-		}
-
-		const FileDescriptor &getFd() const {
-			return fd;
-		}
-
-		void start() {
-			assert(thr == NULL);
-			thr = new oxt::thread(boost::bind(&BackgroundIOCapturer::capture, this),
-				"Background I/O capturer", 64 * 1024);
-		}
-
-		string stop() {
-			TRACE_POINT();
-			assert(thr != NULL);
-			this_thread::disable_interruption di;
-			this_thread::disable_syscall_interruption dsi;
-			thr->interrupt_and_join();
-			delete thr;
-			thr = NULL;
-			boost::lock_guard<boost::mutex> l(dataSyncher);
-			return data;
-		}
-
-		void appendToBuffer(const StaticString &dataToAdd) {
-			TRACE_POINT();
-			boost::lock_guard<boost::mutex> l(dataSyncher);
-			data.append(dataToAdd.data(), dataToAdd.size());
-		}
-	};
-
-	typedef boost::shared_ptr<BackgroundIOCapturer> BackgroundIOCapturerPtr;
-
 	/**
 	 * A temporary directory for spawned child processes to write
 	 * debugging information to. It is removed after spawning has
@@ -311,16 +206,7 @@ protected:
 		 */
 		vector<string> appRootPathsInsideChroot;
 
-		// User switching
-		bool switchUser;
-		string username;
-		string groupname;
-		string home;
-		string shell;
-		uid_t uid;
-		gid_t gid;
-		int ngroups;
-		shared_array<gid_t> gidset;
+		UserSwitchingInfo userSwitching;
 
 		// Other information
 		string codeRevision;
@@ -365,7 +251,6 @@ protected:
 		}
 	};
 
-
 private:
 	/**
 	 * Appends key + "\0" + value + "\0" to 'output'.
@@ -389,10 +274,11 @@ private:
 				"ruby_libdir: " + config->resourceLocator->getRubyLibDir() + "\n"
 				"gupid: " + details.gupid + "\n"
 				"UNIX_PATH_MAX: " + toString(UNIX_PATH_MAX) + "\n";
-			if (!details.options->groupSecret.empty()) {
-				data.append("connect_password: " + details.options->groupSecret + "\n");
+			if (!details.options->apiKey.empty()) {
+				data.append("connect_password: " + details.options->apiKey + "\n");
 			}
 			if (!config->instanceDir.empty()) {
+				data.append("instance_dir: " + config->instanceDir + "\n");
 				data.append("socket_dir: " + config->instanceDir + "/apps.s\n");
 			}
 
@@ -425,10 +311,10 @@ private:
 		}
 	}
 
-	SpawnObject handleSpawnResponse(NegotiationDetails &details) {
+	Result handleSpawnResponse(NegotiationDetails &details) {
 		TRACE_POINT();
-		SocketList sockets;
-		SpawnObject result;
+		Json::Value sockets;
+		Result result;
 
 		while (true) {
 			string line;
@@ -491,12 +377,12 @@ private:
 							details);
 					}
 
-					StaticString name = psg_pstrdup(result.pool, args[0]);
-					StaticString address = psg_pstrdup(result.pool,
-						fixupSocketAddress(*details.options, args[1]));
-					StaticString protocol = psg_pstrdup(result.pool, args[2]);
-
-					sockets.add(details.pid, name, address, protocol, atoi(args[3]));
+					Json::Value socket;
+					socket["name"] = args[0];
+					socket["address"] = fixupSocketAddress(*details.options, args[1]);
+					socket["protocol"] = args[2];
+					socket["concurrency"] = atoi(args[3]);
+					sockets.append(socket);
 				} else {
 					throwAppSpawnException("An error occurred while starting the "
 						"web application. It reported a wrongly formatted 'socket'"
@@ -512,7 +398,7 @@ private:
 
 				pids.push_back(pid);
 				ProcessMetricMap metrics = collector.collect(pids);
-				if (metrics[pid].uid != details.preparation->uid) {
+				if (metrics[pid].uid != details.preparation->userSwitching.uid) {
 					throwAppSpawnException("An error occurred while starting the "
 						"web application. The PID that the loader has returned does "
 						"not have the same UID as the loader itself.",
@@ -529,25 +415,39 @@ private:
 			}
 		}
 
-		if (!sockets.hasSessionSockets()) {
+		if (!hasSessionSockets(sockets)) {
 			throwAppSpawnException("An error occured while starting the web "
 				"application. It did not advertise any session sockets.",
 				SpawnException::APP_STARTUP_PROTOCOL_ERROR,
 				details);
 		}
 
-		result.process = boost::make_shared<Process>(
-			details.pid,
-			details.gupid,
-			details.adminSocket, details.errorPipe,
-			sockets, creationTime, details.spawnStartTime);
-		result.process->codeRevision = psg_pstrdup(result.pool,
-			details.preparation->codeRevision);
-		return boost::move(result);
+		result["type"] = "os_process";
+		result["pid"] = (int) details.pid;
+		result["gupid"] = details.gupid;
+		result["sockets"] = sockets;
+		result["code_revision"] = details.preparation->codeRevision;
+		result["spawner_creation_time"] = (Json::UInt64) creationTime;
+		result["spawn_start_time"] = (Json::UInt64) details.spawnStartTime;
+		result.adminSocket = details.adminSocket;
+		result.errorPipe = details.errorPipe;
+		return result;
+	}
+
+	bool hasSessionSockets(const Json::Value &sockets) const {
+		Json::Value::const_iterator it, end = sockets.end();
+
+		for (it = sockets.begin(); it != end; it++) {
+			const Json::Value &socket = *it;
+			if (socket["protocol"] == "session" || socket["protocol"] == "http_session") {
+				return true;
+			}
+		}
+		return false;
 	}
 
 protected:
-	SpawnerConfigPtr config;
+	ConfigPtr config;
 
 	static void nonInterruptableKillAndWaitpid(pid_t pid) {
 		this_thread::disable_syscall_interruption dsi;
@@ -646,9 +546,9 @@ protected:
 					e << ": " << strerror(e) << ")";
 				break;
 			}
-			if (buf.st_uid != details.preparation->uid) {
+			if (buf.st_uid != details.preparation->userSwitching.uid) {
 				error << "It advertised a Unix domain socket that has a different " <<
-					"owner than expected (should be UID " << details.preparation->uid <<
+					"owner than expected (should be UID " << details.preparation->userSwitching.uid <<
 					", but actual UID was " << buf.st_uid << ")";
 				break;
 			}
@@ -742,7 +642,9 @@ protected:
 	}
 
 	void throwSpawnException(SpawnException &e, const Options &options) {
-		processAndLogNewSpawnException(e, options, config);
+		if (config->errorHandler != NULL) {
+			config->errorHandler(config, e, options);
+		}
 		throw e;
 	}
 
@@ -813,7 +715,7 @@ protected:
 		TRACE_POINT();
 		SpawnPreparationInfo info;
 		prepareChroot(info, options);
-		prepareUserSwitching(info, options);
+		info.userSwitching = prepareUserSwitching(options);
 		prepareSwitchingWorkingDirectory(info, options);
 		inferApplicationInfo(info);
 		return info;
@@ -843,201 +745,6 @@ protected:
 		}
 	}
 
-	void prepareUserSwitching(SpawnPreparationInfo &info, const Options &options) const {
-		TRACE_POINT();
-		if (geteuid() != 0) {
-			struct passwd pwd, *userInfo;
-			long bufSize;
-			shared_array<char> strings;
-
-			// _SC_GETPW_R_SIZE_MAX is not a maximum:
-			// http://tomlee.co/2012/10/problems-with-large-linux-unix-groups-and-getgrgid_r-getgrnam_r/
-			bufSize = std::max<long>(1024 * 128, sysconf(_SC_GETPW_R_SIZE_MAX));
-			strings.reset(new char[bufSize]);
-
-			userInfo = (struct passwd *) NULL;
-			if (getpwuid_r(geteuid(), &pwd, strings.get(), bufSize, &userInfo) != 0
-			 || userInfo == (struct passwd *) NULL)
-			{
-				throw RuntimeException("Cannot get user database entry for user " +
-					getProcessUsername() + "; it looks like your system's " +
-					"user database is broken, please fix it.");
-			}
-
-			info.switchUser = false;
-			info.username = userInfo->pw_name;
-			info.groupname = getGroupName(userInfo->pw_gid);
-			info.home = userInfo->pw_dir;
-			info.shell = userInfo->pw_shell;
-			info.uid = geteuid();
-			info.gid = getegid();
-			info.ngroups = 0;
-			return;
-		}
-
-		UPDATE_TRACE_POINT();
-		string defaultGroup;
-		string startupFile = absolutizePath(options.getStartupFile(), info.appRoot);
-		struct passwd pwd, *userInfo;
-		struct group  grp;
-		gid_t  groupId = (gid_t) -1;
-		long pwdBufSize, grpBufSize;
-		shared_array<char> pwdBuf, grpBuf;
-		int ret;
-
-		// _SC_GETPW_R_SIZE_MAX/_SC_GETGR_R_SIZE_MAX are not maximums:
-		// http://tomlee.co/2012/10/problems-with-large-linux-unix-groups-and-getgrgid_r-getgrnam_r/
-		pwdBufSize = std::max<long>(1024 * 128, sysconf(_SC_GETPW_R_SIZE_MAX));
-		pwdBuf.reset(new char[pwdBufSize]);
-		grpBufSize = std::max<long>(1024 * 128, sysconf(_SC_GETGR_R_SIZE_MAX));
-		grpBuf.reset(new char[grpBufSize]);
-
-		if (options.defaultGroup.empty()) {
-			struct passwd *info;
-			struct group *group;
-
-			info = (struct passwd *) NULL;
-			ret = getpwnam_r(options.defaultUser.c_str(), &pwd, pwdBuf.get(),
-				pwdBufSize, &info);
-			if (ret != 0) {
-				info = (struct passwd *) NULL;
-			}
-			if (info == (struct passwd *) NULL) {
-				throw RuntimeException("Cannot get user database entry for username '" +
-					options.defaultUser + "'");
-			}
-
-			group = (struct group *) NULL;
-			ret = getgrgid_r(info->pw_gid, &grp, grpBuf.get(), grpBufSize, &group);
-			if (ret != 0) {
-				group = (struct group *) NULL;
-			}
-			if (group == (struct group *) NULL) {
-				throw RuntimeException(string("Cannot get group database entry for ") +
-					"the default group belonging to username '" +
-					options.defaultUser + "'");
-			}
-			defaultGroup = group->gr_name;
-		} else {
-			defaultGroup = options.defaultGroup;
-		}
-
-		UPDATE_TRACE_POINT();
-		userInfo = (struct passwd *) NULL;
-		if (!options.userSwitching) {
-			// Keep userInfo at NULL so that it's set to defaultUser's UID.
-		} else if (!options.user.empty()) {
-			ret = getpwnam_r(options.user.c_str(), &pwd, pwdBuf.get(),
-				pwdBufSize, &userInfo);
-			if (ret != 0) {
-				userInfo = (struct passwd *) NULL;
-			}
-		} else {
-			struct stat buf;
-			if (syscalls::lstat(startupFile.c_str(), &buf) == -1) {
-				int e = errno;
-				throw SystemException("Cannot lstat(\"" + startupFile +
-					"\")", e);
-			}
-			ret = getpwuid_r(buf.st_uid, &pwd, pwdBuf.get(),
-				pwdBufSize, &userInfo);
-			if (ret != 0) {
-				userInfo = (struct passwd *) NULL;
-			}
-		}
-		if (userInfo == (struct passwd *) NULL || userInfo->pw_uid == 0) {
-			userInfo = (struct passwd *) NULL;
-			ret = getpwnam_r(options.defaultUser.c_str(), &pwd,
-				pwdBuf.get(), pwdBufSize, &userInfo);
-			if (ret != 0) {
-				userInfo = (struct passwd *) NULL;
-			}
-		}
-
-		UPDATE_TRACE_POINT();
-		if (!options.userSwitching) {
-			// Keep groupId at -1 so that it's set to defaultGroup's GID.
-		} else if (!options.group.empty()) {
-			struct group *groupInfo = (struct group *) NULL;
-
-			if (options.group == "!STARTUP_FILE!") {
-				struct stat buf;
-
-				if (syscalls::lstat(startupFile.c_str(), &buf) == -1) {
-					int e = errno;
-					throw SystemException("Cannot lstat(\"" +
-						startupFile + "\")", e);
-				}
-
-				ret = getgrgid_r(buf.st_gid, &grp, grpBuf.get(), grpBufSize,
-					&groupInfo);
-				if (ret != 0) {
-					groupInfo = (struct group *) NULL;
-				}
-				if (groupInfo != NULL) {
-					groupId = buf.st_gid;
-				} else {
-					groupId = (gid_t) -1;
-				}
-			} else {
-				ret = getgrnam_r(options.group.c_str(), &grp, grpBuf.get(),
-					grpBufSize, &groupInfo);
-				if (ret != 0) {
-					groupInfo = (struct group *) NULL;
-				}
-				if (groupInfo != NULL) {
-					groupId = groupInfo->gr_gid;
-				} else {
-					groupId = (gid_t) -1;
-				}
-			}
-		} else if (userInfo != (struct passwd *) NULL) {
-			groupId = userInfo->pw_gid;
-		}
-		if (groupId == 0 || groupId == (gid_t) -1) {
-			groupId = lookupGid(defaultGroup);
-		}
-
-		UPDATE_TRACE_POINT();
-		if (userInfo == (struct passwd *) NULL) {
-			throw RuntimeException("Cannot determine a user to lower privilege to");
-		}
-		if (groupId == (gid_t) -1) {
-			throw RuntimeException("Cannot determine a group to lower privilege to");
-		}
-
-		UPDATE_TRACE_POINT();
-		#ifdef __APPLE__
-			int groups[1024];
-			info.ngroups = sizeof(groups) / sizeof(int);
-		#else
-			gid_t groups[1024];
-			info.ngroups = sizeof(groups) / sizeof(gid_t);
-		#endif
-		info.switchUser = true;
-		info.username = userInfo->pw_name;
-		info.groupname = getGroupName(groupId);
-		info.home = userInfo->pw_dir;
-		info.shell = userInfo->pw_shell;
-		info.uid = userInfo->pw_uid;
-		info.gid = groupId;
-		#if !defined(HAVE_GETGROUPLIST) && (defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__))
-			#define HAVE_GETGROUPLIST
-		#endif
-		#ifdef HAVE_GETGROUPLIST
-			ret = getgrouplist(userInfo->pw_name, groupId,
-				groups, &info.ngroups);
-			if (ret == -1) {
-				int e = errno;
-				throw SystemException("getgrouplist() failed", e);
-			}
-			info.gidset = shared_array<gid_t>(new gid_t[info.ngroups]);
-			for (int i = 0; i < info.ngroups; i++) {
-				info.gidset[i] = groups[i];
-			}
-		#endif
-	}
-
 	void prepareSwitchingWorkingDirectory(SpawnPreparationInfo &info, const Options &options) const {
 		vector<string> components;
 		split(info.appRootInsideChroot, '/', components);
@@ -1109,7 +816,7 @@ protected:
 
 	bool shouldLoadShellEnvvars(const Options &options, const SpawnPreparationInfo &preparation) const {
 		if (options.loadShellEnvvars) {
-			string shellName = extractBaseName(preparation.shell);
+			string shellName = extractBaseName(preparation.userSwitching.shell);
 			return shellName == "bash" || shellName == "zsh" || shellName == "ksh";
 		} else {
 			return false;
@@ -1164,23 +871,27 @@ protected:
 	}
 
 	void switchUser(const SpawnPreparationInfo &info) {
-		if (info.switchUser) {
+		if (info.userSwitching.enabled) {
 			bool setgroupsCalled = false;
 			#ifdef HAVE_GETGROUPLIST
-				if (info.ngroups <= NGROUPS_MAX) {
+				if (info.userSwitching.ngroups <= NGROUPS_MAX) {
 					setgroupsCalled = true;
-					if (setgroups(info.ngroups, info.gidset.get()) == -1) {
+					if (setgroups(info.userSwitching.ngroups,
+						info.userSwitching.gidset.get()) == -1)
+					{
 						int e = errno;
 						printf("!> Error\n");
 						printf("!> \n");
 						printf("setgroups(%d, ...) failed: %s (errno=%d)\n",
-							info.ngroups, strerror(e), e);
+							info.userSwitching.ngroups, strerror(e), e);
 						fflush(stdout);
 						_exit(1);
 					}
 				}
 			#endif
-			if (!setgroupsCalled && initgroups(info.username.c_str(), info.gid) == -1) {
+			if (!setgroupsCalled && initgroups(info.userSwitching.username.c_str(),
+				info.userSwitching.gid) == -1)
+			{
 				int e = errno;
 				printf("!> Error\n");
 				printf("!> \n");
@@ -1189,7 +900,7 @@ protected:
 				fflush(stdout);
 				_exit(1);
 			}
-			if (setgid(info.gid) == -1) {
+			if (setgid(info.userSwitching.gid) == -1) {
 				int e = errno;
 				printf("!> Error\n");
 				printf("!> \n");
@@ -1198,7 +909,7 @@ protected:
 				fflush(stdout);
 				_exit(1);
 			}
-			if (setuid(info.uid) == -1) {
+			if (setuid(info.userSwitching.uid) == -1) {
 				int e = errno;
 				printf("!> Error\n");
 				printf("!> \n");
@@ -1212,10 +923,10 @@ protected:
 			// in the SpawnPreparer because SpawnPreparer might
 			// be executed by bash, but these environment variables
 			// must be set before bash.
-			setenv("USER", info.username.c_str(), 1);
-			setenv("LOGNAME", info.username.c_str(), 1);
-			setenv("SHELL", info.shell.c_str(), 1);
-			setenv("HOME", info.home.c_str(), 1);
+			setenv("USER", info.userSwitching.username.c_str(), 1);
+			setenv("LOGNAME", info.userSwitching.username.c_str(), 1);
+			setenv("SHELL", info.userSwitching.shell.c_str(), 1);
+			setenv("HOME", info.userSwitching.home.c_str(), 1);
 		}
 	}
 
@@ -1264,8 +975,8 @@ protected:
 					"However, the parent directory '%s' has wrong permissions, thereby "
 					"preventing this process from accessing its application root directory. "
 					"Please fix the permissions of the directory '%s' first.\n",
-					info.username.c_str(),
-					info.groupname.c_str(),
+					info.userSwitching.username.c_str(),
+					info.userSwitching.groupname.c_str(),
 					info.appRootPaths.back().c_str(),
 					parent,
 					parent);
@@ -1292,8 +1003,8 @@ protected:
 				"and must be able to access its application root directory '%s'. "
 				"However this directory is not accessible because it has wrong permissions. "
 				"Please fix these permissions first.\n",
-				info.username.c_str(),
-				info.groupname.c_str(),
+				info.userSwitching.username.c_str(),
+				info.userSwitching.groupname.c_str(),
 				info.appRootPaths.back().c_str());
 			fflush(stdout);
 			_exit(1);
@@ -1311,7 +1022,7 @@ protected:
 	/**
 	 * Execute the process spawning negotiation protocol.
 	 */
-	SpawnObject negotiateSpawn(NegotiationDetails &details) {
+	Result negotiateSpawn(NegotiationDetails &details) {
 		TRACE_POINT();
 		details.spawnStartTime = SystemTime::getUsec();
 		details.gupid = integerToHex(SystemTime::get() / 60) + "-" +
@@ -1369,7 +1080,7 @@ protected:
 				handleInvalidSpawnResponseType(result, details);
 			}
 		}
-		return SpawnObject(); // Never reached.
+		return Result(); // Never reached.
 	}
 
 	void handleSpawnErrorResponse(NegotiationDetails &details) {
@@ -1454,34 +1165,35 @@ public:
 	 */
 	const unsigned long long creationTime;
 
-	Spawner(const SpawnerConfigPtr &_config)
+	Spawner(const ConfigPtr &_config)
 		: config(_config),
 		  creationTime(SystemTime::getUsec())
 		{ }
 
 	virtual ~Spawner() { }
-	virtual SpawnObject spawn(const Options &options) = 0;
 
-	/** Does not depend on the event loop. */
+	virtual Result spawn(const Options &options) = 0;
+
 	virtual bool cleanable() const {
 		return false;
 	}
 
-	virtual void cleanup() { }
+	virtual void cleanup() {
+		// Do nothing.
+	}
 
-	/** Does not depend on the event loop. */
 	virtual unsigned long long lastUsed() const {
 		return 0;
 	}
 
-	SpawnerConfigPtr getConfig() const {
+	ConfigPtr getConfig() const {
 		return config;
 	}
 };
 typedef boost::shared_ptr<Spawner> SpawnerPtr;
 
 
-} // namespace ApplicationPool2
+} // namespace SpawningKit
 } // namespace Passenger
 
-#endif /* _PASSENGER_APPLICATION_POOL2_SPAWNER_H_ */
+#endif /* _PASSENGER_SPAWNING_KIT_SPAWNER_H_ */