passenger 4.0.20 → 4.0.21

data/ext/common/SafeLibev.h

@@ -46,7 +46,7 @@ using namespace boost;
  */
 class SafeLibev {
 private:
-	typedef function<void ()> Callback;
+	typedef boost::function<void ()> Callback;
 
 	struct Command {
 		int id;
@@ -63,7 +63,7 @@ private:
 	ev_async async;
 	
 	boost::mutex syncher;
-	condition_variable cond;
+	boost::condition_variable cond;
 	vector<Command> commands;
 	unsigned int nextCommandId;
 	
@@ -78,7 +78,7 @@ private:
 	}
 
 	void runCommands() {
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		vector<Command> commands = this->commands;
 		this->commands.clear();
 		l.unlock();
@@ -93,7 +93,7 @@ private:
 	void startWatcherAndNotify(Watcher *watcher, bool *done) {
 		watcher->set(loop);
 		watcher->start();
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		*done = true;
 		cond.notify_all();
 	}
@@ -101,14 +101,14 @@ private:
 	template<typename Watcher>
 	void stopWatcherAndNotify(Watcher *watcher, bool *done) {
 		watcher->stop();
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		*done = true;
 		cond.notify_all();
 	}
 	
 	void runAndNotify(const Callback *callback, bool *done) {
 		(*callback)();
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		*done = true;
 		cond.notify_all();
 	}
@@ -161,7 +161,7 @@ public:
 			watcher.set(loop);
 			watcher.start();
 		} else {
-			unique_lock<boost::mutex> l(syncher);
+			boost::unique_lock<boost::mutex> l(syncher);
 			bool done = false;
 			commands.push_back(Command(nextCommandId,
 				boost::bind(&SafeLibev::startWatcherAndNotify<Watcher>,
@@ -179,7 +179,7 @@ public:
 		if (pthread_equal(pthread_self(), loopThread)) {
 			watcher.stop();
 		} else {
-			unique_lock<boost::mutex> l(syncher);
+			boost::unique_lock<boost::mutex> l(syncher);
 			bool done = false;
 			commands.push_back(Command(nextCommandId,
 				boost::bind(&SafeLibev::stopWatcherAndNotify<Watcher>,
@@ -203,7 +203,7 @@ public:
 
 	void runSync(const Callback &callback) {
 		assert(callback != NULL);
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		bool done = false;
 		commands.push_back(Command(nextCommandId,
 			boost::bind(&SafeLibev::runAndNotify, this,
@@ -235,7 +235,7 @@ public:
 		assert(callback != NULL);
 		unsigned int result;
 		{
-			unique_lock<boost::mutex> l(syncher);
+			boost::unique_lock<boost::mutex> l(syncher);
 			commands.push_back(Command(nextCommandId, callback));
 			result = nextCommandId;
 			incNextCommandId();
@@ -252,7 +252,7 @@ public:
 	 * been called or is currently being called.
 	 */
 	bool cancelCommand(int id) {
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		// TODO: we can do a binary search because the command ID
 		// is monotically increasing except on overflow.
 		vector<Command>::iterator it, end = commands.end();
@@ -266,7 +266,7 @@ public:
 	}
 };
 
-typedef shared_ptr<SafeLibev> SafeLibevPtr;
+typedef boost::shared_ptr<SafeLibev> SafeLibevPtr;
 
 
 } // namespace Passenger

data/ext/common/ServerInstanceDir.h

@@ -174,6 +174,10 @@ public:
 	
 	public:
 		~Generation() {
+			destroy();
+		}
+
+		void destroy() {
 			if (owner) {
 				removeDirTree(path);
 			}
@@ -194,7 +198,7 @@ public:
 		}
 	};
 	
-	typedef shared_ptr<Generation> GenerationPtr;
+	typedef boost::shared_ptr<Generation> GenerationPtr;
 	
 private:
 	string path;
@@ -315,6 +319,10 @@ public:
 	}
 	
 	~ServerInstanceDir() {
+		destroy();
+	}
+
+	void destroy() {
 		if (owner) {
 			GenerationPtr newestGeneration;
 			try {
@@ -361,7 +369,7 @@ public:
 	}
 	
 	GenerationPtr getGeneration(unsigned int number) const {
-		// Must not used make_shared() here because Watchdog.cpp
+		// Must not used boost::make_shared() here because Watchdog.cpp
 		// deletes the raw pointer in cleanupAgentsInBackground().
 		return ptr(new Generation(path, number));
 	}
@@ -396,7 +404,7 @@ public:
 	}
 };
 
-typedef shared_ptr<ServerInstanceDir> ServerInstanceDirPtr;
+typedef boost::shared_ptr<ServerInstanceDir> ServerInstanceDirPtr;
 
 } // namespace Passenger
 

data/ext/common/UnionStation.h

@@ -138,7 +138,7 @@ struct Connection {
 	}
 };
 
-typedef shared_ptr<Connection> ConnectionPtr;
+typedef boost::shared_ptr<Connection> ConnectionPtr;
 
 
 /** A special lock type for Connection that also keeps a smart
@@ -217,7 +217,7 @@ enum ExceptionHandlingMode {
 
 
 class LoggerFactory;
-typedef shared_ptr<LoggerFactory> LoggerFactoryPtr;
+typedef boost::shared_ptr<LoggerFactory> LoggerFactoryPtr;
 
 inline void _checkinConnection(const LoggerFactoryPtr &loggerFactory, const ConnectionPtr &connection);
 
@@ -426,7 +426,7 @@ public:
 	}
 };
 
-typedef shared_ptr<Logger> LoggerPtr;
+typedef boost::shared_ptr<Logger> LoggerPtr;
 
 
 class ScopeLog: public noncopyable {
@@ -551,7 +551,7 @@ public:
 };
 
 
-class LoggerFactory: public enable_shared_from_this<LoggerFactory> {
+class LoggerFactory: public boost::enable_shared_from_this<LoggerFactory> {
 private:
 	static const unsigned int CONNECTION_POOL_MAX_SIZE = 10;
 
@@ -637,12 +637,12 @@ private:
 		}
 		
 		guard.clear();
-		return make_shared<Connection>(fd);
+		return boost::make_shared<Connection>(fd);
 	}
 	
 public:
 	LoggerFactory() {
-		nullLogger = make_shared<Logger>();
+		nullLogger = boost::make_shared<Logger>();
 	}
 	
 	LoggerFactory(const string &_serverAddress, const string &_username,
@@ -652,7 +652,7 @@ public:
 		  password(_password),
 		  nodeName(determineNodeName(_nodeName))
 	{
-		nullLogger = make_shared<Logger>();
+		nullLogger = boost::make_shared<Logger>();
 		if (!_serverAddress.empty() && isLocalSocketAddress(_serverAddress)) {
 			maxConnectTries = 10;
 		} else {
@@ -664,7 +664,7 @@ public:
 
 	ConnectionPtr checkoutConnection() {
 		TRACE_POINT();
-		unique_lock<boost::mutex> l(syncher);
+		boost::unique_lock<boost::mutex> l(syncher);
 		if (!connectionPool.empty()) {
 			P_TRACE(3, "Checked out existing connection");
 			ConnectionPtr connection = connectionPool.back();
@@ -808,7 +808,7 @@ public:
 			}
 			
 			guard.clear();
-			return make_shared<Logger>(shared_from_this(),
+			return boost::make_shared<Logger>(shared_from_this(),
 				connection,
 				string(txnId, end - txnId),
 				groupName, category,
@@ -881,7 +881,7 @@ public:
 				"true",
 				NULL);
 			guard.clear();
-			return make_shared<Logger>(shared_from_this(),
+			return boost::make_shared<Logger>(shared_from_this(),
 				connection,
 				txnId, groupName, category,
 				unionStationKey);

data/ext/common/Utils.cpp

@@ -40,6 +40,7 @@
 #include <dirent.h>
 #include <limits.h>
 #include <unistd.h>
+#include <string.h>
 #include <signal.h>
 #ifdef __linux__
 	#include <sys/syscall.h>
@@ -413,17 +414,13 @@ getGroupName(gid_t gid) {
 }
 
 gid_t
-lookupGid(const StaticString &groupName) {
+lookupGid(const string &groupName) {
 	struct group *groupEntry;
-	char name[groupName.size() + 1];
 
-	memcpy(name, groupName.data(), groupName.size());
-	name[groupName.size()] = '\0';
-
-	groupEntry = getgrnam(name);
+	groupEntry = getgrnam(groupName.c_str());
 	if (groupEntry == NULL) {
 		if (looksLikePositiveNumber(groupName)) {
-			return atoi(name);
+			return atoi(groupName);
 		} else {
 			return (gid_t) -1;
 		}
@@ -826,7 +823,7 @@ prestartWebApps(const ResourceLocator &locator, const string &ruby,
 }
 
 void
-runAndPrintExceptions(const function<void ()> &func, bool toAbort) {
+runAndPrintExceptions(const boost::function<void ()> &func, bool toAbort) {
 	try {
 		func();
 	} catch (const boost::thread_interrupted &) {
@@ -840,7 +837,7 @@ runAndPrintExceptions(const function<void ()> &func, bool toAbort) {
 }
 
 void
-runAndPrintExceptions(const function<void ()> &func) {
+runAndPrintExceptions(const boost::function<void ()> &func) {
 	runAndPrintExceptions(func, true);
 }
 
@@ -851,10 +848,11 @@ getHostName() {
 		// https://bugzilla.redhat.com/show_bug.cgi?id=130733
 		hostNameMax = 255;
 	}
-	char hostname[hostNameMax + 1];
-	if (gethostname(hostname, hostNameMax) == 0) {
-		hostname[hostNameMax] = '\0';
-		return hostname;
+
+	string buf(hostNameMax + 1, '\0');
+	if (gethostname(&buf[0], hostNameMax + 1) == 0) {
+		buf[hostNameMax] = '\0';
+		return string(buf.c_str());
 	} else {
 		int e = errno;
 		throw SystemException("Unable to query the system's host name", e);

data/ext/common/Utils.h

@@ -73,23 +73,23 @@ typedef enum {
  * Convenience shortcut for creating a <tt>shared_ptr</tt>.
  * Instead of:
  * @code
- *    shared_ptr<Foo> foo;
+ *    boost::shared_ptr<Foo> foo;
  *    ...
- *    foo = shared_ptr<Foo>(new Foo());
+ *    foo = boost::shared_ptr<Foo>(new Foo());
  * @endcode
  * one can write:
  * @code
- *    shared_ptr<Foo> foo;
+ *    boost::shared_ptr<Foo> foo;
  *    ...
  *    foo = ptr(new Foo());
  * @endcode
  *
- * @param pointer The item to put in the shared_ptr object.
+ * @param pointer The item to put in the boost::shared_ptr object.
  * @ingroup Support
  */
-template<typename T> shared_ptr<T>
+template<typename T> boost::shared_ptr<T>
 ptr(T *pointer) {
-	return shared_ptr<T>(pointer);
+	return boost::shared_ptr<T>(pointer);
 }
 
 /**
@@ -222,7 +222,7 @@ string getGroupName(gid_t gid);
  *
  * Returns `(gid_t) -1` if the lookup fails.
  */
-gid_t lookupGid(const StaticString &groupName);
+gid_t lookupGid(const string &groupName);
 
 /**
  * Converts a mode string into a mode_t value.
@@ -388,8 +388,8 @@ void prestartWebApps(const ResourceLocator &locator, const string &ruby,
  * otherwise the exception is swallowed.
  * thread_interrupted and all other exceptions are silently propagated.
  */
-void runAndPrintExceptions(const function<void ()> &func, bool toAbort);
-void runAndPrintExceptions(const function<void ()> &func);
+void runAndPrintExceptions(const boost::function<void ()> &func, bool toAbort);
+void runAndPrintExceptions(const boost::function<void ()> &func);
 
 /**
  * Returns the system's host name.

data/ext/common/Utils/BlockingQueue.h

@@ -37,9 +37,9 @@ using namespace boost;
 template<typename T>
 class BlockingQueue {
 private:
-	mutable timed_mutex lock;
-	condition_variable_any added;
-	condition_variable_any removed;
+	mutable boost::timed_mutex lock;
+	boost::condition_variable_any added;
+	boost::condition_variable_any removed;
 	unsigned int max;
 	std::queue<T> queue;
 	
@@ -53,12 +53,12 @@ public:
 	}
 	
 	unsigned int size() const {
-		boost::lock_guard<timed_mutex> l(lock);
+		boost::lock_guard<boost::timed_mutex> l(lock);
 		return queue.size();
 	}
 	
 	void add(const T &item) {
-		unique_lock<timed_mutex> l(lock);
+		boost::unique_lock<boost::timed_mutex> l(lock);
 		while (atMaxCapacity()) {
 			removed.wait(l);
 		}
@@ -70,7 +70,7 @@ public:
 	}
 	
 	bool tryAdd(const T &item) {
-		boost::lock_guard<timed_mutex> l(lock);
+		boost::lock_guard<boost::timed_mutex> l(lock);
 		if (!atMaxCapacity()) {
 			queue.push(item);
 			added.notify_one();
@@ -84,7 +84,7 @@ public:
 	}
 	
 	T get() {
-		unique_lock<timed_mutex> l(lock);
+		boost::unique_lock<boost::timed_mutex> l(lock);
 		while (queue.empty()) {
 			added.wait(l);
 		}
@@ -98,7 +98,7 @@ public:
 	}
 	
 	bool timedGet(T &output, unsigned int timeout) {
-		unique_lock<timed_mutex> l(lock);
+		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;
@@ -127,7 +127,7 @@ public:
 	}
 	
 	bool tryGet(T &output) {
-		unique_lock<timed_mutex> l(lock);
+		boost::unique_lock<boost::timed_mutex> l(lock);
 		if (queue.empty()) {
 			return false;
 		} else {
@@ -142,7 +142,7 @@ public:
 	}
 	
 	T peek() {
-		unique_lock<timed_mutex> l(lock);
+		boost::unique_lock<boost::timed_mutex> l(lock);
 		while (queue.empty()) {
 			added.wait(l);
 		}

data/ext/common/Utils/BufferedIO.h

@@ -72,7 +72,7 @@ private:
 	}
 	
 public:
-	typedef function< pair<unsigned int, bool>(const char *data, unsigned int size) > AcceptFunction;
+	typedef boost::function< pair<unsigned int, bool>(const char *data, unsigned int size) > AcceptFunction;
 	
 	BufferedIO() { }
 	

data/ext/common/Utils/CachedFileStat.hpp

@@ -141,7 +141,7 @@ public:
 		}
 	};
 	
-	typedef shared_ptr<Entry> EntryPtr;
+	typedef boost::shared_ptr<Entry> EntryPtr;
 	typedef list<EntryPtr> EntryList;
 	typedef StringMap<EntryList::iterator> EntryMap;
 	
@@ -196,7 +196,7 @@ public:
 			}
 			
 			// Add to cache as most recently used.
-			entry = make_shared<Entry>(filename);
+			entry = boost::make_shared<Entry>(filename);
 			entries.push_front(entry);
 			cache.set(filename, entries.begin());
 		} else {

data/ext/common/Utils/FileChangeChecker.h

@@ -67,7 +67,7 @@ private:
 		}
 	};
 	
-	typedef shared_ptr<Entry> EntryPtr;
+	typedef boost::shared_ptr<Entry> EntryPtr;
 	typedef list<EntryPtr> EntryList;
 	typedef map<string, EntryList::iterator> EntryMap;