passenger 4.0.48 → 4.0.49

data/ext/common/StaticString.h

@@ -36,6 +36,8 @@ namespace Passenger {
 
 using namespace std;
 
+#define P_STATIC_STRING(x) Passenger::StaticString(x, sizeof(x) - 1)
+
 /**
  * An immutable, static byte buffer. This class will never copy data:
  * it just holds a pointer to the data. So a StaticString will become unusable
@@ -47,7 +49,7 @@ class StaticString {
 private:
 	const char *content;
 	string::size_type len;
-	
+
 	static const char *memmem(const char *haystack, string::size_type haystack_len,
 		const char *needle, string::size_type needle_len)
 	{
@@ -77,7 +79,7 @@ private:
 			}
 		} while (true);
 	}
-	
+
 public:
 	/** A hash function object for StaticString. */
 	struct Hash {
@@ -85,7 +87,7 @@ public:
 			const char *data = str.content;
 			const char *end  = str.content + str.len;
 			size_t result    = 0;
-			
+
 			#if defined(__i386__) || defined(__x86_64__)
 				/* When on x86 or x86_64, process 4 or 8 bytes
 				 * per iteration by treating the data as an
@@ -96,15 +98,15 @@ public:
 				const char *last_long = str.content +
 					str.len / sizeof(unsigned long) *
 					sizeof(unsigned long);
-				
+
 				while (data < last_long) {
 					result = result * 33 + *((unsigned long *) data);
 					data += sizeof(unsigned long);
 				}
-				
+
 				/* Process leftover data byte-by-byte. */
 			#endif
-			
+
 			while (data < end) {
 				result = result * 33 + *data;
 				data++;
@@ -112,68 +114,68 @@ public:
 			return result;
 		}
 	};
-	
-	StaticString() {
-		content = "";
-		len = 0;
-	}
-	
-	StaticString(const StaticString &b) {
-		content = b.content;
-		len = b.len;
-	}
-	
+
+	StaticString()
+		: content(""),
+		  len(0)
+		{ }
+
+	StaticString(const StaticString &b)
+		: content(b.content),
+		  len(b.len)
+		{ }
+
 	StaticString(const string &s) {
 		content = s.data();
 		len = s.size();
 	}
-	
+
 	StaticString(const char *data) {
 		content = data;
 		len = strlen(data);
 	}
-	
-	StaticString(const char *data, string::size_type len) {
-		content = data;
-		this->len = len;
-	}
-	
+
+	StaticString(const char *data, string::size_type _len)
+		: content(data),
+		  len(_len)
+		{ }
+
 	bool empty() const {
 		return len == 0;
 	}
-	
+
 	string::size_type size() const {
 		return len;
 	}
-	
+
 	char operator[](string::size_type i) const {
 		return content[i];
 	}
-	
+
 	char at(string::size_type i) const {
 		return content[i];
 	}
-	
+
 	const char *c_str() const {
 		return content;
 	}
-	
+
 	const char *data() const {
 		return content;
 	}
-	
+
 	string toString() const {
 		return string(content, len);
 	}
-	
+
 	bool equals(const StaticString &other) const {
 		return len == other.len && memcmp(content, other.content, len) == 0;
 	}
-	
+
 	bool equals(const string &other) const {
 		return len == other.size() && memcmp(content, other.data(), len) == 0;
 	}
-	
+
 	string::size_type find(char c, string::size_type pos = 0) const {
 		if (pos < len) {
 			const char *result = (const char *) memchr(content + pos, c, len - pos);
@@ -186,7 +188,7 @@ public:
 			return string::npos;
 		}
 	}
-	
+
 	string::size_type find(const StaticString &s, string::size_type pos = 0) const {
 		if (s.empty()) {
 			return 0;
@@ -201,11 +203,11 @@ public:
 			return string::npos;
 		}
 	}
-	
+
 	string::size_type find(const char *s, string::size_type pos, string::size_type n) const {
 		return find(StaticString(s, n), pos);
 	}
-	
+
 	StaticString substr(string::size_type pos = 0, string::size_type n = string::npos) const {
 		if (pos > len) {
 			throw out_of_range("Argument 'pos' out of range");
@@ -216,33 +218,33 @@ public:
 			return StaticString(content + pos, n);
 		}
 	}
-	
+
 	bool operator==(const StaticString &other) const {
 		return len == other.len && memcmp(content, other.content, len) == 0;
 	}
-	
+
 	bool operator==(const string &other) const {
 		return len == other.size() && memcmp(content, other.data(), len) == 0;
 	}
-	
+
 	bool operator==(const char *other) const {
 		size_t other_len = strlen(other);
 		return len == other_len && memcmp(content, other, other_len) == 0;
 	}
-	
+
 	bool operator!=(const StaticString &other) const {
 		return len != other.len || memcmp(content, other.content, len) != 0;
 	}
-	
+
 	bool operator!=(const string &other) const {
 		return len != other.size() || memcmp(content, other.data(), len) != 0;
 	}
-	
+
 	bool operator!=(const char *other) const {
 		size_t other_len = strlen(other);
 		return len != other_len || memcmp(content, other, other_len) != 0;
 	}
-	
+
 	bool operator<(const StaticString &other) const {
 		size_t size = (len < other.size()) ? len : other.size();
 		int result = memcmp(content, other.data(), size);
@@ -252,25 +254,25 @@ public:
 			return result < 0;
 		}
 	}
-	
+
 	bool operator<(const char *other) const {
 		return *this < StaticString(other);
 	}
-	
+
 	string operator+(const char *other) const {
 		return string(content, len) + other;
 	}
-	
+
 	string operator+(const string &other) const {
 		return string(content, len) + other;
 	}
-	
+
 	string operator+(const StaticString &other) const {
 		string result(content, len);
 		result.append(other.data(), other.size());
 		return result;
 	}
-	
+
 	operator string() const {
 		return string(content, len);
 	}

data/ext/common/Utils.cpp

@@ -27,6 +27,7 @@
 #include <boost/thread.hpp>
 #include <boost/shared_array.hpp>
 
+#include <algorithm>
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
@@ -90,12 +91,12 @@ namespace {
 	struct FileGuard {
 		string filename;
 		bool committed;
-		
+
 		FileGuard(const string &filename) {
 			this->filename = filename;
 			committed = false;
 		}
-		
+
 		~FileGuard() {
 			if (!committed) {
 				int ret;
@@ -104,7 +105,7 @@ namespace {
 				} while (ret == -1 && errno == EINTR);
 			}
 		}
-		
+
 		void commit() {
 			committed = true;
 		}
@@ -120,7 +121,7 @@ FileType
 getFileType(const StaticString &filename, CachedFileStat *cstat, unsigned int throttleRate) {
 	struct stat buf;
 	int ret;
-	
+
 	if (cstat != NULL) {
 		ret = cstat->stat(filename, &buf, throttleRate);
 	} else {
@@ -153,7 +154,7 @@ createFile(const string &filename, const StaticString &contents, mode_t permissi
 {
 	FileDescriptor fd;
 	int ret, e, options;
-	
+
 	options = O_WRONLY | O_CREAT | O_TRUNC;
 	if (!overwrite) {
 		options |= O_EXCL;
@@ -163,7 +164,7 @@ createFile(const string &filename, const StaticString &contents, mode_t permissi
 	} while (fd == -1 && errno == EINTR);
 	if (fd != -1) {
 		FileGuard guard(filename);
-		
+
 		// The file permission may not be as expected because of the active
 		// umask, so fchmod() it here to ensure correct permissions.
 		do {
@@ -174,7 +175,7 @@ createFile(const string &filename, const StaticString &contents, mode_t permissi
 			throw FileSystemException("Cannot set permissions on " + filename,
 				e, filename);
 		}
-		
+
 		if (owner != USER_NOT_GIVEN && group != GROUP_NOT_GIVEN) {
 			if (owner == USER_NOT_GIVEN) {
 				owner = (uid_t) -1; // Don't let fchown change file owner.
@@ -191,7 +192,7 @@ createFile(const string &filename, const StaticString &contents, mode_t permissi
 					e, filename);
 			}
 		}
-		
+
 		try {
 			writeExact(fd, contents);
 			fd.close();
@@ -219,7 +220,7 @@ canonicalizePath(const string &path) {
 		if (tmp == NULL) {
 			int e = errno;
 			string message;
-			
+
 			message = "Cannot resolve the path '";
 			message.append(path);
 			message.append("'");
@@ -234,7 +235,7 @@ canonicalizePath(const string &path) {
 		if (realpath(path.c_str(), tmp) == NULL) {
 			int e = errno;
 			string message;
-			
+
 			message = "Cannot resolve the path '";
 			message.append(path);
 			message.append("'");
@@ -249,7 +250,7 @@ string
 resolveSymlink(const StaticString &path) {
 	char buf[PATH_MAX];
 	ssize_t size;
-	
+
 	size = readlink(path.c_str(), buf, sizeof(buf) - 1);
 	if (size == -1) {
 		if (errno == EINVAL) {
@@ -347,10 +348,10 @@ escapeForXml(const StaticString &input) {
 	string::size_type input_pos = 0;
 	string::size_type input_end_pos = input.size();
 	string::size_type result_pos = 0;
-	
+
 	while (input_pos < input_end_pos) {
 		const unsigned char ch = input[input_pos];
-		
+
 		if ((ch >= 'A' && ch <= 'z')
 		 || (ch >= '0' && ch <= '9')
 		 || ch == '/' || ch == ' ' || ch == '_' || ch == '.'
@@ -362,7 +363,7 @@ escapeForXml(const StaticString &input) {
 			// Not an ASCII character; escape it.
 			char escapedCharacter[sizeof("&#255;") + 1];
 			int size;
-			
+
 			size = snprintf(escapedCharacter,
 				sizeof(escapedCharacter) - 1,
 				"&#%d;",
@@ -371,13 +372,13 @@ escapeForXml(const StaticString &input) {
 				throw std::bad_alloc();
 			}
 			escapedCharacter[sizeof(escapedCharacter) - 1] = '\0';
-			
+
 			result.replace(result_pos, 1, escapedCharacter, size);
 			result_pos += size;
 		}
 		input_pos++;
 	}
-	
+
 	return result;
 }
 
@@ -387,11 +388,9 @@ getProcessUsername() {
 	long bufSize;
 	shared_array<char> strings;
 
-	bufSize = sysconf(_SC_GETPW_R_SIZE_MAX);
-	if (bufSize == -1) {
-		// Let's hope this is enough.
-		bufSize = 1024 * 64;
-	}
+	// _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]);
 
 	result = (struct passwd *) NULL;
@@ -414,11 +413,9 @@ getGroupName(gid_t gid) {
 	long bufSize;
 	shared_array<char> strings;
 
-	bufSize = sysconf(_SC_GETGR_R_SIZE_MAX);
-	if (bufSize == -1) {
-		// Let's hope this is enough.
-		bufSize = 1024 * 64;
-	}
+	// _SC_GETGR_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_GETGR_R_SIZE_MAX));
 	strings.reset(new char[bufSize]);
 
 	groupEntry = (struct group *) NULL;
@@ -439,11 +436,9 @@ lookupGid(const string &groupName) {
 	long bufSize;
 	shared_array<char> strings;
 
-	bufSize = sysconf(_SC_GETGR_R_SIZE_MAX);
-	if (bufSize == -1) {
-		// Let's hope this is enough.
-		bufSize = 1024 * 64;
-	}
+	// _SC_GETGR_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_GETGR_R_SIZE_MAX));
 	strings.reset(new char[bufSize]);
 
 	groupEntry = (struct group *) NULL;
@@ -467,17 +462,17 @@ parseModeString(const StaticString &mode) {
 	mode_t modeBits = 0;
 	vector<string> clauses;
 	vector<string>::iterator it;
-	
+
 	split(mode, ',', clauses);
 	for (it = clauses.begin(); it != clauses.end(); it++) {
 		const string &clause = *it;
-		
+
 		if (clause.empty()) {
 			continue;
 		} else if (clause.size() < 2 || (clause[0] != '+' && clause[1] != '=')) {
 			throw InvalidModeStringException("Invalid mode clause specification '" + clause + "'");
 		}
-		
+
 		switch (clause[0]) {
 		case 'u':
 			for (string::size_type i = 2; i < clause.size(); i++) {
@@ -564,7 +559,7 @@ parseModeString(const StaticString &mode) {
 				"' in mode clause specification '" + clause + "'");
 		}
 	}
-	
+
 	return modeBits;
 }
 
@@ -648,13 +643,13 @@ makeDirTree(const string &path, const StaticString &mode, uid_t owner, gid_t gro
 	string current = path;
 	mode_t modeBits;
 	int ret;
-	
+
 	if (stat(path.c_str(), &buf) == 0) {
 		return;
 	}
-	
+
 	modeBits = parseModeString(mode);
-	
+
 	/* Create a list of parent paths that don't exist. For example, given
 	 * path == "/a/b/c/d/e" and that only /a exists, the list will become
 	 * as follows:
@@ -667,11 +662,11 @@ makeDirTree(const string &path, const StaticString &mode, uid_t owner, gid_t gro
 		paths.push_back(current);
 		current = extractDirName(current);
 	}
-	
+
 	/* Now traverse the list in reverse order and create directories that don't exist. */
 	for (rit = paths.rbegin(); rit != paths.rend(); rit++) {
 		current = *rit;
-		
+
 		do {
 			ret = mkdir(current.c_str(), modeBits);
 		} while (ret == -1 && errno == EINTR);
@@ -685,12 +680,12 @@ makeDirTree(const string &path, const StaticString &mode, uid_t owner, gid_t gro
 					e, current);
 			}
 		}
-		
+
 		/* Chmod in order to override the umask. */
 		do {
 			ret = chmod(current.c_str(), modeBits);
 		} while (ret == -1 && errno == EINTR);
-		
+
 		if (owner != USER_NOT_GIVEN && group != GROUP_NOT_GIVEN) {
 			if (owner == USER_NOT_GIVEN) {
 				owner = (uid_t) -1; // Don't let chown change file owner.
@@ -704,7 +699,7 @@ makeDirTree(const string &path, const StaticString &mode, uid_t owner, gid_t gro
 			if (ret == -1) {
 				char message[1024];
 				int e = errno;
-				
+
 				snprintf(message, sizeof(message) - 1,
 					"Cannot change the directory '%s' its UID to %lld and GID to %lld",
 					current.c_str(), (long long) owner, (long long) group);
@@ -779,32 +774,32 @@ prestartWebApps(const ResourceLocator &locator, const string &ruby,
 	 * executing the prespawning scripts.
 	 */
 	syscalls::sleep(2);
-	
+
 	this_thread::disable_interruption di;
 	this_thread::disable_syscall_interruption dsi;
 	vector<string>::const_iterator it;
 	string prespawnScript = locator.getHelperScriptsDir() + "/prespawn";
-	
+
 	it = prestartURLs.begin();
 	while (it != prestartURLs.end() && !this_thread::interruption_requested()) {
 		if (it->empty()) {
 			it++;
 			continue;
 		}
-		
+
 		pid_t pid;
-		
+
 		pid = fork();
 		if (pid == 0) {
 			long max_fds, i;
 			int e;
-			
+
 			// Close all unnecessary file descriptors.
 			max_fds = sysconf(_SC_OPEN_MAX);
 			for (i = 3; i < max_fds; i++) {
 				syscalls::close(i);
 			}
-			
+
 			execlp(ruby.c_str(),
 				ruby.c_str(),
 				prespawnScript.c_str(),
@@ -829,7 +824,7 @@ prestartWebApps(const ResourceLocator &locator, const string &ruby,
 				throw;
 			}
 		}
-		
+
 		this_thread::restore_interruption si(di);
 		this_thread::restore_syscall_interruption ssi(dsi);
 		syscalls::sleep(1);
@@ -962,7 +957,7 @@ resetSignalHandlersAndMask() {
 
 	sigset_t signal_set;
 	int ret;
-	
+
 	sigemptyset(&signal_set);
 	do {
 		ret = sigprocmask(SIG_SETMASK, &signal_set, NULL);
@@ -1033,9 +1028,9 @@ runCommandAndCaptureOutput(const char **command) {
 	pid_t pid;
 	int e;
 	Pipe p;
-	
+
 	p = createPipe();
-	
+
 	this_thread::disable_syscall_interruption dsi;
 	pid = syscalls::fork();
 	if (pid == 0) {
@@ -1060,12 +1055,12 @@ runCommandAndCaptureOutput(const char **command) {
 	} else {
 		bool done = false;
 		string result;
-		
+
 		p[1].close();
 		while (!done) {
 			char buf[1024 * 4];
 			ssize_t ret;
-			
+
 			try {
 				this_thread::restore_syscall_interruption rsi(dsi);
 				ret = syscalls::read(p[0], buf, sizeof(buf));
@@ -1086,7 +1081,7 @@ runCommandAndCaptureOutput(const char **command) {
 		}
 		p[0].close();
 		syscalls::waitpid(pid, NULL, 0);
-		
+
 		if (result.empty()) {
 			throw RuntimeException(string("The '") + command[1] +
 				"' command failed");
@@ -1123,7 +1118,7 @@ asyncFork() {
 static int
 getFileDescriptorLimit() {
 	long long sysconfResult = sysconf(_SC_OPEN_MAX);
-	
+
 	struct rlimit rl;
 	long long rlimitResult;
 	if (getrlimit(RLIMIT_NOFILE, &rl) == -1) {
@@ -1131,7 +1126,7 @@ getFileDescriptorLimit() {
 	} else {
 		rlimitResult = (long long) rl.rlim_max;
 	}
-	
+
 	long result;
 	// OS X 10.9 returns LLONG_MAX. It doesn't make sense
 	// to use that result so we limit ourselves to the
@@ -1159,7 +1154,7 @@ static int
 getHighestFileDescriptor(bool asyncSignalSafe) {
 #if defined(F_MAXFD)
 	int ret;
-	
+
 	do {
 		ret = fcntl(0, F_MAXFD);
 	} while (ret == -1 && errno == EINTR);
@@ -1167,17 +1162,17 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 		ret = getFileDescriptorLimit();
 	}
 	return ret;
-	
+
 #else
 	int p[2], ret, flags;
 	pid_t pid = -1;
 	int result = -1;
-	
+
 	/* Since opendir() may not be async signal safe and thus may lock up
 	 * or crash, we use it in a child process which we kill if we notice
 	 * that things are going wrong.
 	 */
-	
+
 	// Make a pipe.
 	p[0] = p[1] = -1;
 	do {
@@ -1186,7 +1181,7 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 	if (ret == -1) {
 		goto done;
 	}
-	
+
 	// Make the read side non-blocking.
 	do {
 		flags = fcntl(p[0], F_GETFL);
@@ -1200,7 +1195,7 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 	if (ret == -1) {
 		goto done;
 	}
-	
+
 	if (asyncSignalSafe) {
 		do {
 			pid = asyncFork();
@@ -1210,12 +1205,12 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 			pid = fork();
 		} while (pid == -1 && errno == EINTR);
 	}
-	
+
 	if (pid == 0) {
 		// Don't close p[0] here or it might affect the result.
-		
+
 		resetSignalHandlersAndMask();
-		
+
 		struct sigaction action;
 		action.sa_handler = _exit;
 		action.sa_flags   = SA_RESTART;
@@ -1226,7 +1221,7 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 		sigaction(SIGILL, &action, NULL);
 		sigaction(SIGFPE, &action, NULL);
 		sigaction(SIGABRT, &action, NULL);
-		
+
 		DIR *dir = NULL;
 		#ifdef __APPLE__
 			/* /dev/fd can always be trusted on OS X. */
@@ -1253,14 +1248,14 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 				_exit(1);
 			}
 		}
-		
+
 		struct dirent *ent;
 		union {
 			int highest;
 			char data[sizeof(int)];
 		} u;
 		u.highest = -1;
-		
+
 		while ((ent = readdir(dir)) != NULL) {
 			if (ent->d_name[0] != '.') {
 				int number = atoi(ent->d_name);
@@ -1281,14 +1276,14 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 		}
 		closedir(dir);
 		_exit(0);
-		
+
 	} else if (pid == -1) {
 		goto done;
-		
+
 	} else {
 		close(p[1]); // Do not retry on EINTR: http://news.ycombinator.com/item?id=3363819
 		p[1] = -1;
-		
+
 		union {
 			int highest;
 			char data[sizeof(int)];
@@ -1297,7 +1292,7 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 		struct pollfd pfd;
 		pfd.fd = p[0];
 		pfd.events = POLLIN;
-		
+
 		do {
 			do {
 				// The child process must finish within 30 ms, otherwise
@@ -1307,7 +1302,7 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 			if (ret <= 0) {
 				goto done;
 			}
-			
+
 			do {
 				ret = read(p[0], u.data + bytesRead, sizeof(int) - bytesRead);
 			} while (ret == -1 && ret == EINTR);
@@ -1321,7 +1316,7 @@ getHighestFileDescriptor(bool asyncSignalSafe) {
 				bytesRead += ret;
 			}
 		} while (bytesRead < (ssize_t) sizeof(int));
-		
+
 		result = u.highest;
 		goto done;
 	}
@@ -1342,7 +1337,7 @@ done:
 			ret = waitpid(pid, NULL, 0);
 		} while (ret == -1 && errno == EINTR);
 	}
-	
+
 	if (result == -1) {
 		result = getFileDescriptorLimit();
 	}
@@ -1364,7 +1359,7 @@ closeAllFileDescriptors(int lastToKeepOpen, bool asyncSignalSafe) {
 		closefrom(lastToKeepOpen + 1);
 		return;
 	#endif
-	
+
 	for (int i = getHighestFileDescriptor(asyncSignalSafe); i > lastToKeepOpen; i--) {
 		/* Even though we normally shouldn't retry on EINTR
 		 * (http://news.ycombinator.com/item?id=3363819)