test (d2a37c42) · Commits · jan.koester / blogi

src/blogi.cpp

+0 −26

Changes for src/blogi.cpp: 0 added lines, 26 removed lines.
Original line number	Diff line number	Diff line
		@@ -3799,28 +3799,12 @@ int main(int argc, char *argv[])
		// Pre-fork supervisor: bind socket once, fork one worker per domain.
		HttpConDPreFork preFork;

		// Collect per-domain chroot directories before forking so that
		// the child can enter its jail before the event loop starts.
		std::vector<std::string> chrootDirs(domainCount);
		for (size_t d = 0; d < domainCount; ++d)
		chrootDirs[d] = blogi::Blogi::Cfg->getDomainConfig(d).chrootDir;

		std::vector<pid_t> pids(domainCount, -1);
		for (size_t d = 0; d < domainCount; ++d)
		{
		pid_t pid = fork();
		if (pid == 0)
		{
		if (!chrootDirs[d].empty())
		{
		if (::chroot(chrootDirs[d].c_str()) != 0 \|\| ::chdir("/") != 0)
		{
		std::cerr << "[domain " << d << "] chroot('"
		<< chrootDirs[d] << "') failed: "
		<< strerror(errno) << std::endl;
		return 1;
		}
		}
		blogi::Blogi::Cfg->filterDomains(d);
		try {
		blogi::Blogi blg(blogi::Blogi::HttpServer->getServerSockets(), false);
		@@ -3856,16 +3840,6 @@ int main(int argc, char *argv[])
		pid_t newpid = fork();
		if (newpid == 0)
		{
		if (!chrootDirs[d].empty())
		{
		if (::chroot(chrootDirs[d].c_str()) != 0 \|\| ::chdir("/") != 0)
		{
		std::cerr << "[domain " << d << "] chroot('"
		<< chrootDirs[d] << "') failed: "
		<< strerror(errno) << std::endl;
		return 1;
		}
		}
		blogi::Blogi::Cfg->filterDomains(d);
		try {
		blogi::Blogi blg(blogi::Blogi::HttpServer->getServerSockets(), false);