passenger 4.0.20 → 4.0.21

data/ext/common/EventedBufferedInput.h

@@ -62,7 +62,7 @@ using namespace oxt;
  * tick.
  */
 template<size_t bufferSize = 1024 * 8>
-class EventedBufferedInput: public enable_shared_from_this< EventedBufferedInput<bufferSize> > {
+class EventedBufferedInput: public boost::enable_shared_from_this< EventedBufferedInput<bufferSize> > {
 private:
 	enum State {
 		LIVE,
@@ -141,7 +141,7 @@ private:
 
 	void onReadable(ev::io &watcher, int revents) {
 		// Keep 'this' alive until function exit.
-		shared_ptr< EventedBufferedInput<bufferSize> > self = EventedBufferedInput<bufferSize>::shared_from_this();
+		boost::shared_ptr< EventedBufferedInput<bufferSize> > self = EventedBufferedInput<bufferSize>::shared_from_this();
 
 		EBI_TRACE("onReadable");
 		verifyInvariants();
@@ -201,16 +201,16 @@ private:
 			nextTickInstalled = true;
 			libev->runLater(boost::bind(
 				realProcessBufferInNextTick,
-				weak_ptr< EventedBufferedInput<bufferSize> >(this->shared_from_this()),
+				boost::weak_ptr< EventedBufferedInput<bufferSize> >(this->shared_from_this()),
 				generation
 			));
 		}
 	}
 
-	static void realProcessBufferInNextTick(weak_ptr< EventedBufferedInput<bufferSize> > wself,
+	static void realProcessBufferInNextTick(boost::weak_ptr< EventedBufferedInput<bufferSize> > wself,
 		unsigned int generation)
 	{
-		shared_ptr< EventedBufferedInput<bufferSize> > self = wself.lock();
+		boost::shared_ptr< EventedBufferedInput<bufferSize> > self = wself.lock();
 		if (self != NULL && generation == self->generation) {
 			self->verifyInvariants();
 			self->nextTickInstalled = false;
@@ -322,8 +322,8 @@ protected:
 	}
 
 public:
-	typedef size_t (*DataCallback)(const shared_ptr< EventedBufferedInput<bufferSize> > &source, const StaticString &data);
-	typedef void (*ErrorCallback)(const shared_ptr< EventedBufferedInput<bufferSize> > &source, const char *message, int errnoCode);
+	typedef size_t (*DataCallback)(const boost::shared_ptr< EventedBufferedInput<bufferSize> > &source, const StaticString &data);
+	typedef void (*ErrorCallback)(const boost::shared_ptr< EventedBufferedInput<bufferSize> > &source, const char *message, int errnoCode);
 
 	DataCallback onData;
 	ErrorCallback onError;
@@ -451,7 +451,7 @@ public:
 	}
 };
 
-typedef shared_ptr< EventedBufferedInput<> > EventedBufferedInputPtr;
+typedef boost::shared_ptr< EventedBufferedInput<> > EventedBufferedInputPtr;
 
 } // namespace Passenger
 

data/ext/common/Exceptions.cpp

@@ -0,0 +1,71 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+#include <Exceptions.h>
+#include <cstdlib>
+#include <string.h>
+
+
+void
+pp_error_init(PP_Error *error) {
+	error->message = NULL;
+	error->errnoCode = PP_NO_ERRNO;
+	error->messageIsStatic = 0;
+}
+
+void
+pp_error_destroy(PP_Error *error) {
+	if (!error->messageIsStatic) {
+		free(static_cast<void *>(const_cast<char *>(error->message)));
+		error->message = NULL;
+		error->messageIsStatic = 0;
+	}
+}
+
+void
+pp_error_set(const std::exception &ex, PP_Error *error) {
+	const Passenger::SystemException *sys_e;
+
+	if (error == NULL) {
+		return;
+	}
+
+	if (error->message != NULL && !error->messageIsStatic) {
+		free(static_cast<void *>(const_cast<char *>(error->message)));
+	}
+
+	error->message = strdup(ex.what());
+	error->messageIsStatic = error->message == NULL;
+	if (error->message == NULL) {
+		error->message = "Unknown error message (unable to allocate memory for the message)";
+	}
+
+	sys_e = dynamic_cast<const Passenger::SystemException *>(&ex);
+	if (sys_e != NULL) {
+		error->errnoCode = sys_e->code();
+	} else {
+		error->errnoCode = PP_NO_ERRNO;
+	}
+}

data/ext/common/Exceptions.h

@@ -25,13 +25,60 @@
 #ifndef _PASSENGER_EXCEPTIONS_H_
 #define _PASSENGER_EXCEPTIONS_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Provides helper structs and functions for translating C++ exceptions
+ * into C error objects.
+ */
+
+#define PP_NO_ERRNO -1
+
+struct PP_Error {
+	/** The exception message. */
+	const char *message;
+	/** If the original exception was a SystemException, then this
+	 * field is set to the corresponding errno value. Otherwise, it
+	 * is set to PP_NO_ERRNO.
+	 */
+	int errnoCode;
+	int messageIsStatic: 1;
+};
+
+typedef struct PP_Error PP_Error;
+
+void pp_error_init(PP_Error *error);
+void pp_error_destroy(PP_Error *error);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#ifdef __cplusplus
+
 #include <oxt/tracable_exception.hpp>
 #include <string>
 #include <map>
+#include <exception>
 #include <sstream>
 #include <cstring>
 #include <cassert>
 
+
+/**
+ * Use as follows:
+ *
+ *     try {
+ *         ...
+ *     } catch (const std::exception &e) {
+ *         pp_error_set(e, error);
+ *     }
+ */
+void pp_error_set(const std::exception &ex, PP_Error *error);
+
+
 /**
  * @defgroup Exceptions Exceptions
  */
@@ -199,16 +246,24 @@ public:
 
 /**
  * Thrown when SpawnManager or ApplicationPool fails to spawn an application
- * instance. The exception may contain an error page, which is a user-friendly
- * HTML page with details about the error.
+ * instance. The exception may contain an error page. This error page contains
+ * detailed information about the error and may be in HTML format. The error
+ * page always contains enough information so that showing `what()` is not
+ * necessary.
  */
 class SpawnException: public oxt::tracable_exception {
 public:
 	enum ErrorKind {
 		UNDEFINED_ERROR,
+		/** The preloader failed to start, not due to a wrong protocol message. */
+		PRELOADER_STARTUP_ERROR,
+		/** The preloader sent a wrong protocol message during startup. */
 		PRELOADER_STARTUP_PROTOCOL_ERROR,
 		PRELOADER_STARTUP_TIMEOUT,
 		PRELOADER_STARTUP_EXPLAINABLE_ERROR,
+		/** The application failed to start, not due to a wrong protocol message. */
+		APP_STARTUP_ERROR,
+		/** The application sent a wrong protocol message during startup. */
 		APP_STARTUP_PROTOCOL_ERROR,
 		APP_STARTUP_TIMEOUT,
 		APP_STARTUP_EXPLAINABLE_ERROR
@@ -236,10 +291,6 @@ public:
 		bool isHTML = true, ErrorKind errorKind = UNDEFINED_ERROR)
 		: msg(message), m_errorPage(errorPage)
 	{
-		assert(!isHTML
-			|| errorKind == UNDEFINED_ERROR
-			|| errorKind == PRELOADER_STARTUP_EXPLAINABLE_ERROR
-			|| errorKind == APP_STARTUP_EXPLAINABLE_ERROR);
 		this->errorKind = errorKind;
 		m_hasErrorPage = true;
 		m_isHTML = isHTML;
@@ -250,7 +301,7 @@ public:
 	virtual const char *what() const throw() {
 		return msg.c_str();
 	}
-	
+
 	bool hasErrorPage() const {
 		return m_hasErrorPage;
 	}
@@ -452,4 +503,6 @@ public:
 
 } // namespace Passenger
 
+#endif /* __cplusplus */
+
 #endif /* _PASSENGER_EXCEPTIONS_H_ */

data/ext/common/FileDescriptor.h

@@ -96,7 +96,7 @@ private:
 	};
 
 	/** Shared pointer for reference counting on this file descriptor */
-	shared_ptr<SharedData> data;
+	boost::shared_ptr<SharedData> data;
 
 public:
 	/** 
@@ -123,7 +123,7 @@ public:
 			 *    }
 			 */
 			int e = errno;
-			data = make_shared<SharedData>(fd, autoClose);
+			data = boost::make_shared<SharedData>(fd, autoClose);
 			errno = e;
 		}
 	}
@@ -193,7 +193,7 @@ public:
 		 */
 		int e = errno;
 		if (fd >= 0) {
-			data = make_shared<SharedData>(fd, true);
+			data = boost::make_shared<SharedData>(fd, true);
 		} else {
 			data.reset();
 		}
@@ -203,7 +203,7 @@ public:
 	
 	FileDescriptor &operator=(const FileDescriptor &other) {
 		/* Make sure that the 'delete' operator implicitly invoked by
-		 * shared_ptr doesn't overwrite errno so that we can write code
+		 * boost::shared_ptr doesn't overwrite errno so that we can write code
 		 * like this:
 		 *
 		 *    FileDescriptor fd;

data/ext/common/MessageClient.h

@@ -293,7 +293,7 @@ public:
 	}
 };
 
-typedef shared_ptr<MessageClient> MessageClientPtr;
+typedef boost::shared_ptr<MessageClient> MessageClientPtr;
 
 } // namespace Passenger
 

data/ext/common/MessageServer.h

@@ -127,7 +127,7 @@ using namespace oxt;
  *       };
  *       
  *       MessageServer::ClientContextPtr newClient(MessageServer::CommonClientContext &commonContext) {
- *           return make_shared<MyContext>();
+ *           return boost::make_shared<MyContext>();
  *       }
  *       
  *       bool processMessage(MessageServer::CommonClientContext &commonContext,
@@ -165,7 +165,7 @@ public:
 		virtual ~ClientContext() { }
 	};
 	
-	typedef shared_ptr<ClientContext> ClientContextPtr;
+	typedef boost::shared_ptr<ClientContext> ClientContextPtr;
 	
 	/**
 	 * A common client context, containing client-specific information
@@ -295,7 +295,7 @@ public:
 		                            const vector<string> &args) = 0;
 	};
 	
-	typedef shared_ptr<Handler> HandlerPtr;
+	typedef boost::shared_ptr<Handler> HandlerPtr;
 	
 protected:
 	/** The filename of the server socket on which this MessageServer is listening. */
@@ -565,7 +565,7 @@ public:
 			this_thread::disable_interruption di;
 			this_thread::disable_syscall_interruption dsi;
 			
-			function<void ()> func(boost::bind(&MessageServer::clientHandlingMainLoop,
+			boost::function<void ()> func(boost::bind(&MessageServer::clientHandlingMainLoop,
 				this, fd));
 			string name = "MessageServer client thread ";
 			name.append(toString(fd));
@@ -595,7 +595,7 @@ public:
 	}
 };
 
-typedef shared_ptr<MessageServer> MessageServerPtr;
+typedef boost::shared_ptr<MessageServer> MessageServerPtr;
 
 } // namespace Passenger
 

data/ext/common/MultiLibeio.cpp

@@ -41,7 +41,7 @@ namespace Passenger {
 using namespace oxt;
 
 static boost::mutex syncher;
-static condition_variable cond;
+static boost::condition_variable cond;
 static bool shouldPoll = false;
 static oxt::thread *thr = NULL;
 static bool quit = false;
@@ -73,7 +73,7 @@ struct CustomData: public Data {
 
 static void
 threadMain() {
-	unique_lock<boost::mutex> l(syncher);
+	boost::unique_lock<boost::mutex> l(syncher);
 	while (!quit) {
 		while (!shouldPoll && !quit) {
 			cond.wait(l);
@@ -132,7 +132,7 @@ MultiLibeio::init() {
 
 void
 MultiLibeio::shutdown() {
-	unique_lock<boost::mutex> l(syncher);
+	boost::unique_lock<boost::mutex> l(syncher);
 	quit = true;
 	cond.notify_one();
 	l.unlock();

data/ext/common/MultiLibeio.h

@@ -39,8 +39,8 @@ private:
 	SafeLibevPtr libev;
 
 public:
-	typedef function<void (eio_req *req)> ExecuteCallback;
-	typedef function<void (eio_req req)> Callback;
+	typedef boost::function<void (eio_req *req)> ExecuteCallback;
+	typedef boost::function<void (eio_req req)> Callback;
 
 	static void init();
 	static void shutdown();

data/ext/common/RandomGenerator.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.
  *
@@ -99,15 +99,15 @@ public:
 	}
 	
 	string generateByteString(unsigned int size) {
-		char buf[size];
-		generateBytes(buf, size);
-		return string(buf, size);
+		string result(size, '\0');
+		generateBytes(&result[0], size);
+		return result;
 	}
 	
 	string generateHexString(unsigned int size) {
-		char buf[size];
-		generateBytes(buf, size);
-		return toHex(StaticString(buf, size));
+		string buf(size, '\0');
+		generateBytes(&buf[0], size);
+		return toHex(buf);
 	}
 	
 	/**
@@ -122,9 +122,9 @@ public:
 	 * more possibilities than 2**N.
 	 */
 	string generateAsciiString(unsigned int size) {
-		char buf[size];
-		generateAsciiString(buf, size);
-		return string(buf, size);
+		string result(size, '\0');
+		generateAsciiString(&result[0], size);
+		return result;
 	}
 	
 	void generateAsciiString(char *_buf, unsigned int size) {
@@ -153,7 +153,7 @@ public:
 	}
 };
 
-typedef shared_ptr<RandomGenerator> RandomGeneratorPtr;
+typedef boost::shared_ptr<RandomGenerator> RandomGeneratorPtr;
 
 } // namespace Passenger
 

data/ext/common/ResourceLocator.h

@@ -52,6 +52,7 @@ private:
 	string resourcesDir;
 	string docDir;
 	string rubyLibDir;
+	string nodeLibDir;
 	
 	static string getOption(const string &file, const IniFileSectionPtr &section, const string &key) {
 		if (section->hasKey(key)) {
@@ -73,6 +74,7 @@ public:
 			resourcesDir        = getOption(file, options, "resources_dir");
 			docDir              = getOption(file, options, "doc_dir");
 			rubyLibDir          = getOption(file, options, "ruby_libdir");
+			nodeLibDir          = getOption(file, options, "node_libdir");
 		} else {
 			string root = rootOrFile;
 			binDir              = root + "/bin";
@@ -81,6 +83,7 @@ public:
 			resourcesDir        = root + "/resources";
 			docDir              = root + "/doc";
 			rubyLibDir          = root + "/lib";
+			nodeLibDir          = root + "/node_lib";
 		}
 	}
 	
@@ -108,9 +111,13 @@ public:
 	string getRubyLibDir() const {
 		return rubyLibDir;
 	}
+
+	string getNodeLibDir() const {
+		return nodeLibDir;
+	}
 };
 
-typedef shared_ptr<ResourceLocator> ResourceLocatorPtr;
+typedef boost::shared_ptr<ResourceLocator> ResourceLocatorPtr;
 
 
 }