passenger 4.0.20 → 4.0.21

data/ext/boost/unordered/unordered_set_fwd.hpp

@@ -0,0 +1,63 @@
+
+// Copyright (C) 2008-2011 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNORDERED_SET_FWD_HPP_INCLUDED
+#define BOOST_UNORDERED_SET_FWD_HPP_INCLUDED
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/config.hpp>
+#include <memory>
+#include <functional>
+#include <boost/functional/hash_fwd.hpp>
+#include <boost/unordered/detail/fwd.hpp>
+
+namespace boost
+{
+    namespace unordered
+    {
+        template <class T,
+            class H = boost::hash<T>,
+            class P = std::equal_to<T>,
+            class A = std::allocator<T> >
+        class unordered_set;
+
+        template <class T, class H, class P, class A>
+        inline bool operator==(unordered_set<T, H, P, A> const&,
+            unordered_set<T, H, P, A> const&);
+        template <class T, class H, class P, class A>
+        inline bool operator!=(unordered_set<T, H, P, A> const&,
+            unordered_set<T, H, P, A> const&);
+        template <class T, class H, class P, class A>
+        inline void swap(unordered_set<T, H, P, A> &m1,
+                unordered_set<T, H, P, A> &m2);
+
+        template <class T,
+            class H = boost::hash<T>,
+            class P = std::equal_to<T>,
+            class A = std::allocator<T> >
+        class unordered_multiset;
+
+        template <class T, class H, class P, class A>
+        inline bool operator==(unordered_multiset<T, H, P, A> const&,
+            unordered_multiset<T, H, P, A> const&);
+        template <class T, class H, class P, class A>
+        inline bool operator!=(unordered_multiset<T, H, P, A> const&,
+            unordered_multiset<T, H, P, A> const&);
+        template <class T, class H, class P, class A>
+        inline void swap(unordered_multiset<T, H, P, A> &m1,
+                unordered_multiset<T, H, P, A> &m2);
+    }
+
+    using boost::unordered::unordered_set;
+    using boost::unordered::unordered_multiset;
+    using boost::unordered::swap;
+    using boost::unordered::operator==;
+    using boost::unordered::operator!=;
+}
+
+#endif

data/ext/boost/unordered_map.hpp

@@ -0,0 +1,18 @@
+
+// Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
+// Copyright (C) 2005-2008 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/unordered for documentation
+
+#ifndef BOOST_UNORDERED_MAP_HPP_INCLUDED
+#define BOOST_UNORDERED_MAP_HPP_INCLUDED
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/unordered/unordered_map.hpp>
+
+#endif // BOOST_UNORDERED_MAP_HPP_INCLUDED

data/ext/boost/unordered_set.hpp

@@ -0,0 +1,18 @@
+
+// Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
+// Copyright (C) 2005-2008 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/unordered for documentation
+
+#ifndef BOOST_UNORDERED_SET_HPP_INCLUDED
+#define BOOST_UNORDERED_SET_HPP_INCLUDED
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/unordered/unordered_set.hpp>
+
+#endif // BOOST_UNORDERED_SET_HPP_INCLUDED

data/ext/boost/utility/addressof.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2002 Brad King (brad.king@kitware.com) 
+// Copyright (C) 2002 Brad King (brad.king@kitware.com)
 //                    Douglas Gregor (gregod@cs.rpi.edu)
 //
 // Copyright (C) 2002, 2008 Peter Dimov
@@ -50,7 +50,7 @@ template<class T> struct addressof_impl
 
 template<class T> T * addressof( T & v )
 {
-#if defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x610 ) )
+#if (defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x610 ) ) ) || defined( __SUNPRO_CC )
 
     return boost::detail::addressof_impl<T>::f( v, 0 );
 

data/ext/boost/utility/result_of.hpp

@@ -46,7 +46,7 @@
 
 #ifndef BOOST_RESULT_OF_USE_TR1
 #  ifndef BOOST_RESULT_OF_USE_DECLTYPE
-#    ifndef BOOST_NO_DECLTYPE_N3276 // this implies !defined(BOOST_NO_DECLTYPE)
+#    ifndef BOOST_NO_CXX11_DECLTYPE_N3276 // this implies !defined(BOOST_NO_CXX11_DECLTYPE)
 #      define BOOST_RESULT_OF_USE_DECLTYPE
 #    else
 #      define BOOST_RESULT_OF_USE_TR1
@@ -68,6 +68,13 @@ template<typename F, typename FArgs, bool HasResultType> struct tr1_result_of_im
 
 #ifdef BOOST_NO_SFINAE_EXPR
 
+// There doesn't seem to be any other way to turn this off such that the presence of
+// the user-defined operator,() below doesn't cause spurious warning all over the place,
+// so unconditionally turn it off.
+#if BOOST_MSVC
+#  pragma warning(disable: 4913) // user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used
+#endif
+
 struct result_of_private_type {};
 
 struct result_of_weird_type {

data/ext/boost/version.hpp

@@ -19,7 +19,7 @@
 //  BOOST_VERSION / 100 % 1000 is the minor version
 //  BOOST_VERSION / 100000 is the major version
 
-#define BOOST_VERSION 105200
+#define BOOST_VERSION 105400
 
 //
 //  BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
@@ -27,6 +27,6 @@
 //  number, y is the minor version number, and z is the patch level if not 0.
 //  This is used by <config/auto_link.hpp> to select which library version to link to.
 
-#define BOOST_LIB_VERSION "1_52"
+#define BOOST_LIB_VERSION "1_54"
 
 #endif

data/ext/common/Account.h

@@ -163,7 +163,7 @@ public:
 	}
 };
 
-typedef shared_ptr<Account> AccountPtr;
+typedef boost::shared_ptr<Account> AccountPtr;
 
 } // namespace Passenger
 

data/ext/common/AccountsDatabase.h

@@ -41,7 +41,7 @@ using namespace std;
 using namespace boost;
 
 class AccountsDatabase;
-typedef shared_ptr<AccountsDatabase> AccountsDatabasePtr;
+typedef boost::shared_ptr<AccountsDatabase> AccountsDatabasePtr;
 
 
 class AccountsDatabase {

data/ext/common/AgentsStarter.cpp

@@ -26,7 +26,9 @@
 #include <set>
 #include <cerrno>
 #include <cstring>
+#include <string.h>
 #include <AgentsStarter.h>
+#include <Exceptions.h>
 
 using namespace std;
 using namespace boost;
@@ -114,7 +116,7 @@ pp_agents_starter_start(PP_AgentsStarter *as,
 	Passenger::AgentsStarter *agentsStarter = (Passenger::AgentsStarter *) as;
 	this_thread::disable_syscall_interruption dsi;
 	try {
-		function<void ()> afterForkFunctionObject;
+		boost::function<void ()> afterForkFunctionObject;
 		
 		if (afterFork != NULL) {
 			afterForkFunctionObject = boost::bind(afterFork, callbackArgument);

data/ext/common/AgentsStarter.h

@@ -374,7 +374,7 @@ public:
 	 */
 	void start(const string &passengerRoot,
 		const VariantMap &extraParams = VariantMap(),
-		const function<void ()> &afterFork = function<void ()>())
+		const boost::function<void ()> &afterFork = boost::function<void ()>())
 	{
 		TRACE_POINT();
 		this_thread::disable_interruption di;
@@ -533,7 +533,7 @@ public:
 				requestSocketPassword   = info.get("request_socket_password");
 				helperAgentAdminSocketAddress = info.get("helper_agent_admin_socket_address");
 				helperAgentExitPassword       = info.get("helper_agent_exit_password");
-				serverInstanceDir = make_shared<ServerInstanceDir>(info.get("server_instance_dir"), false);
+				serverInstanceDir = boost::make_shared<ServerInstanceDir>(info.get("server_instance_dir"), false);
 				generation        = serverInstanceDir->getGeneration(info.getInt("generation"));
 				loggingSocketAddress  = info.get("logging_socket_address");
 				loggingSocketPassword = info.get("logging_socket_password");

data/ext/common/ApplicationPool2/AppTypes.cpp

@@ -22,7 +22,10 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+
 #include <ApplicationPool2/AppTypes.h>
+#include <exception>
+#include <string.h>
 
 namespace Passenger {
 namespace ApplicationPool2 {
@@ -32,7 +35,7 @@ const AppTypeDefinition appTypeDefinitions[] = {
 	{ PAT_RACK, "rack", "config.ru", "Passenger RackApp" },
 	{ PAT_WSGI, "wsgi", "passenger_wsgi.py", "Passenger WsgiApp" },
 	{ PAT_CLASSIC_RAILS, "classic-rails", "config/environment.rb", "Passenger ClassicRailsApp" },
-	{ PAT_NODE, "node", "passenger_node.js", "Passenger NodeApp" },
+	{ PAT_NODE, "node", "app.js", "Passenger NodeApp" },
 	{ PAT_METEOR, "meteor", ".meteor", "Passenger MeteorApp" },
 	{ PAT_NONE, NULL, NULL, NULL }
 };
@@ -46,7 +49,11 @@ using namespace Passenger::ApplicationPool2;
 
 PP_AppTypeDetector *
 pp_app_type_detector_new() {
-	return new AppTypeDetector();
+	try {
+		return new AppTypeDetector();
+	} catch (const std::bad_alloc &) {
+		return 0;
+	}
 }
 
 void
@@ -56,18 +63,29 @@ pp_app_type_detector_free(PP_AppTypeDetector *detector) {
 
 PassengerAppType
 pp_app_type_detector_check_document_root(PP_AppTypeDetector *_detector,
-	const char *documentRoot, unsigned int len, int resolveFirstSymlink)
+	const char *documentRoot, unsigned int len, int resolveFirstSymlink,
+	PP_Error *error)
 {
 	AppTypeDetector *detector = (AppTypeDetector *) _detector;
-	return detector->checkDocumentRoot(StaticString(documentRoot, len), resolveFirstSymlink);
+	try {
+		return detector->checkDocumentRoot(StaticString(documentRoot, len), resolveFirstSymlink);
+	} catch (const std::exception &e) {
+		pp_error_set(e, error);
+		return PAT_ERROR;
+	}
 }
 
 PassengerAppType
 pp_app_type_detector_check_app_root(PP_AppTypeDetector *_detector,
-	const char *appRoot, unsigned int len)
+	const char *appRoot, unsigned int len, PP_Error *error)
 {
 	AppTypeDetector *detector = (AppTypeDetector *) _detector;
-	return detector->checkAppRoot(StaticString(appRoot, len));
+	try {
+		return detector->checkAppRoot(StaticString(appRoot, len));
+	} catch (const std::exception &e) {
+		pp_error_set(e, error);
+		return PAT_ERROR;
+	}
 }
 
 const char *

data/ext/common/ApplicationPool2/AppTypes.h

@@ -33,6 +33,8 @@
  * what kind of application lives under the given directory.
  */
 
+#include "../Exceptions.h"
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,7 +46,8 @@ typedef enum {
 	PAT_CLASSIC_RAILS,
 	PAT_NODE,
 	PAT_METEOR,
-	PAT_NONE
+	PAT_NONE,
+	PAT_ERROR
 } PassengerAppType;
 
 typedef void PP_AppTypeDetector;
@@ -52,9 +55,10 @@ typedef void PP_AppTypeDetector;
 PP_AppTypeDetector *pp_app_type_detector_new();
 void pp_app_type_detector_free(PP_AppTypeDetector *detector);
 PassengerAppType pp_app_type_detector_check_document_root(PP_AppTypeDetector *detector,
-	const char *documentRoot, unsigned int len, int resolveFirstSymlink);
+	const char *documentRoot, unsigned int len, int resolveFirstSymlink,
+	PP_Error *error);
 PassengerAppType pp_app_type_detector_check_app_root(PP_AppTypeDetector *detector,
-	const char *appRoot, unsigned int len);
+	const char *appRoot, unsigned int len, PP_Error *error);
 
 const char *pp_get_app_type_name(PassengerAppType type);
 
@@ -67,6 +71,7 @@ const char *pp_get_app_type_name(PassengerAppType type);
 #include <oxt/macros.hpp>
 #include <oxt/backtrace.hpp>
 #include <cstdlib>
+#include <limits.h>
 #include <string>
 #include <Logging.h>
 #include <StaticString.h>
@@ -103,8 +108,7 @@ private:
 		pos = appendData(pos, end, name);
 		if (OXT_UNLIKELY(pos == end)) {
 			TRACE_POINT();
-			P_CRITICAL("BUG: buffer overflow");
-			abort();
+			throw RuntimeException("Not enough buffer space");
 		}
 		return fileExists(StaticString(buf, pos - buf), cstat, throttleRate);
 	}
@@ -158,7 +162,12 @@ public:
 				return checkAppRoot(extractDirNameStatic(documentRoot));
 			}
 		} else {
-			char ntDocRoot[documentRoot.size() + 1];
+			if (OXT_UNLIKELY(documentRoot.size() > PATH_MAX)) {
+				TRACE_POINT();
+				throw RuntimeException("Not enough buffer space");
+			}
+
+			char ntDocRoot[PATH_MAX + 1];
 			memcpy(ntDocRoot, documentRoot.data(), documentRoot.size());
 			ntDocRoot[documentRoot.size()] = '\0';
 			string resolvedDocumentRoot = resolveSymlink(ntDocRoot);
@@ -181,8 +190,8 @@ public:
 	 * @throws boost::thread_interrupted
 	 */
 	PassengerAppType checkAppRoot(const StaticString &appRoot) {
-		char buf[appRoot.size() + 32];
-		const char *end = buf + appRoot.size() + 32;
+		char buf[PATH_MAX + 32];
+		const char *end = buf + sizeof(buf) - 1;
 		const AppTypeDefinition *definition = &appTypeDefinitions[0];
 
 		while (definition->type != PAT_NONE) {

data/ext/common/ApplicationPool2/Common.h

@@ -79,16 +79,16 @@ enum DisableResult {
 	DR_DEFERRED
 };
 
-typedef shared_ptr<Pool> PoolPtr;
-typedef shared_ptr<SuperGroup> SuperGroupPtr;
-typedef shared_ptr<Group> GroupPtr;
-typedef shared_ptr<Process> ProcessPtr;
-typedef shared_ptr<Session> SessionPtr;
-typedef shared_ptr<tracable_exception> ExceptionPtr;
+typedef boost::shared_ptr<Pool> PoolPtr;
+typedef boost::shared_ptr<SuperGroup> SuperGroupPtr;
+typedef boost::shared_ptr<Group> GroupPtr;
+typedef boost::shared_ptr<Process> ProcessPtr;
+typedef boost::shared_ptr<Session> SessionPtr;
+typedef boost::shared_ptr<tracable_exception> ExceptionPtr;
 typedef StringMap<SuperGroupPtr> SuperGroupMap;
-typedef function<void (const SessionPtr &session, const ExceptionPtr &e)> GetCallback;
-typedef function<void (const ProcessPtr &process, DisableResult result)> DisableCallback;
-typedef function<void ()> Callback;
+typedef boost::function<void (const SessionPtr &session, const ExceptionPtr &e)> GetCallback;
+typedef boost::function<void (const ProcessPtr &process, DisableResult result)> DisableCallback;
+typedef boost::function<void ()> Callback;
 
 struct GetWaiter {
 	Options options;
@@ -104,7 +104,7 @@ struct GetWaiter {
 
 struct Ticket {
 	boost::mutex syncher;
-	condition_variable cond;
+	boost::condition_variable cond;
 	SessionPtr session;
 	ExceptionPtr exception;
 };
@@ -133,12 +133,12 @@ struct SpawnerConfig {
 		if (randomGenerator != NULL) {
 			this->randomGenerator = randomGenerator;
 		} else {
-			this->randomGenerator = make_shared<RandomGenerator>();
+			this->randomGenerator = boost::make_shared<RandomGenerator>();
 		}
 	}
 };
 
-typedef shared_ptr<SpawnerConfig> SpawnerConfigPtr;
+typedef boost::shared_ptr<SpawnerConfig> SpawnerConfigPtr;
 
 ExceptionPtr copyException(const tracable_exception &e);
 void rethrowException(const ExceptionPtr &e);

data/ext/common/ApplicationPool2/DirectSpawner.h

@@ -155,7 +155,7 @@ public:
 	{
 		generation = _generation;
 		if (_config == NULL) {
-			config = make_shared<SpawnerConfig>();
+			config = boost::make_shared<SpawnerConfig>();
 		} else {
 			config = _config;
 		}
@@ -173,7 +173,7 @@ public:
 		vector<string> command = createCommand(options, preparation, args);
 		SocketPair adminSocket = createUnixSocketPair();
 		Pipe errorPipe = createPipe();
-		DebugDirPtr debugDir = make_shared<DebugDir>(preparation.uid, preparation.gid);
+		DebugDirPtr debugDir = boost::make_shared<DebugDir>(preparation.uid, preparation.gid);
 		pid_t pid;
 		
 		pid = syscalls::fork();

data/ext/common/ApplicationPool2/DummySpawner.h

@@ -57,13 +57,13 @@ public:
 		possiblyRaiseInternalError(options);
 
 		SocketPair adminSocket = createUnixSocketPair();
-		SocketListPtr sockets = make_shared<SocketList>();
+		SocketListPtr sockets = boost::make_shared<SocketList>();
 		sockets->add("main", "tcp://127.0.0.1:1234", "session", config->concurrency);
 		syscalls::usleep(config->spawnTime);
 		
 		boost::lock_guard<boost::mutex> l(lock);
 		count++;
-		ProcessPtr process = make_shared<Process>(SafeLibevPtr(),
+		ProcessPtr process = boost::make_shared<Process>(SafeLibevPtr(),
 			(pid_t) count, "gupid-" + toString(count),
 			toString(count),
 			adminSocket.second, FileDescriptor(), sockets,
@@ -81,7 +81,7 @@ public:
 	}
 };
 
-typedef shared_ptr<DummySpawner> DummySpawnerPtr;
+typedef boost::shared_ptr<DummySpawner> DummySpawnerPtr;
 
 
 } // namespace ApplicationPool2