passenger 4.0.48 → 4.0.49

data/ext/common/Utils.h

@@ -441,7 +441,7 @@ class BufferedUpload {
 public:
 	/** The file handle. */
 	FILE *handle;
-	
+
 	/**
 	 * Create an empty upload bufer file, and open it for reading and writing.
 	 *
@@ -450,19 +450,19 @@ public:
 	BufferedUpload(const string &dir, const char *identifier = "temp") {
 		char templ[PATH_MAX];
 		int fd;
-		
+
 		snprintf(templ, sizeof(templ), "%s/%s.XXXXXX", dir.c_str(), identifier);
 		templ[sizeof(templ) - 1] = '\0';
 		fd = lfs_mkstemp(templ);
 		if (fd == -1) {
 			char message[1024];
 			int e = errno;
-			
+
 			snprintf(message, sizeof(message), "Cannot create a temporary file '%s'", templ);
 			message[sizeof(message) - 1] = '\0';
 			throw SystemException(message, e);
 		}
-		
+
 		/* We use a POSIX trick here: the file's permissions are set to "u=,g=,o="
 		 * and the file is deleted immediately from the filesystem, while we
 		 * keep its file handle open. The result is that no other processes
@@ -471,10 +471,10 @@ public:
 		 */
 		fchmod(fd, 0000);
 		unlink(templ);
-		
+
 		handle = fdopen(fd, "w+");
 	}
-	
+
 	~BufferedUpload() {
 		fclose(handle);
 	}

data/ext/common/Utils/Base64.cpp

@@ -31,7 +31,7 @@
 
 namespace Passenger {
 
-static const std::string base64_chars = 
+static const std::string base64_chars =
              "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
              "abcdefghijklmnopqrstuvwxyz"
              "0123456789+/";
@@ -54,7 +54,7 @@ Base64::encode(const unsigned char *bytes_to_encode, unsigned int in_len) {
 	// + 814 bytes larger than the original. Here we reserve a little
 	// more than that to avoid memory reallocations.
 	ret.reserve((std::string::size_type) (in_len * 1.37) + 1024);
-	
+
 	while (in_len--) {
 		char_array_3[i++] = *(bytes_to_encode++);
 		if (i == 3) {
@@ -105,7 +105,7 @@ Base64::decode(const unsigned char *base64_data, unsigned int in_len) {
 		reserved_size = in_len;
 	}
 	ret.reserve(reserved_size);
-	
+
 	while (in_len-- && ( base64_data[in_] != '=') && is_base64(base64_data[in_])) {
 		char_array_4[i++] = base64_data[in_]; in_++;
 		if (i == 4) {

data/ext/common/Utils/Base64.h

@@ -42,7 +42,7 @@ public:
 	static string encode(const StaticString &data) {
 		return encode((const unsigned char *) data.data(), data.size());
 	}
-	
+
 	/** Encode using a modified Base64 format, suitable for inclusion in URLs without
 	 * needing escaping.
 	 */
@@ -50,7 +50,7 @@ public:
 		string result = encode(data);
 		string::size_type i;
 		int paddingSize = 0;
-		
+
 		for (i = 0; i < result.size(); i++) {
 			char c = result[i];
 			if (c == '+') {
@@ -61,20 +61,20 @@ public:
 				paddingSize++;
 			}
 		}
-		
+
 		if (paddingSize > 0) {
 			result.resize(result.size() - paddingSize);
 		}
-		
+
 		return result;
 	}
-	
+
 	static string decode(const StaticString &base64_data) {
 		return decode((const unsigned char *) base64_data.data(), base64_data.size());
 	}
-	
+
 	static string encode(const unsigned char *data, unsigned int len);
-	
+
 	static string decode(const unsigned char *base64_data, unsigned int len);
 };
 

data/ext/common/Utils/BlockingQueue.h

@@ -42,7 +42,7 @@ private:
 	boost::condition_variable_any removed;
 	unsigned int max;
 	std::queue<T> queue;
-	
+
 	bool atMaxCapacity() const {
 		return max > 0 && queue.size() >= max;
 	}
@@ -51,12 +51,12 @@ public:
 	BlockingQueue(unsigned int max = 0) {
 		this->max = max;
 	}
-	
+
 	unsigned int size() const {
 		boost::lock_guard<boost::timed_mutex> l(lock);
 		return queue.size();
 	}
-	
+
 	void add(const T &item) {
 		boost::unique_lock<boost::timed_mutex> l(lock);
 		while (atMaxCapacity()) {
@@ -68,7 +68,7 @@ public:
 			removed.notify_one();
 		}
 	}
-	
+
 	bool tryAdd(const T &item) {
 		boost::lock_guard<boost::timed_mutex> l(lock);
 		if (!atMaxCapacity()) {
@@ -82,7 +82,7 @@ public:
 			return false;
 		}
 	}
-	
+
 	T get() {
 		boost::unique_lock<boost::timed_mutex> l(lock);
 		while (queue.empty()) {
@@ -96,13 +96,13 @@ public:
 		}
 		return item;
 	}
-	
+
 	bool timedGet(T &output, unsigned int timeout) {
 		boost::unique_lock<boost::timed_mutex> l(lock);
 		posix_time::ptime deadline = posix_time::microsec_clock::local_time() +
 			posix_time::milliseconds(timeout);
 		bool timedOut = false;
-		
+
 		while (queue.empty() && !timedOut) {
 			posix_time::time_duration diff = deadline -
 				posix_time::microsec_clock::local_time();
@@ -125,7 +125,7 @@ public:
 			return false;
 		}
 	}
-	
+
 	bool tryGet(T &output) {
 		boost::unique_lock<boost::timed_mutex> l(lock);
 		if (queue.empty()) {
@@ -140,7 +140,7 @@ public:
 			return true;
 		}
 	}
-	
+
 	T peek() {
 		boost::unique_lock<boost::timed_mutex> l(lock);
 		while (queue.empty()) {

data/ext/common/Utils/BufferedIO.h

@@ -32,7 +32,7 @@ class BufferedIO {
 private:
 	FileDescriptor fd;
 	string buffer;
-	
+
 	static pair<unsigned int, bool> nReadOrEofReached(const char *data,
 		unsigned int size, void *output, unsigned int goalSize, unsigned int *alreadyRead)
 	{
@@ -43,14 +43,14 @@ private:
 		*alreadyRead += consumed;
 		return make_pair(consumed, *alreadyRead == goalSize);
 	}
-	
+
 	static pair<unsigned int, bool> eofReached(const char *data,
 		unsigned int size, string *output)
 	{
 		output->append(data, size);
 		return make_pair(size, false);
 	}
-	
+
 	static pair<unsigned int, bool> newlineFound(const char *data,
 		unsigned int size, string *output, unsigned int max)
 	{
@@ -70,24 +70,24 @@ private:
 			return make_pair(size, false);
 		}
 	}
-	
+
 public:
 	typedef boost::function< pair<unsigned int, bool>(const char *data, unsigned int size) > AcceptFunction;
-	
+
 	BufferedIO() { }
-	
+
 	BufferedIO(const FileDescriptor &_fd)
 		: fd(_fd)
 		{ }
-	
+
 	FileDescriptor getFd() const {
 		return fd;
 	}
-	
+
 	const string &getBuffer() const {
 		return buffer;
 	}
-	
+
 	/**
 	 * This method keeps reading data in a loop, feeding each chunk to the given
 	 * acceptor function, until the function says that it has consumed all data
@@ -113,7 +113,7 @@ public:
 	unsigned int readUntil(const AcceptFunction &acceptor, unsigned long long *timeout = NULL) {
 		pair<unsigned int, bool> acceptResult;
 		unsigned int totalRead = 0;
-		
+
 		if (!buffer.empty()) {
 			acceptResult = acceptor(buffer.c_str(), buffer.size());
 			if (OXT_UNLIKELY(!acceptResult.second && acceptResult.first < buffer.size())) {
@@ -127,12 +127,12 @@ public:
 				return totalRead;
 			}
 		}
-		
+
 		while (true) {
 			if (OXT_UNLIKELY(timeout != NULL && !waitUntilReadable(fd, timeout))) {
 				throw TimeoutException("Read timeout");
 			}
-			
+
 			char tmp[1024 * 8];
 			ssize_t ret = syscalls::read(fd, tmp, sizeof(tmp));
 			if (ret == 0) {
@@ -157,20 +157,20 @@ public:
 			}
 		}
 	}
-	
+
 	unsigned int read(void *buf, unsigned int size, unsigned long long *timeout = NULL) {
 		unsigned int counter = 0;
 		return readUntil(
 			boost::bind(nReadOrEofReached, _1, _2, buf, size, &counter),
 			timeout);
 	}
-	
+
 	string readAll(unsigned long long *timeout = NULL) {
 		string output;
 		readUntil(boost::bind(eofReached, _1, _2, &output), timeout);
 		return output;
 	}
-	
+
 	/**
 	 * Reads a line and returns the line including the newline character. Upon
 	 * encountering EOF, the empty string is returned.
@@ -189,7 +189,7 @@ public:
 		readUntil(boost::bind(newlineFound, _1, _2, &output, max), timeout);
 		return output;
 	}
-	
+
 	void unread(const void *buf, unsigned int size) {
 		string newBuffer;
 		newBuffer.reserve(size + buffer.size());
@@ -197,7 +197,7 @@ public:
 		newBuffer.append(buffer);
 		buffer = newBuffer;
 	}
-	
+
 	void unread(const StaticString &str) {
 		unread(str.c_str(), str.size());
 	}

data/ext/common/Utils/CachedFileStat.hpp

@@ -65,13 +65,13 @@ public:
 	private:
 		/** The last return value of stat(). */
 		int last_result;
-		
+
 		/** The errno set by the last stat() call. */
 		int last_errno;
-		
+
 		/** The last time a stat() was performed. */
 		time_t last_time;
-		
+
 		/**
 		 * Checks whether `interval` seconds have elapsed since `begin`.
 		 * The current time is returned via the `currentTime` argument,
@@ -87,14 +87,14 @@ public:
 			currentTime = SystemTime::get();
 			return (unsigned int) (currentTime - begin) >= interval;
 		}
-		
+
 	public:
 		/** The cached stat info. */
 		struct stat info;
-		
+
 		/** This entry's filename. */
 		string filename;
-		
+
 		/**
 		 * Creates a new Entry object. The file will not be
 		 * stat()ted until you call refresh().
@@ -109,7 +109,7 @@ public:
 			last_errno = 0;
 			last_time = 0;
 		}
-		
+
 		/**
 		 * Re-stat() the file, if necessary. If <tt>throttleRate</tt> seconds have
 		 * passed since the last time stat() was called, then the file will be
@@ -140,16 +140,16 @@ public:
 			}
 		}
 	};
-	
+
 	typedef boost::shared_ptr<Entry> EntryPtr;
 	typedef list<EntryPtr> EntryList;
 	typedef StringMap<EntryList::iterator> EntryMap;
-	
+
 	unsigned int maxSize;
 	EntryList entries;
 	EntryMap cache;
 	mutable boost::mutex lock;
-	
+
 	/**
 	 * Creates a new CachedFileStat object.
 	 *
@@ -158,7 +158,7 @@ public:
 	CachedFileStat(unsigned int maxSize = 0) {
 		this->maxSize = maxSize;
 	}
-	
+
 	/**
 	 * Stats the given file. If `throttleRate` seconds have passed since
 	 * the last time stat() was called on this file, then the file will be
@@ -182,7 +182,7 @@ public:
 		EntryList::iterator it(cache.get(filename, entries.end()));
 		EntryPtr entry;
 		int ret;
-		
+
 		if (it == entries.end()) {
 			// Filename not in cache.
 			// If cache is full, remove the least recently used
@@ -194,7 +194,7 @@ public:
 				entries.pop_back();
 				cache.remove(filename2);
 			}
-			
+
 			// Add to cache as most recently used.
 			entry = boost::make_shared<Entry>(filename);
 			entries.push_front(entry);
@@ -202,7 +202,7 @@ public:
 		} else {
 			// Cache hit.
 			entry = *it;
-			
+
 			// Mark this cache item as most recently used.
 			entries.splice(entries.begin(), entries, it);
 			cache.set(filename, entries.begin());
@@ -211,7 +211,7 @@ public:
 		*buf = entry->info;
 		return ret;
 	}
-	
+
 	/**
 	 * Change the maximum size of the cache. If the new size is larger
 	 * than the old size, then the oldest entries in the cache are
@@ -231,7 +231,7 @@ public:
 		}
 		this->maxSize = maxSize;
 	}
-	
+
 	/**
 	 * Returns whether `filename` is in the cache.
 	 */

data/ext/common/Utils/Dechunker.h

@@ -29,16 +29,16 @@ class Dechunker {
 public:
 	typedef void (*DataCallback)(const char *data, size_t size, void *userData);
 	typedef void (*Callback)(void *userData);
-	
+
 private:
 	static const char CR = '\x0D';
 	static const char LF = '\x0A';
-	
+
 	char sizeBuffer[10];
 	unsigned int sizeBufferLen;
 	unsigned int remainingDataSize;
 	const char *errorMessage;
-	
+
 	enum {
 		EXPECTING_SIZE,
 		EXPECTING_CHUNK_EXTENSION,
@@ -51,22 +51,22 @@ private:
 		DONE,
 		ERROR
 	} state;
-	
+
 	void setError(const char *message) {
 		errorMessage = message;
 		state = ERROR;
 	}
-	
+
 	bool isDigit(char ch) const {
 		return (ch >= '0' && ch <= '9')
 			|| (ch >= 'a' && ch <= 'f')
 			|| (ch >= 'A' && ch <= 'Z');
 	}
-	
+
 	void parseSizeBuffer() {
 		remainingDataSize = hexToUint(StaticString(sizeBuffer, sizeBufferLen));
 	}
-	
+
 	void emitDataEvent(const char *data, size_t size) const {
 		if (onData != NULL) {
 			onData(data, size, userData);
@@ -78,19 +78,19 @@ private:
 			onEnd(userData);
 		}
 	}
-	
+
 public:
 	DataCallback onData;
 	Callback onEnd;
 	void *userData;
-	
+
 	Dechunker() {
 		onData = NULL;
 		onEnd = NULL;
 		userData = NULL;
 		reset();
 	}
-	
+
 	/**
 	 * Resets the internal state so that this Dechunker can be reused
 	 * for parsing new data.
@@ -104,7 +104,7 @@ public:
 		remainingDataSize = 0;
 		errorMessage = NULL;
 	}
-	
+
 	/**
 	 * Feeds data into this parser. Any data chunks it has parsed will be emitted
 	 * through the onData callback. Returns the number of bytes that have been
@@ -116,7 +116,7 @@ public:
 		const char *end     = data + size;
 		const char *needle;
 		size_t dataSize;
-		
+
 		while (current < end && state != DONE && state != ERROR) {
 			switch (state) {
 			case EXPECTING_DATA:
@@ -132,7 +132,7 @@ public:
 					}
 				}
 				break;
-			
+
 			case EXPECTING_SIZE:
 				while (current < end
 				    && sizeBufferLen < sizeof(sizeBuffer)
@@ -153,12 +153,12 @@ public:
 					}
 					current++;
 				}
-				
+
 				if (sizeBufferLen == sizeof(sizeBuffer) && state == EXPECTING_SIZE) {
 					setError("The chunk size header is too large.");
 				}
 				break;
-			
+
 			case EXPECTING_CHUNK_EXTENSION:
 				needle = (const char *) memchr(current, CR, end - current);
 				if (needle == NULL) {
@@ -168,7 +168,7 @@ public:
 					state = EXPECTING_HEADER_LF;
 				}
 				break;
-			
+
 			case EXPECTING_HEADER_LF:
 				if (*current == LF) {
 					state = EXPECTING_DATA;
@@ -177,7 +177,7 @@ public:
 					setError("Parse error: expected a chunk header LF.");
 				}
 				break;
-			
+
 			case EXPECTING_NON_FINAL_CR:
 				if (*current == CR) {
 					state = EXPECTING_NON_FINAL_LF;
@@ -186,7 +186,7 @@ public:
 					setError("Parse error: expected a chunk finalizing CR.");
 				}
 				break;
-			
+
 			case EXPECTING_NON_FINAL_LF:
 				if (*current == LF) {
 					reset();
@@ -195,7 +195,7 @@ public:
 					setError("Parse error: expected a chunk finalizing LF.");
 				}
 				break;
-			
+
 			case EXPECTING_FINAL_CR:
 				if (*current == CR) {
 					state = EXPECTING_FINAL_LF;
@@ -204,7 +204,7 @@ public:
 					setError("Parse error: expected a final CR.");
 				}
 				break;
-			
+
 			case EXPECTING_FINAL_LF:
 				if (*current == LF) {
 					emitEndEvent();
@@ -214,23 +214,23 @@ public:
 					setError("Parse error: expected a final LF.");
 				}
 				break;
-			
+
 			default:
 				abort();
 			}
 		}
-		
+
 		return current - data;
 	}
-	
+
 	bool acceptingInput() const {
 		return state != DONE && state != ERROR;
 	}
-	
+
 	bool hasError() const {
 		return state == ERROR;
 	}
-	
+
 	const char *getErrorMessage() const {
 		return errorMessage;
 	}