passenger 4.0.20 → 4.0.21

data/ext/common/Utils/HashMap.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -30,10 +30,19 @@
  * There are too many ways to include hash_map/unordered_map!
  * This header autodetects the correct method.
  */
-#if defined(HAS_TR1_UNORDERED_MAP)
+#if defined(HAS_UNORDERED_MAP)
+	#include <unordered_map>
+	#define HashMap std::unordered_map
+#elif defined(HAS_TR1_UNORDERED_MAP)
 	#include <tr1/unordered_map>
 	#define HashMap std::tr1::unordered_map
 #elif defined(HASH_NAMESPACE) && defined(HASH_MAP_HEADER)
+	#ifndef _GLIBCXX_PERMIT_BACKWARD_HASH
+		// Prevent deprecation warning on newer libstdc++ systems.
+		// The warning suggests using unordered_map, but that is only
+		// available when C++11 features are explicitly enabled.
+		#define _GLIBCXX_PERMIT_BACKWARD_HASH
+	#endif
 	#include HASH_MAP_HEADER
 	#define HashMap HASH_NAMESPACE::hash_map
 #elif defined(__GNUC__)
@@ -43,8 +52,8 @@
 	#include <hash_map>
 	#define HashMap stdext::hash_map
 #else
-	#include <tr/unordered_map>
-	#define HashMap std::tr1::unordered_map;
+	#include <boost/unordered_map.hpp>
+	#define HashMap boost::unordered_map
 #endif
 
 #endif /* _PASSENGER_HASH_MAP_H_ */

data/ext/common/Utils/IOUtils.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2012 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -817,14 +817,14 @@ findDataPositionIndexAndOffset(struct iovec data[], size_t count,
 	*offset = 0;
 }
 
-ssize_t
-gatheredWrite(int fd, const StaticString *data, unsigned int dataCount, string &restBuffer) {
+static ssize_t
+realGatheredWrite(int fd, const StaticString *data, unsigned int dataCount, string &restBuffer,
+	struct iovec *iov)
+{
 	size_t totalSize, iovCount, i;
 	ssize_t ret;
 	
 	if (restBuffer.empty()) {
-		struct iovec iov[dataCount];
-		
 		totalSize = staticStringArrayToIoVec(data, dataCount, iov, iovCount);
 		if (totalSize == 0) {
 			errno = 0;
@@ -876,8 +876,6 @@ gatheredWrite(int fd, const StaticString *data, unsigned int dataCount, string &
 			return totalSize;
 		}
 	} else {
-		struct iovec iov[dataCount + 1];
-		
 		iov[0].iov_base = (char *) restBuffer.data();
 		iov[0].iov_len  = restBuffer.size();
 		totalSize = staticStringArrayToIoVec(data, dataCount, iov + 1, iovCount);
@@ -946,6 +944,18 @@ gatheredWrite(int fd, const StaticString *data, unsigned int dataCount, string &
 	}
 }
 
+ssize_t
+gatheredWrite(int fd, const StaticString *data, unsigned int dataCount, string &restBuffer) {
+	if (dataCount < 8) {
+		struct iovec iov[8];
+		return realGatheredWrite(fd, data, dataCount, restBuffer, iov);
+	} else {
+		vector<struct iovec> iov;
+		iov.reserve(dataCount + 1);
+		return realGatheredWrite(fd, data, dataCount, restBuffer, &iov[0]);
+	}
+}
+
 static size_t
 eraseBeginningOfIoVec(struct iovec *iov, size_t count, size_t index, size_t offset) {
 	size_t i, newCount;
@@ -961,9 +971,10 @@ eraseBeginningOfIoVec(struct iovec *iov, size_t count, size_t index, size_t offs
 	return newCount;
 }
 
-void
-gatheredWrite(int fd, const StaticString *data, unsigned int count, unsigned long long *timeout) {
-	struct iovec iov[count];
+static void
+realGatheredWrite(int fd, const StaticString *data, unsigned int count, unsigned long long *timeout,
+	struct iovec *iov)
+{
 	size_t total, iovCount;
 	size_t written = 0;
 	
@@ -988,6 +999,18 @@ gatheredWrite(int fd, const StaticString *data, unsigned int count, unsigned lon
 	assert(written == total);
 }
 
+void
+gatheredWrite(int fd, const StaticString *data, unsigned int count, unsigned long long *timeout) {
+	if (count <= 8) {
+		struct iovec iov[8];
+		realGatheredWrite(fd, data, count, timeout, iov);
+	} else {
+		vector<struct iovec> iov;
+		iov.reserve(count);
+		realGatheredWrite(fd, data, count, timeout, &iov[0]);
+	}
+}
+
 void
 setWritevFunction(WritevFunction func) {
 	if (func != NULL) {

data/ext/common/Utils/IniFile.h

@@ -165,7 +165,7 @@ public:
 		};
 	};
 
-	typedef shared_ptr<IniFileLexer::Token> TokenPtr;
+	typedef boost::shared_ptr<IniFileLexer::Token> TokenPtr;
 
 	
 
@@ -342,7 +342,7 @@ public:
 	TokenPtr peekToken() {
 		if (upcomingTokenPtrIsStale) {
 			Token upcomingToken = getToken();
-			upcomingTokenPtr = make_shared<Token>(upcomingToken);
+			upcomingTokenPtr = boost::make_shared<Token>(upcomingToken);
 			upcomingTokenPtrIsStale = false;
 		}
 	
@@ -396,7 +396,7 @@ public:
 	}
 };
 
-typedef shared_ptr<IniFileSection> IniFileSectionPtr;
+typedef boost::shared_ptr<IniFileSection> IniFileSectionPtr;
 
 
 class IniFile {

data/ext/common/Utils/Lock.h

@@ -12,10 +12,10 @@ typedef boost::lock_guard<boost::mutex> LockGuard;
 typedef boost::unique_lock<boost::mutex> ScopedLock;
 
 /** Nicer syntax for conditionally locking the mutex during construction. */
-class DynamicScopedLock: public unique_lock<boost::mutex> {
+class DynamicScopedLock: public boost::unique_lock<boost::mutex> {
 public:
 	DynamicScopedLock(boost::mutex &m, bool lockNow = true)
-		: unique_lock<boost::mutex>(m, defer_lock)
+		: boost::unique_lock<boost::mutex>(m, boost::defer_lock)
 	{
 		if (lockNow) {
 			lock();

data/ext/common/Utils/MessagePassing.h

@@ -62,8 +62,8 @@ using namespace boost;
  */
 class MessageBox;
 struct Message;
-typedef shared_ptr<MessageBox> MessageBoxPtr;
-typedef shared_ptr<Message> MessagePtr;
+typedef boost::shared_ptr<MessageBox> MessageBoxPtr;
+typedef boost::shared_ptr<Message> MessagePtr;
 
 inline void _sendToMessageBox(const MessageBoxPtr &messageBox, const MessagePtr &message);
 
@@ -71,7 +71,7 @@ inline void _sendToMessageBox(const MessageBoxPtr &messageBox, const MessagePtr
 struct Message {
 	string name;
 	VariantMap args;
-	weak_ptr<MessageBox> from;
+	boost::weak_ptr<MessageBox> from;
 	void *data;
 	void (*freeData)(void *p);
 
@@ -101,7 +101,7 @@ struct Message {
 	}
 
 	void setFrom(const MessageBoxPtr &messageBox) {
-		from = weak_ptr<MessageBox>(messageBox);
+		from = boost::weak_ptr<MessageBox>(messageBox);
 	}
 
 	void sendReply(const MessagePtr &message) {
@@ -117,13 +117,13 @@ struct Message {
 };
 
 
-class MessageBox: public enable_shared_from_this<MessageBox> {
+class MessageBox: public boost::enable_shared_from_this<MessageBox> {
 	typedef list<MessagePtr> MessageList;
 	typedef MessageList::iterator Iterator;
 	typedef MessageList::const_iterator ConstIterator;
 
 	mutable boost::mutex syncher;
-	condition_variable cond;
+	boost::condition_variable cond;
 	MessageList messages;
 
 	Iterator search(const string &name) {
@@ -163,7 +163,7 @@ class MessageBox: public enable_shared_from_this<MessageBox> {
 		return end;
 	}
 
-	bool checkTimeout(unique_lock<boost::mutex> &l, unsigned long long *timeout,
+	bool checkTimeout(boost::unique_lock<boost::mutex> &l, unsigned long long *timeout,
 		unsigned long long beginTime, posix_time::ptime deadline)
 	{
 		posix_time::time_duration diff = deadline -
@@ -209,7 +209,7 @@ public:
 	}
 
 	const MessagePtr peek(const string &name) const {
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		ConstIterator it = search(name);
 		if (it == messages.end()) {
 			return MessagePtr();
@@ -219,7 +219,7 @@ public:
 	}
 
 	MessagePtr recv(const string &name, unsigned long long *timeout = NULL) {
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		posix_time::ptime deadline;
 		unsigned long long beginTime = 0; // Shut up compiler warning.
 		if (timeout != NULL) {
@@ -258,7 +258,7 @@ public:
 
 	template<typename StringCollection>
 	MessagePtr recvAny(const StringCollection &names, unsigned long long *timeout = NULL) {
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		posix_time::ptime deadline;
 		unsigned long long beginTime = 0; // Shut up compiler warning.
 		if (timeout != NULL) {

data/ext/common/Utils/ProcessMetricsCollector.h

@@ -219,10 +219,8 @@ private:
 		*data = endOfWord;
 		return result;
 	}
-	
-	static long long readNextWordAsLongLong(const char **data) {
-		StaticString word = readNextWord(data);
-		char nullTerminatedWord[word.size() + 1];
+
+	static long long processNextWordAsLongLong(const StaticString &word, char *nullTerminatedWord) {
 		memcpy(nullTerminatedWord, word.c_str(), word.size());
 		nullTerminatedWord[word.size()] = '\0';
 		if (*nullTerminatedWord == '\0') {
@@ -232,9 +230,18 @@ private:
 		}
 	}
 	
-	static int readNextWordAsInt(const char **data) {
+	static long long readNextWordAsLongLong(const char **data) {
 		StaticString word = readNextWord(data);
-		char nullTerminatedWord[word.size() + 1];
+		if (word.size() < 50) {
+			char nullTerminatedWord[50];
+			return processNextWordAsLongLong(word, nullTerminatedWord);
+		} else {
+			string nullTerminatedWord(word.size() + 1, '\0');
+			return processNextWordAsLongLong(word, &nullTerminatedWord[0]);
+		}
+	}
+
+	static int processNextWordAsInt(const StaticString &word, char *nullTerminatedWord) {
 		memcpy(nullTerminatedWord, word.c_str(), word.size());
 		nullTerminatedWord[word.size()] = '\0';
 		if (*nullTerminatedWord == '\0') {
@@ -244,6 +251,17 @@ private:
 		}
 	}
 	
+	static int readNextWordAsInt(const char **data) {
+		StaticString word = readNextWord(data);
+		if (word.size() < 50) {
+			char nullTerminatedWord[50];
+			return processNextWordAsInt(word, nullTerminatedWord);
+		} else {
+			string nullTerminatedWord(word.size() + 1, '\0');
+			return processNextWordAsInt(word, &nullTerminatedWord[0]);
+		}
+	}
+	
 	string runCommandAndCaptureOutput(const char **command) const {
 		pid_t pid;
 		int e;

data/ext/common/Utils/ScopeGuard.h

@@ -50,13 +50,13 @@ using namespace oxt;
  */
 class ScopeGuard: public noncopyable {
 private:
-	function<void ()> func;
+	boost::function<void ()> func;
 	bool interruptable;
 	
 public:
 	ScopeGuard() { }
 	
-	ScopeGuard(const function<void ()> &func, bool interruptable = false) {
+	ScopeGuard(const boost::function<void ()> &func, bool interruptable = false) {
 		this->func = func;
 		this->interruptable = interruptable;
 	}
@@ -74,12 +74,12 @@ public:
 	}
 	
 	void clear() {
-		func = function<void()>();
+		func = boost::function<void()>();
 	}
 	
 	void runNow() {
-		function<void ()> oldFunc = func;
-		func = function<void()>();
+		boost::function<void ()> oldFunc = func;
+		func = boost::function<void()>();
 		if (interruptable) {
 			oldFunc();
 		} else {

data/ext/common/Utils/jsoncpp.cpp

@@ -203,6 +203,7 @@ uintToString( LargestUInt value,
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
+#include <string.h>
 
 #if _MSC_VER >= 1400 // VC++ 8.0
 #pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
@@ -3397,6 +3398,7 @@ Path::make( Value &root ) const
 #include <iostream>
 #include <sstream>
 #include <iomanip>
+#include <ios>
 
 #if _MSC_VER >= 1400 // VC++ 8.0
 #pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.

data/ext/common/agents/HelperAgent/FileBackedPipe.h

@@ -77,45 +77,45 @@ using namespace boost;
  * All FileBackedPipe methods may only be called from the event loop on which it
  * is installed.
  *
- * FileBackedPipe *must* be dynamically allocated and assigned to a shared_ptr.
+ * FileBackedPipe *must* be dynamically allocated and assigned to a boost::shared_ptr.
  */
-class FileBackedPipe: public enable_shared_from_this<FileBackedPipe> {
+class FileBackedPipe: public boost::enable_shared_from_this<FileBackedPipe> {
 public:
 	class ConsumeCallback {
 	private:
-		mutable weak_ptr<FileBackedPipe> wself;
+		mutable boost::weak_ptr<FileBackedPipe> wself;
 		unsigned int generation;
 
 	public:
 		ConsumeCallback() { }
 
-		ConsumeCallback(const shared_ptr<FileBackedPipe> &self, unsigned int _generation)
+		ConsumeCallback(const boost::shared_ptr<FileBackedPipe> &self, unsigned int _generation)
 			: wself(self),
 			  generation(_generation)
 			{ }
 
 		void operator()(size_t consumed, bool done) const {
-			shared_ptr<FileBackedPipe> self = wself.lock();
+			boost::shared_ptr<FileBackedPipe> self = wself.lock();
 			if (self != NULL) {
 				wself.reset();
 				self->dataConsumed(consumed, done, generation);
 			}
 		}
 
-		function<void (size_t, bool)> toFunction() const {
-			shared_ptr<FileBackedPipe> self = wself.lock();
+		boost::function<void (size_t, bool)> toFunction() const {
+			boost::shared_ptr<FileBackedPipe> self = wself.lock();
 			if (self != NULL) {
 				return boost::bind(&ConsumeCallback::operator(), this, _1, _2);
 			} else {
-				return function<void (size_t, bool)>();
+				return boost::function<void (size_t, bool)>();
 			}
 		}
 	};
 
-	typedef void (*DataCallback)(const shared_ptr<FileBackedPipe> &source, const char *data,
+	typedef void (*DataCallback)(const boost::shared_ptr<FileBackedPipe> &source, const char *data,
 		size_t size, const ConsumeCallback &consumed);
-	typedef void (*ErrorCallback)(const shared_ptr<FileBackedPipe> &source, int errorCode);
-	typedef void (*Callback)(const shared_ptr<FileBackedPipe> &source);
+	typedef void (*ErrorCallback)(const boost::shared_ptr<FileBackedPipe> &source, int errorCode);
+	typedef void (*Callback)(const boost::shared_ptr<FileBackedPipe> &source);
 
 	enum DataState {
 		IN_MEMORY,
@@ -124,9 +124,9 @@ public:
 	};
 
 private:
-	typedef function<void (int err, const char *data, size_t size)> EioReadCallback;
+	typedef boost::function<void (int err, const char *data, size_t size)> EioReadCallback;
 
-	// We already have a shared_ptr reference to libev through MultiLibeio.
+	// We already have a boost::shared_ptr reference to libev through MultiLibeio.
 	const string dir;
 	size_t threshold;
 
@@ -271,7 +271,7 @@ private:
 				libeio.open(filename.str().c_str(), O_CREAT | O_RDWR | O_TRUNC, 0, 0,
 					boost::bind(&FileBackedPipe::openCallback, this,
 						_1, filename.str(), generation,
-						weak_ptr<FileBackedPipe>(shared_from_this())
+						boost::weak_ptr<FileBackedPipe>(shared_from_this())
 					)
 				);
 			}
@@ -302,7 +302,7 @@ private:
 					&FileBackedPipe::writeBufferToFileCallback, this,
 					_1, file.fd, buffer, file.writeBuffer.size(),
 					generation,
-					weak_ptr<FileBackedPipe>(shared_from_this())
+					boost::weak_ptr<FileBackedPipe>(shared_from_this())
 				)
 			);
 		}
@@ -310,9 +310,9 @@ private:
 
 	void writeBufferToFileCallback(eio_req req, FileDescriptor fd,
 		shared_array<char> buffer, size_t size,
-		unsigned int generation, weak_ptr<FileBackedPipe> wself)
+		unsigned int generation, boost::weak_ptr<FileBackedPipe> wself)
 	{
-		shared_ptr<FileBackedPipe> self = wself.lock();
+		boost::shared_ptr<FileBackedPipe> self = wself.lock();
 		if (self == NULL || EIO_CANCELLED(&req) || generation != self->generation) {
 			return;
 		}
@@ -333,9 +333,9 @@ private:
 	}
 
 	void openCallback(eio_req req, string filename, unsigned int generation,
-		weak_ptr<FileBackedPipe> &wself)
+		boost::weak_ptr<FileBackedPipe> &wself)
 	{
-		shared_ptr<FileBackedPipe> self = wself.lock();
+		boost::shared_ptr<FileBackedPipe> self = wself.lock();
 		if (self == NULL || EIO_CANCELLED(&req) || generation != self->generation) {
 			if (req.result != -1 || EIO_CANCELLED(&req)) {
 				eio_close(req.result, 0, successCallback, NULL);
@@ -354,7 +354,7 @@ private:
 			} else {
 				getLibev()->runAfter(openTimeout,
 					boost::bind(&FileBackedPipe::finalizeOpenFileAfterTimeout, this,
-						weak_ptr<FileBackedPipe>(shared_from_this()),
+						boost::weak_ptr<FileBackedPipe>(shared_from_this()),
 						generation, FileDescriptor(req.result)));
 			}
 		}
@@ -366,10 +366,10 @@ private:
 		writeBufferToFile();
 	}
 
-	void finalizeOpenFileAfterTimeout(weak_ptr<FileBackedPipe> wself,
+	void finalizeOpenFileAfterTimeout(boost::weak_ptr<FileBackedPipe> wself,
 		unsigned int generation, FileDescriptor fd)
 	{
-		shared_ptr<FileBackedPipe> self = wself.lock();
+		boost::shared_ptr<FileBackedPipe> self = wself.lock();
 		if (self != NULL || generation != self->generation) {
 			self->finalizeOpenFile(fd);
 		}
@@ -390,7 +390,7 @@ private:
 				boost::bind(
 					&FileBackedPipe::readCallback, this,
 					_1, file.fd, buffer, callback, generation,
-					weak_ptr<FileBackedPipe>(shared_from_this())
+					boost::weak_ptr<FileBackedPipe>(shared_from_this())
 				)
 			);
 			if (req == NULL) {
@@ -400,9 +400,9 @@ private:
 	}
 
 	void readCallback(eio_req req, FileDescriptor fd, shared_array<char> buffer,
-		EioReadCallback callback, unsigned int generation, weak_ptr<FileBackedPipe> wself)
+		EioReadCallback callback, unsigned int generation, boost::weak_ptr<FileBackedPipe> wself)
 	{
-		shared_ptr<FileBackedPipe> self = wself.lock();
+		boost::shared_ptr<FileBackedPipe> self = wself.lock();
 		if (self == NULL || EIO_CANCELLED(&req) || generation != self->generation) {
 			return;
 		}
@@ -724,7 +724,7 @@ public:
 	}
 };
 
-typedef shared_ptr<FileBackedPipe> FileBackedPipePtr;
+typedef boost::shared_ptr<FileBackedPipe> FileBackedPipePtr;
 
 
 } // namespace Passenger