passenger 4.0.48 → 4.0.49

data/ext/common/Utils/ScopeGuard.h

@@ -52,15 +52,15 @@ class ScopeGuard: public noncopyable {
 private:
 	boost::function<void ()> func;
 	bool interruptable;
-	
+
 public:
 	ScopeGuard() { }
-	
+
 	ScopeGuard(const boost::function<void ()> &func, bool interruptable = false) {
 		this->func = func;
 		this->interruptable = interruptable;
 	}
-	
+
 	~ScopeGuard() {
 		if (func) {
 			if (interruptable) {
@@ -72,11 +72,11 @@ public:
 			}
 		}
 	}
-	
+
 	void clear() {
 		func = boost::function<void()>();
 	}
-	
+
 	void runNow() {
 		boost::function<void ()> oldFunc = func;
 		func = boost::function<void()>();
@@ -102,7 +102,7 @@ public:
 	StdioGuard(FILE *_f)
 		: f(_f)
 		{ }
-	
+
 	~StdioGuard() {
 		if (f != NULL) {
 			fclose(f);
@@ -120,7 +120,7 @@ public:
 		: fd(_fd),
 		  ignoreErrors(_ignoreErrors)
 		{ }
-	
+
 	~FdGuard() {
 		if (fd != -1) {
 			safelyClose(fd, ignoreErrors);

data/ext/common/Utils/SpeedMeter.h

@@ -65,7 +65,7 @@ namespace Passenger {
  * If you have few samples then recent data have the most impact on the results.
  *
  * ### `minAge`
- * 
+ *
  * A new sample is only accepted if at least `minAge` microseconds
  * have passed since the last sample. This is to ensure that the sample
  * buffer contains enough historical data so that results are not skewed by

data/ext/common/Utils/StrIntUtils.cpp

@@ -40,7 +40,7 @@ fillInMiddle(unsigned int max, const string &prefix, const string &middle, const
 	if (max <= prefix.size() + postfix.size()) {
 		throw ArgumentException("Impossible to build string with the given size constraint.");
 	}
-	
+
 	unsigned int fillSize = max - (prefix.size() + postfix.size());
 	if (fillSize > middle.size()) {
 		return prefix + middle + postfix;
@@ -200,7 +200,7 @@ stringToUnsignedNumeric(const StaticString &str) {
 	Numeric result = 0;
 	string::size_type i = 0;
 	const char *data = str.data();
-	
+
 	while (data[i] == ' ' && i < str.size()) {
 		i++;
 	}
@@ -229,7 +229,7 @@ stringToSignedNumeric(const StaticString &str) {
 	string::size_type i = 0;
 	const char *data = str.data();
 	bool minus = false;
-	
+
 	while (data[i] == ' ' && i < str.size()) {
 		i++;
 	}
@@ -266,7 +266,7 @@ hexToUnsignedNumeric(const StaticString &hex) {
 	const char *end = hex.data() + hex.size();
 	Numeric result = 0;
 	bool done = false;
-	
+
 	while (pos < end && !done) {
 		char c = *pos;
 		if (c >= '0' && c <= '9') {
@@ -301,7 +301,7 @@ hexatriToULL(const StaticString &str) {
 	unsigned long long result = 0;
 	string::size_type i = 0;
 	bool done = false;
-	
+
 	while (i < str.size() && !done) {
 		char c = str[i];
 		if (c >= '0' && c <= '9') {
@@ -346,7 +346,7 @@ void
 toHex(const StaticString &data, char *output, bool upperCase) {
 	const char *data_buf = data.c_str();
 	string::size_type i;
-	
+
 	if (upperCase) {
 		for (i = 0; i < data.size(); i++) {
 			output[i * 2] = upcase_hex_chars[(unsigned char) data_buf[i] / 16];
@@ -434,7 +434,7 @@ distanceOfTimeInWords(time_t fromTime, time_t toTime) {
 	} else {
 		seconds = fromTime - toTime;
 	}
-	
+
 	if (seconds >= 60) {
 		time_t minutes = seconds / 60;
 		if (minutes >= 60) {
@@ -448,7 +448,7 @@ distanceOfTimeInWords(time_t fromTime, time_t toTime) {
 			minutes = minutes % 60;
 			result << hours << "h ";
 		}
-		
+
 		seconds = seconds % 60;
 		result << minutes << "m ";
 	}
@@ -473,7 +473,7 @@ cEscapeString(const StaticString &input) {
 	string result;
 	const char *current = input.c_str();
 	const char *end = current + input.size();
-	
+
 	result.reserve(input.size());
 	while (current < end) {
 		char c = *current;
@@ -482,7 +482,7 @@ cEscapeString(const StaticString &input) {
 			result.append(1, c);
 		} else {
 			char buf[sizeof("\\xFF")];
-			
+
 			switch (c) {
 			case '\0':
 				// Explicitly in hex format in order to avoid confusion
@@ -519,10 +519,10 @@ string
 escapeHTML(const StaticString &input) {
 	string result;
 	result.reserve((int) ceil(input.size() * 1.25));
-	
+
 	const char *current = (const char *) input.c_str();
 	const char *end     = current + input.size();
-	
+
 	while (current < end) {
 		char ch = *current;
 		if (ch & 128) {
@@ -530,7 +530,7 @@ escapeHTML(const StaticString &input) {
 			const char *prev = current;
 			utf8::advance(current, 1, end);
 			result.append(prev, current - prev);
-			
+
 		} else {
 			// ASCII character <= 127.
 			if (ch == '<') {

data/ext/common/Utils/StrIntUtils.h

@@ -245,7 +245,7 @@ reverseString(char *str, unsigned int size) {
  * Convert the given integer to some other radix, placing
  * the result into the given output buffer. The output buffer
  * will be NULL terminated. Supported radices are 2-36.
- * 
+ *
  * @param outputSize The size of the output buffer, including space for
  *                   the terminating NULL.
  * @return The size of the created string, excluding
@@ -263,13 +263,13 @@ integerToOtherBase(IntegerType value, char *output, unsigned int outputSize) {
 	};
 	IntegerType remainder = value;
 	unsigned int size = 0;
-	
+
 	do {
 		output[size] = chars[remainder % radix];
 		remainder = remainder / radix;
 		size++;
 	} while (remainder != 0 && size < outputSize - 1);
-	
+
 	if (remainder == 0) {
 		reverseString(output, size);
 		output[size] = '\0';

data/ext/common/Utils/StringScanning.h

@@ -64,7 +64,7 @@ struct ParseException {};
  * Leading whitespaces (but not newlines) are ignored. If a word is found
  * then the word is returned and the data pointer is moved to the end of
  * the word.
- * 
+ *
  * If the first line only contains whitespaces, or if the first line is empty,
  * then a ParseException is thrown.
  *
@@ -76,14 +76,14 @@ readNextWord(const char **data) {
 	if (**data == '\n' || **data == '\0') {
 		throw ParseException();
 	}
-	
+
 	// Find end of word and extract the word.
 	const char *endOfWord = *data;
 	while (*endOfWord != ' ' && *endOfWord != '\n' && *endOfWord != '\0') {
 		endOfWord++;
 	}
 	StaticString result(*data, endOfWord - *data);
-	
+
 	// Move data pointer to the end of this word.
 	*data = endOfWord;
 	return result;
@@ -200,7 +200,7 @@ readRestOfLine(const char *data) {
 	if (*data == '\n' || *data == '\0') {
 		return "";
 	}
-	
+
 	// Look for newline character. From there, scan back until we've
 	// found a non-whitespace character.
 	const char *endOfLine = strchr(data, '\n');
@@ -210,7 +210,7 @@ readRestOfLine(const char *data) {
 	while (*(endOfLine - 1) == ' ') {
 		endOfLine--;
 	}
-	
+
 	return string(data, endOfLine - data);
 }
 

data/ext/common/Utils/SystemMetricsCollector.h

@@ -243,14 +243,14 @@ public:
 		 *
 		 * userUsage, niceUsage, systemUsage and idleUsage are fractions
 		 * of user + nice + system + idle.
-		 * 
+		 *
 		 * ioWaitUsage is a fraction of user + nice + system + idle + iowait.
 		 *
 		 * stealUsage is a fraction of user + nice + system + idle + steal.
 		 *
 		 * All fractions range from 0 (unutilized) to SHRT_MAX (fully utilized).
 		 * Use the *Pct() methods to convert them to percentages.
-		 * 
+		 *
 		 * Each statistic can individually be -1 if an error occurred while querying
 		 * it, or -2 if the OS doesn't support it.
 		 */

data/ext/common/Utils/SystemTime.h

@@ -75,7 +75,7 @@ public:
 			return ret;
 		}
 	}
-	
+
 	/**
 	 * Returns the time since the Epoch, measured in milliseconds. Or, if a
 	 * time was forced with forceMsec(), then the forced time is returned instead.
@@ -90,7 +90,7 @@ public:
 		} else {
 			struct timeval t;
 			int ret;
-			
+
 			do {
 				ret = gettimeofday(&t, NULL);
 			} while (ret == -1 && errno == EINTR);
@@ -103,7 +103,7 @@ public:
 			return (unsigned long long) t.tv_sec * 1000 + t.tv_usec / 1000;
 		}
 	}
-	
+
 	/**
 	 * Returns the time since the Epoch, measured in microseconds. Or, if a
 	 * time was forced with forceUsec(), then the forced time is returned instead.
@@ -117,7 +117,7 @@ public:
 		} else {
 			struct timeval t;
 			int ret;
-			
+
 			do {
 				ret = gettimeofday(&t, NULL);
 			} while (ret == -1 && errno == EINTR);
@@ -138,7 +138,7 @@ public:
 		SystemTimeData::hasForcedValue = true;
 		SystemTimeData::forcedValue = value;
 	}
-	
+
 	/**
 	 * Force getMsec() to return the given value.
 	 */
@@ -146,7 +146,7 @@ public:
 		SystemTimeData::hasForcedMsecValue = true;
 		SystemTimeData::forcedMsecValue = value;
 	}
-	
+
 	/**
 	 * Force getUsec() to return the given value.
 	 */
@@ -154,7 +154,7 @@ public:
 		SystemTimeData::hasForcedUsecValue = true;
 		SystemTimeData::forcedUsecValue = value;
 	}
-	
+
 	static void forceAll(unsigned long long usec) {
 		force(usec / 1000000);
 		forceMsec(usec / 1000);
@@ -168,7 +168,7 @@ public:
 	static void release() {
 		SystemTimeData::hasForcedValue = false;
 	}
-	
+
 	/**
 	 * Release the previously forced msec value, so that getMsec()
 	 * returns the system time once again.
@@ -176,7 +176,7 @@ public:
 	static void releaseMsec() {
 		SystemTimeData::hasForcedMsecValue = false;
 	}
-	
+
 	/**
 	 * Release the previously forced usec value, so that getUsec()
 	 * returns the system time once again.
@@ -184,7 +184,7 @@ public:
 	static void releaseUsec() {
 		SystemTimeData::hasForcedUsecValue = false;
 	}
-	
+
 	/**
 	 * Release all previously forced values, so that get(), getMsec()
 	 * and getUsec() return the system time once again.

data/ext/common/Utils/Template.h

@@ -168,7 +168,7 @@ private:
 		if (endPos == string::npos) {
 			return state.result.size();
 		}
-		
+
 		string name = state.result.substr(pos + 2, endPos - pos - 2);
 		if (startsWith(name, "if ")) {
 			return processIf(state, pos, endPos, name);
@@ -194,7 +194,7 @@ public:
 	Template(const StaticString &_content)
 		: content(_content)
 		{ }
-	
+
 	string apply(const StringMap<StaticString> &substitutions) {
 		State state(content, substitutions);
 		apply(state);

data/ext/common/Utils/Timer.h

@@ -65,7 +65,7 @@ public:
 			stop();
 		}
 	}
-	
+
 	/**
 	 * Start the timer. If the timer was already started, then this will
 	 * restart the timer.
@@ -80,7 +80,7 @@ public:
 			ret = gettimeofday(&startTime, NULL);
 		} while (ret == -1 && errno == EINTR);
 	}
-	
+
 	/**
 	 * Stop the timer. If there's currently another thread waiting on the wait()
 	 * call, then that wait() call will block indefinitely until you call start()
@@ -118,7 +118,7 @@ public:
 			struct timeval t;
 			unsigned long long now, beginning;
 			int ret;
-			
+
 			do {
 				ret = gettimeofday(&t, NULL);
 			} while (ret == -1 && errno == EINTR);
@@ -127,7 +127,7 @@ public:
 			return now - beginning;
 		}
 	}
-	
+
 	/**
 	 * Returns the amount of time that has elapsed since the timer was last started,
 	 * in microseconds. If the timer is currently stopped, then 0 is returned.
@@ -140,7 +140,7 @@ public:
 			struct timeval t;
 			unsigned long long now, beginning;
 			int ret;
-			
+
 			do {
 				ret = gettimeofday(&t, NULL);
 			} while (ret == -1 && errno == EINTR);
@@ -149,7 +149,7 @@ public:
 			return now - beginning;
 		}
 	}
-	
+
 	/**
 	 * Wait until <em>time</em> miliseconds have elapsed since the timer
 	 * was last started.

data/ext/common/Utils/VariantMap.h

@@ -60,7 +60,7 @@ class VariantMap {
 private:
 	map<string, string> store;
 	string empty;
-	
+
 	/**
 	 * Looks up the string value associated with <em>name</em>.
 	 * If found, then <tt>true</tt> is returned and a pointer to
@@ -85,26 +85,26 @@ private:
 			return true;
 		}
 	}
-	
+
 public:
 	/** Thrown when a required key is not found by one of the get() methods. */
 	class MissingKeyException: public oxt::tracable_exception {
 	private:
 		string message;
 		string key;
-		
+
 	public:
 		MissingKeyException(const string &key) {
 			this->key = key;
 			message = string("Required key '") + key + "' is missing";
 		}
-		
+
 		virtual ~MissingKeyException() throw() { }
-		
+
 		virtual const char *what() const throw() {
 			return message.c_str();
 		}
-		
+
 		/** The key that wasn't found. */
 		const string &getKey() const {
 			return key;
@@ -140,7 +140,7 @@ public:
 			i += 2;
 		}
 	}
-	
+
 	/**
 	 * Populates a VariantMap from the data in `fd`. MessageIO
 	 * is used to read from the file descriptor.
@@ -151,7 +151,7 @@ public:
 	void readFrom(int fd, const StaticString &messageName = "VariantMap") {
 		TRACE_POINT();
 		vector<string> args;
-		
+
 		if (!readArrayMessage(fd, args)) {
 			throw IOException("Unexpected end-of-file encountered");
 		}
@@ -164,7 +164,7 @@ public:
 		if (args.size() % 2 != 1) {
 			throw IOException("Message from channel has an unexpected number of arguments");
 		}
-		
+
 		vector<string>::const_iterator it = args.begin();
 		it++;
 		while (it != args.end()) {
@@ -175,7 +175,7 @@ public:
 			store[key] = value;
 		}
 	}
-	
+
 	VariantMap &set(const string &name, const string &value) {
 		if (value.empty()) {
 			map<string, string>::iterator it = store.find(name);
@@ -194,7 +194,7 @@ public:
 		}
 		return *this;
 	}
-	
+
 	VariantMap &setInt(const string &name, int value) {
 		set(name, toString(value));
 		return *this;
@@ -206,7 +206,7 @@ public:
 		}
 		return *this;
 	}
-	
+
 	VariantMap &setULL(const string &name, unsigned long long value) {
 		set(name, toString(value));
 		return *this;
@@ -218,7 +218,7 @@ public:
 		}
 		return *this;
 	}
-	
+
 	VariantMap &setPid(const string &name, pid_t value) {
 		set(name, toString((unsigned long long) value));
 		return *this;
@@ -230,7 +230,7 @@ public:
 		}
 		return *this;
 	}
-	
+
 	VariantMap &setUid(const string &name, uid_t value) {
 		set(name, toString((long long) value));
 		return *this;
@@ -242,7 +242,7 @@ public:
 		}
 		return *this;
 	}
-	
+
 	VariantMap &setGid(const string &name, gid_t value) {
 		set(name, toString((long long) value));
 		return *this;
@@ -254,7 +254,7 @@ public:
 		}
 		return *this;
 	}
-	
+
 	VariantMap &setBool(const string &name, bool value) {
 		set(name, value ? "true" : "false");
 		return *this;
@@ -291,7 +291,7 @@ public:
 			return it->second;
 		}
 	}
-	
+
 	const string &get(const string &name, bool required, const string &defaultValue) const {
 		map<string, string>::const_iterator it = store.find(name);
 		if (it == store.end()) {
@@ -304,7 +304,7 @@ public:
 			return it->second;
 		}
 	}
-	
+
 	int getInt(const string &name, bool required = true, int defaultValue = 0) const {
 		int result = defaultValue;
 		const string *str;
@@ -313,7 +313,7 @@ public:
 		}
 		return result;
 	}
-	
+
 	unsigned long long getULL(const string &name, bool required = true,
 		unsigned long long defaultValue = 0) const
 	{
@@ -324,7 +324,7 @@ public:
 		}
 		return result;
 	}
-	
+
 	pid_t getPid(const string &name, bool required = true, pid_t defaultValue = 0) const {
 		pid_t result = defaultValue;
 		const string *str;
@@ -333,7 +333,7 @@ public:
 		}
 		return result;
 	}
-	
+
 	uid_t getUid(const string &name, bool required = true, uid_t defaultValue = 0) const {
 		uid_t result = defaultValue;
 		const string *str;
@@ -342,7 +342,7 @@ public:
 		}
 		return result;
 	}
-	
+
 	gid_t getGid(const string &name, bool required = true, gid_t defaultValue = 0) const {
 		gid_t result = defaultValue;
 		const string *str;
@@ -351,7 +351,7 @@ public:
 		}
 		return result;
 	}
-	
+
 	bool getBool(const string &name, bool required = true, bool defaultValue = false) const {
 		bool result = defaultValue;
 		const string *str;
@@ -372,16 +372,16 @@ public:
 		}
 		return result;
 	}
-	
+
 	bool erase(const string &name) {
 		return store.erase(name) != 0;
 	}
-	
+
 	/** Checks whether the specified key is in this map. */
 	bool has(const string &name) const {
 		return store.find(name) != store.end();
 	}
-	
+
 	/** Returns the number of elements in this map. */
 	unsigned int size() const {
 		return store.size();
@@ -395,7 +395,7 @@ public:
 			other.set(it->first, it->second);
 		}
 	}
-	
+
 	/**
 	 * Writes a representation of the contents in this VariantMap to
 	 * the given file descriptor with MessageIO. The data can be
@@ -407,7 +407,7 @@ public:
 		map<string, string>::const_iterator it;
 		map<string, string>::const_iterator end = store.end();
 		vector<string> args;
-		
+
 		args.reserve(1 + 2 * store.size());
 		args.push_back(messageName);
 		for (it = store.begin(); it != end; it++) {
@@ -438,7 +438,7 @@ public:
 		map<string, string>::const_iterator end = store.end();
 		string result;
 		unsigned int i = 0;
-		
+
 		result.append("{ ");
 		for (it = store.begin(); it != end; it++, i++) {
 			result.append("'");