passenger 4.0.20 → 4.0.21

data/ext/common/ApplicationPool2/Session.h

@@ -163,7 +163,7 @@ public:
 	}
 };
 
-typedef shared_ptr<Session> SessionPtr;
+typedef boost::shared_ptr<Session> SessionPtr;
 
 
 } // namespace ApplicationPool2

data/ext/common/ApplicationPool2/SmartSpawner.h

@@ -35,7 +35,7 @@ using namespace boost;
 using namespace oxt;
 
 
-class SmartSpawner: public Spawner, public enable_shared_from_this<SmartSpawner> {
+class SmartSpawner: public Spawner, public boost::enable_shared_from_this<SmartSpawner> {
 private:
 	/**
 	 * Structure containing arguments and working state for negotiating
@@ -159,7 +159,8 @@ private:
 		// remaining stderr output for at most 2 seconds.
 		if (errorKind != SpawnException::PRELOADER_STARTUP_TIMEOUT
 		 && errorKind != SpawnException::APP_STARTUP_TIMEOUT
-		 && stderrCapturer != NULL) {
+		 && stderrCapturer != NULL)
+		{
 			bool done = false;
 			unsigned long long timeout = 2000;
 			while (!done) {
@@ -186,7 +187,10 @@ private:
 		
 		// Now throw SpawnException with the captured stderr output
 		// as error response.
-		SpawnException e(msg, stderrOutput, false, errorKind);
+		SpawnException e(msg,
+			createErrorPageFromStderrOutput(msg, errorKind, stderrOutput),
+			true,
+			errorKind);
 		e.setPreloaderCommand(getPreloaderCommandString());
 		annotatePreloaderException(e, debugDir);
 		throw e;
@@ -215,7 +219,7 @@ private:
 		vector<string> command = createRealPreloaderCommand(options, 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();
@@ -285,12 +289,12 @@ private:
 			
 			PipeWatcherPtr watcher;
 
-			watcher = make_shared<PipeWatcher>(adminSocket.second,
+			watcher = boost::make_shared<PipeWatcher>(adminSocket.second,
 				"stdout", pid, config->forwardStdout);
 			watcher->initialize();
 			watcher->start();
 
-			watcher = make_shared<PipeWatcher>(errorPipe.first,
+			watcher = boost::make_shared<PipeWatcher>(errorPipe.first,
 				"stderr", pid, config->forwardStderr);
 			watcher->initialize();
 			watcher->start();
@@ -529,11 +533,19 @@ private:
 	}
 	
 	void handleInvalidResponseType(StartupDetails &details, const string &line) {
-		throwPreloaderSpawnException("An error occurred while starting up "
-			"the preloader. It sent an unknown response type \"" +
-			cEscapeString(line) + "\".",
-			SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
-			details);
+		if (line.empty()) {
+			throwPreloaderSpawnException("An error occurred while starting up "
+				"the preloader. It exited before signalling successful "
+				"startup back to " PROGRAM_NAME ".",
+				SpawnException::PRELOADER_STARTUP_ERROR,
+				details);
+		} else {
+			throwPreloaderSpawnException("An error occurred while starting up "
+				"the preloader. It sent an unknown response type \"" +
+				cEscapeString(line) + "\".",
+				SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
+				details);
+		}
 	}
 	
 	string negotiatePreloaderStartup(StartupDetails &details) {
@@ -715,7 +727,7 @@ public:
 		m_lastUsed = SystemTime::getUsec();
 
 		if (_config == NULL) {
-			config = make_shared<SpawnerConfig>();
+			config = boost::make_shared<SpawnerConfig>();
 		} else {
 			config = _config;
 		}

data/ext/common/ApplicationPool2/Socket.h

@@ -162,7 +162,7 @@ public:
 	}
 	
 	void checkinConnection(Connection connection) {
-		unique_lock<boost::mutex> l(connectionPoolLock);
+		boost::unique_lock<boost::mutex> l(connectionPoolLock);
 		
 		if (connection.persistent) {
 			if (connection.fail) {
@@ -237,7 +237,7 @@ public:
 	}
 };
 
-typedef shared_ptr<SocketList> SocketListPtr;
+typedef boost::shared_ptr<SocketList> SocketListPtr;
 
 
 } // namespace ApplicationPool2

data/ext/common/ApplicationPool2/Spawner.h

@@ -211,16 +211,22 @@ protected:
 		}
 	};
 	
-	typedef shared_ptr<BackgroundIOCapturer> BackgroundIOCapturerPtr;
+	typedef boost::shared_ptr<BackgroundIOCapturer> BackgroundIOCapturerPtr;
 	
 	/**
 	 * A temporary directory for spawned child processes to write
 	 * debugging information to. It is removed after spawning has
 	 * determined to be successful or failed.
 	 */
-	struct DebugDir {
+	class DebugDir {
+	private:
 		string path;
 
+		static void doClosedir(DIR *dir) {
+			closedir(dir);
+		}
+
+	public:
 		DebugDir(uid_t uid, gid_t gid) {
 			char buf[PATH_MAX] = "/tmp/passenger.spawn-debug.XXXXXXXXXX";
 			const char *result = mkdtemp(buf);
@@ -247,7 +253,7 @@ protected:
 		map<string, string> readAll() {
 			map<string, string> result;
 			DIR *dir = opendir(path.c_str());
-			ScopeGuard guard(boost::bind(closedir, dir));
+			ScopeGuard guard(boost::bind(doClosedir, dir));
 			struct dirent *ent;
 
 			while ((ent = readdir(dir)) != NULL) {
@@ -265,7 +271,7 @@ protected:
 		}
 	};
 
-	typedef shared_ptr<DebugDir> DebugDirPtr;
+	typedef boost::shared_ptr<DebugDir> DebugDirPtr;
 
 	/**
 	 * Contains information that will be used after fork()ing but before exec()ing,
@@ -419,7 +425,7 @@ private:
 
 	ProcessPtr handleSpawnResponse(NegotiationDetails &details) {
 		TRACE_POINT();
-		SocketListPtr sockets = make_shared<SocketList>();
+		SocketListPtr sockets = boost::make_shared<SocketList>();
 		while (true) {
 			string line;
 			
@@ -507,7 +513,7 @@ private:
 				details);
 		}
 		
-		return make_shared<Process>(details.libev, details.pid,
+		return boost::make_shared<Process>(details.libev, details.pid,
 			details.gupid, details.connectPassword,
 			details.adminSocket, details.errorPipe,
 			sockets, creationTime, details.spawnStartTime,
@@ -675,7 +681,8 @@ protected:
 		// remaining stderr output for at most 2 seconds.
 		if (errorKind != SpawnException::PRELOADER_STARTUP_TIMEOUT
 		 && errorKind != SpawnException::APP_STARTUP_TIMEOUT
-		 && details.stderrCapturer != NULL) {
+		 && details.stderrCapturer != NULL)
+		{
 			bool done = false;
 			unsigned long long timeout = 2000;
 			while (!done) {
@@ -702,7 +709,10 @@ protected:
 		
 		// Now throw SpawnException with the captured stderr output
 		// as error response.
-		SpawnException e(msg, stderrOutput, false, errorKind);
+		SpawnException e(msg,
+			createErrorPageFromStderrOutput(msg, errorKind, stderrOutput),
+			true,
+			errorKind);
 		annotateAppSpawnException(e, details);
 		throw e;
 	}
@@ -713,6 +723,37 @@ protected:
 		}
 	}
 
+	string createErrorPageFromStderrOutput(const string &msg,
+		SpawnException::ErrorKind errorKind,
+		const string &stderrOutput)
+	{
+		// These kinds of SpawnExceptions are not supposed to be handled through this function.
+		assert(errorKind != SpawnException::PRELOADER_STARTUP_EXPLAINABLE_ERROR);
+		assert(errorKind != SpawnException::APP_STARTUP_EXPLAINABLE_ERROR);
+
+		string result = escapeHTML(msg);
+
+		if (errorKind == SpawnException::PRELOADER_STARTUP_TIMEOUT
+		 || errorKind == SpawnException::APP_STARTUP_TIMEOUT
+		 || errorKind == SpawnException::PRELOADER_STARTUP_ERROR
+		 || errorKind == SpawnException::APP_STARTUP_ERROR)
+		{
+			result.append(" Please read <a href=\"https://github.com/phusion/passenger/wiki/Debugging-application-startup-problems\">this article</a> "
+				"for more information about this problem.");
+		}
+		result.append("<br>\n<h2>Raw process output:</h2>\n");
+
+		if (strip(stderrOutput).empty()) {
+			result.append("(empty)");
+		} else {
+			result.append("<pre>");
+			result.append(escapeHTML(stderrOutput));
+			result.append("</pre>");
+		}
+
+		return result;
+	}
+
 	template<typename Details>
 	string readMessageLine(Details &details) {
 		TRACE_POINT();
@@ -942,6 +983,7 @@ protected:
 		
 		appendNullTerminatedKeyValue(result, "IN_PASSENGER", "1");
 		appendNullTerminatedKeyValue(result, "PYTHONUNBUFFERED", "1");
+		appendNullTerminatedKeyValue(result, "NODE_PATH", resourceLocator.getNodeLibDir());
 		appendNullTerminatedKeyValue(result, "RAILS_ENV", options.environment);
 		appendNullTerminatedKeyValue(result, "RACK_ENV", options.environment);
 		appendNullTerminatedKeyValue(result, "WSGI_ENV", options.environment);
@@ -1229,11 +1271,19 @@ protected:
 	}
 	
 	void handleInvalidSpawnResponseType(const string &line, NegotiationDetails &details) {
-		throwAppSpawnException("An error occurred while starting "
-			"the web application. It sent an unknown response type \"" +
-			cEscapeString(line) + "\".",
-			SpawnException::APP_STARTUP_PROTOCOL_ERROR,
-			details);
+		if (line.empty()) {
+			throwAppSpawnException("An error occurred while starting "
+				"the web application. It exited before signalling successful "
+				"startup back to " PROGRAM_NAME ".",
+				SpawnException::APP_STARTUP_ERROR,
+				details);
+		} else {
+			throwAppSpawnException("An error occurred while starting "
+				"the web application. It sent an unknown response type \"" +
+				cEscapeString(line) + "\".",
+				SpawnException::APP_STARTUP_PROTOCOL_ERROR,
+				details);
+		}
 	}
 	
 public:
@@ -1266,7 +1316,7 @@ public:
 		return config;
 	}
 };
-typedef shared_ptr<Spawner> SpawnerPtr;
+typedef boost::shared_ptr<Spawner> SpawnerPtr;
 
 
 } // namespace ApplicationPool2

data/ext/common/ApplicationPool2/SpawnerFactory.h

@@ -60,7 +60,7 @@ private:
 		} else {
 			return SpawnerPtr();
 		}
-		return make_shared<SmartSpawner>(libev, resourceLocator,
+		return boost::make_shared<SmartSpawner>(libev, resourceLocator,
 			generation, preloaderCommand, options, config);
 	}
 	
@@ -74,7 +74,7 @@ public:
 		  generation(_generation)
 	{
 		if (_config == NULL) {
-			config = make_shared<SpawnerConfig>();
+			config = boost::make_shared<SpawnerConfig>();
 		} else {
 			config = _config;
 		}
@@ -86,13 +86,13 @@ public:
 		if (options.spawnMethod == "smart" || options.spawnMethod == "smart-lv2") {
 			SpawnerPtr spawner = tryCreateSmartSpawner(options);
 			if (spawner == NULL) {
-				spawner = make_shared<DirectSpawner>(libev,
+				spawner = boost::make_shared<DirectSpawner>(libev,
 					resourceLocator, generation, config);
 			}
 			return spawner;
 		} else if (options.spawnMethod == "direct" || options.spawnMethod == "conservative") {
-			shared_ptr<DirectSpawner> spawner = make_shared<DirectSpawner>(libev,
-				resourceLocator, generation, config);
+			boost::shared_ptr<DirectSpawner> spawner = boost::make_shared<DirectSpawner>(
+				libev, resourceLocator, generation, config);
 			return spawner;
 		} else if (options.spawnMethod == "dummy") {
 			syscalls::usleep(config->spawnerCreationSleepTime);
@@ -110,7 +110,7 @@ public:
 	DummySpawnerPtr getDummySpawner() {
 		boost::lock_guard<boost::mutex> l(syncher);
 		if (dummySpawner == NULL) {
-			dummySpawner = make_shared<DummySpawner>(resourceLocator, config);
+			dummySpawner = boost::make_shared<DummySpawner>(resourceLocator, config);
 		}
 		return dummySpawner;
 	}
@@ -131,7 +131,7 @@ public:
 	}
 };
 
-typedef shared_ptr<SpawnerFactory> SpawnerFactoryPtr;
+typedef boost::shared_ptr<SpawnerFactory> SpawnerFactoryPtr;
 
 
 } // namespace ApplicationPool2

data/ext/common/ApplicationPool2/SuperGroup.h

@@ -111,7 +111,7 @@ using namespace oxt;
  * Except for otherwise documented parts, this class is not thread-safe,
  * so only access it within the ApplicationPool lock.
  */
-class SuperGroup: public enable_shared_from_this<SuperGroup> {
+class SuperGroup: public boost::enable_shared_from_this<SuperGroup> {
 public:
 	enum State {
 		/** This SuperGroup is being initialized. `groups` is empty and
@@ -168,7 +168,7 @@ public:
 		CANCELED
 	};
 
-	typedef function<void (ShutdownResult result)> ShutdownCallback;
+	typedef boost::function<void (ShutdownResult result)> ShutdownCallback;
 	
 private:
 	friend class Pool;
@@ -193,7 +193,7 @@ private:
 	static void runAllActions(const vector<Callback> &actions);
 	string generateSecret() const;
 	
-	void createInterruptableThread(const function<void ()> &func, const string &name,
+	void createInterruptableThread(const boost::function<void ()> &func, const string &name,
 		unsigned int stackSize);
 	
 	void verifyInvariants() const {
@@ -328,7 +328,7 @@ private:
 		// Wait until 'detachedGroups' is empty.
 		UPDATE_TRACE_POINT();
 		PoolPtr pool = getPool();
-		unique_lock<boost::mutex> lock(getPoolSyncher(pool));
+		boost::unique_lock<boost::mutex> lock(getPoolSyncher(pool));
 		verifyInvariants();
 		while (true) {
 			if (OXT_UNLIKELY(this->generation != generation)) {
@@ -366,7 +366,7 @@ private:
 	
 public:
 	mutable boost::mutex backrefSyncher;
-	const weak_ptr<Pool> pool;
+	const boost::weak_ptr<Pool> pool;
 	
 	State state;
 	string name;

data/ext/common/BackgroundEventLoop.cpp

@@ -41,7 +41,7 @@ using namespace oxt;
 struct BackgroundEventLoopPrivate {
 	oxt::thread *thr;
 	boost::mutex lock;
-	condition_variable cond;
+	boost::condition_variable cond;
 	bool started;
 };
 
@@ -53,7 +53,7 @@ signalBackgroundEventLoopExit(struct ev_loop *loop, ev_async *async, int revents
 
 static void
 startBackgroundLoop(BackgroundEventLoop *bg) {
-	unique_lock<boost::mutex> l(bg->priv->lock);
+	boost::unique_lock<boost::mutex> l(bg->priv->lock);
 	bg->safe->setCurrentThread();
 	bg->priv->started = true;
 	bg->priv->cond.notify_all();
@@ -83,7 +83,7 @@ BackgroundEventLoop::BackgroundEventLoop(bool scalable) {
 	async->data = this;
 	ev_async_init(async, signalBackgroundEventLoopExit);
 	ev_async_start(loop, async);
-	safe = make_shared<SafeLibev>(loop);
+	safe = boost::make_shared<SafeLibev>(loop);
 	priv = new BackgroundEventLoopPrivate();
 	priv->thr = NULL;
 	priv->started = false;
@@ -99,7 +99,7 @@ BackgroundEventLoop::~BackgroundEventLoop() {
 void
 BackgroundEventLoop::start(const string &threadName, unsigned int stackSize) {
 	assert(priv->thr == NULL);
-	unique_lock<boost::mutex> l(priv->lock);
+	boost::unique_lock<boost::mutex> l(priv->lock);
 	priv->thr = new oxt::thread(
 		boost::bind(startBackgroundLoop, this),
 		threadName,

data/ext/common/BackgroundEventLoop.h

@@ -46,7 +46,7 @@ namespace Passenger {
 	struct BackgroundEventLoop {
 		struct ev_loop *loop;
 		ev_async *async;
-		shared_ptr<SafeLibev> safe;
+		boost::shared_ptr<SafeLibev> safe;
 		BackgroundEventLoopPrivate *priv;
 		
 		BackgroundEventLoop(bool scalable = false);

data/ext/common/Constants.h

@@ -36,6 +36,8 @@
 #define DEFAULT_BACKEND_ACCOUNT_RIGHTS Account::DETACH
 
 
+	#define APACHE2_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Apache.html"
+
 	#define DEFAULT_ANALYTICS_LOG_GROUP ""
 
 	#define DEFAULT_ANALYTICS_LOG_PERMISSIONS "u=rwx,g=rx,o=rx"
@@ -68,11 +70,15 @@
 
 	#define FEEDBACK_FD 3
 
+	#define INDEX_DOC_URL "http://www.modrails.com/documentation/Users%20guide.html"
+
 	#define MESSAGE_SERVER_MAX_PASSWORD_SIZE 100
 
 	#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
 
-	#define PASSENGER_VERSION "4.0.20"
+	#define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
+
+	#define PASSENGER_VERSION "4.0.21"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 
@@ -80,6 +86,8 @@
 
 	#define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"
 
+	#define PROGRAM_NAME "Phusion Passenger"
+
 	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION 2
 
 	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION 0
@@ -88,7 +96,11 @@
 
 	#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 0
 
+	#define STANDALONE_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Standalone.html"
+
 	#define STANDALONE_NGINX_CONFIGURE_OPTIONS "--with-cc-opt='-Wno-error' --without-http_fastcgi_module --without-http_scgi_module --without-http_uwsgi_module --with-http_gzip_static_module --with-http_stub_status_module"
 
+	#define SUPPORT_URL "http://www.phusionpassenger.com/support"
+
 
 #endif /* _PASSENGER_CONSTANTS_H */