passenger 4.0.48 → 4.0.49

data/ext/common/EventedMessageServer.h

@@ -49,19 +49,19 @@ struct EventedMessageClientContext {
 		MS_READING_MESSAGE,
 		MS_PROCESSING_MESSAGE
 	};
-	
+
 	State state;
 	AccountPtr account;
-	
+
 	ev::timer authenticationTimer;
 	ScalarMessage scalarReader;
 	ArrayMessage arrayReader;
 	string username;
-	
+
 	EventedMessageClientContext() {
 		state = MS_READING_USERNAME;
 	}
-	
+
 	~EventedMessageClientContext() {
 		/* Its buffer might contain password data so make sure
 		 * it's properly zeroed out. */
@@ -87,34 +87,34 @@ struct EventedMessageClientContext {
 class EventedMessageClient: public EventedClient {
 public:
 	EventedMessageClientContext messageServer;
-	
+
 	EventedMessageClient(struct ev_loop *loop, const FileDescriptor &fd)
 		: EventedClient(loop, fd)
 	{
 		messageServer.authenticationTimer.set(loop);
 	}
-	
+
 	void writeArrayMessage(const char *name, ...) {
 		va_list ap;
 		SmallVector<StaticString, 10> args;
 		const char *arg;
-		
+
 		args.push_back(name);
 		va_start(ap, name);
 		while ((arg = va_arg(ap, const char *)) != NULL) {
 			args.push_back(arg);
 		}
 		va_end(ap);
-		
+
 		writeArrayMessage(&args[0], args.size());
 	}
-	
+
 	void writeArrayMessage(StaticString args[], unsigned int count) {
 		char headerBuf[sizeof(uint16_t)];
 		unsigned int outSize = ArrayMessage::outputSize(count);
 		SmallVector<StaticString, 10> out;
 		out.reserve(outSize);
-		
+
 		ArrayMessage::generate(args, count, headerBuf, &out[0], outSize);
 		write(&out[0], outSize);
 	}
@@ -128,40 +128,40 @@ public:
 class EventedMessageServer: public EventedServer {
 protected:
 	AccountsDatabasePtr accountsDatabase;
-	
-	
+
+
 	/******** Overrided hooks and methods ********/
-	
+
 	virtual EventedClient *createClient(const FileDescriptor &fd) {
 		return new EventedMessageClient(getLoop(), fd);
 	}
-	
+
 	virtual void onNewClient(EventedClient *_client) {
 		EventedMessageClient *client = (EventedMessageClient *) _client;
 		EventedMessageClientContext *context = &client->messageServer;
-		
+
 		context->authenticationTimer.set
 			<&EventedMessageServer::onAuthenticationTimeout>(client);
 		context->authenticationTimer.start(10);
-		
+
 		context->arrayReader.reserve(5);
 		context->scalarReader.setMaxSize(MESSAGE_SERVER_MAX_USERNAME_SIZE);
-		
+
 		client->writeArrayMessage("version", protocolVersion(), NULL);
 	}
-	
+
 	virtual void onClientReadable(EventedClient *_client) {
 		EventedMessageClient *client = (EventedMessageClient *) _client;
 		this_thread::disable_syscall_interruption dsi;
 		int i = 0;
 		bool done = false;
-		
+
 		// read() from the client at most 10 times on every read readiness event
 		// in order to give other events the chance to be processed.
 		while (i < 10 && !done) {
 			char buf[1024 * 8];
 			ssize_t ret;
-			
+
 			ret = syscalls::read(client->fd, buf, sizeof(buf));
 			if (ret == -1) {
 				if (errno != EAGAIN) {
@@ -182,53 +182,53 @@ protected:
 			done = done || !client->ioAllowed();
 		}
 	}
-	
-	
+
+
 	/******** New EventedMessageServer overridable hooks and API methods ********/
-	
+
 	virtual void onClientAuthenticated(EventedMessageClient *client) {
 		// Do nothing.
 	}
-	
+
 	virtual bool onMessageReceived(EventedMessageClient *client, const vector<StaticString> &args) {
 		return true;
 	}
-	
+
 	virtual void onEndOfStream(EventedMessageClient *client) {
 		// Do nothing.
 	}
-	
+
 	virtual pair<size_t, bool> onOtherDataReceived(EventedMessageClient *client,
 		const char *data, size_t size)
 	{
 		abort();
 	}
-	
+
 	virtual const char *protocolVersion() const {
 		return "1";
 	}
-	
+
 	void discardReadData() {
 		readDataDiscarded = true;
 	}
 
 private:
 	bool readDataDiscarded;
-	
+
 	static void onAuthenticationTimeout(ev::timer &t, int revents) {
 		EventedMessageClient *client = (EventedMessageClient *) t.data;
 		client->disconnect();
 	}
-	
+
 	void onDataReceived(EventedMessageClient *client, char *data, size_t size) {
 		EventedMessageClientContext *context = &client->messageServer;
 		size_t consumed = 0;
-		
+
 		readDataDiscarded = false;
 		while (consumed < size && client->ioAllowed() && !readDataDiscarded) {
 			char *current = data + consumed;
 			size_t rest = size - consumed;
-			
+
 			switch (context->state) {
 			case EventedMessageClientContext::MS_READING_USERNAME:
 				consumed += context->scalarReader.feed(current, rest);
@@ -244,17 +244,17 @@ private:
 					context->state = EventedMessageClientContext::MS_READING_PASSWORD;
 				}
 				break;
-				
+
 			case EventedMessageClientContext::MS_READING_PASSWORD: {
 				size_t locallyConsumed;
-				
+
 				locallyConsumed = context->scalarReader.feed(current, rest);
 				consumed += locallyConsumed;
-				
+
 				// The buffer contains password data so make sure we zero
 				// it out when we're done.
 				MemZeroGuard passwordGuard(current, locallyConsumed);
-				
+
 				if (context->scalarReader.hasError()) {
 					context->scalarReader.reset(true);
 					client->writeArrayMessage(
@@ -282,7 +282,7 @@ private:
 				}
 				break;
 			}
-			
+
 			case EventedMessageClientContext::MS_READING_MESSAGE:
 				consumed += context->arrayReader.feed(current, rest);
 				if (context->arrayReader.hasError()) {
@@ -299,7 +299,7 @@ private:
 					context->arrayReader.reset();
 				}
 				break;
-			
+
 			case EventedMessageClientContext::MS_PROCESSING_MESSAGE: {
 				pair<size_t, bool> ret = onOtherDataReceived(client, current, rest);
 				consumed += ret.first;
@@ -308,7 +308,7 @@ private:
 				}
 				break;
 			}
-			
+
 			default:
 				// Never reached.
 				abort();

data/ext/common/EventedServer.h

@@ -89,35 +89,35 @@ using namespace oxt;
 class EventedServer {
 protected:
 	typedef set<EventedClient *> ClientSet;
-	
+
 	const ClientSet &getClients() const {
 		return clients;
 	}
-	
+
 	string getClientName(const EventedClient *client) const {
 		return toString(client);
 	}
-	
+
 	void logError(const EventedClient *client, const string &message) {
 		P_ERROR("Error in client " << getClientName(client) << ": " << message);
 	}
-	
+
 	void logSystemError(const EventedClient *client, const string &message, int errorCode) {
 		P_ERROR("Error in client " << getClientName(client) << ": " <<
 			message << ": " << strerror(errorCode) << " (" << errorCode << ")");
 	}
-	
+
 	void logSystemError(const string &message, int errorCode) {
 		P_ERROR(message << ": " << strerror(errorCode) << " (" << errorCode << ")");
 	}
-	
+
 	virtual EventedClient *createClient(const FileDescriptor &fd) {
 		return new EventedClient(loop, fd);
 	}
-	
+
 	virtual void onNewClient(EventedClient *client) { }
 	virtual void onClientReadable(EventedClient *client) { }
-	
+
 	/**
 	 * Called when a client has been disconnected. This may either be triggered
 	 * immediately by disconnect() or triggered after pending data has been sent
@@ -135,54 +135,54 @@ private:
 	FileDescriptor fd;
 	ev::io acceptWatcher;
 	ClientSet clients;
-	
+
 	void removeClient(EventedClient *client) {
 		clients.erase(client);
 	}
-	
+
 	void freeAllClients() {
 		ClientSet::iterator it;
 		ClientSet::iterator end = clients.end();
-		
+
 		for (it = clients.begin(); it != end; it++) {
 			(*it)->unref();
 		}
 		clients.clear();
 	}
-	
+
 	static void _onReadable(EventedClient *client) {
 		EventedServer *server = (EventedServer *) client->userData;
 		client->ref();
 		ScopeGuard guard(boost::bind(&EventedClient::unref, client));
 		server->onClientReadable((EventedClient *) client);
 	}
-	
+
 	static void _onDisconnect(EventedClient *client) {
 		EventedServer *server = (EventedServer *) client->userData;
 		ScopeGuard guard1(boost::bind(&EventedClient::unref, client));
-		
+
 		client->ref();
 		ScopeGuard guard2(boost::bind(&EventedClient::unref, client));
-		
+
 		server->removeClient(client);
 		server->onClientDisconnected((EventedClient *) client);
 	}
-	
+
 	static void _onDetach(EventedClient *client) {
 		EventedServer *server = (EventedServer *) client->userData;
 		ScopeGuard guard1(boost::bind(&EventedClient::unref, client));
-		
+
 		client->ref();
 		ScopeGuard guard2(boost::bind(&EventedClient::unref, client));
-		
+
 		server->removeClient(client);
 	}
-	
+
 	static void _onSystemError(EventedClient *client, const string &message, int code) {
 		EventedServer *server = (EventedServer *) client->userData;
 		server->logSystemError(client, message, code);
 	}
-	
+
 	void exceptionThrownWhileInitializingClient(EventedClient *client, ClientSet::iterator it) {
 		if (!client->ioAllowed()) {
 			// onNewClient() disconnected or detached the
@@ -196,12 +196,12 @@ private:
 		}
 		// Now client refcount == 0
 	}
-	
+
 	void onAcceptable(ev::io &w, int revents) {
 		this_thread::disable_syscall_interruption dsi;
 		int i = 0;
 		bool done = false;
-		
+
 		// Accept at most 10 connections on every accept readiness event
 		// in order to give other events the chance to be processed.
 		while (i < 10 && !done) {
@@ -212,7 +212,7 @@ private:
 				struct sockaddr_in inet;
 			} addr;
 			socklen_t len = sizeof(addr);
-			
+
 			int clientfd = syscalls::accept(fd, (struct sockaddr *) &addr, &len);
 			if (clientfd == -1) {
 				if (errno != EAGAIN && errno != EWOULDBLOCK) {
@@ -223,11 +223,11 @@ private:
 			} else {
 				FileDescriptor clientfdGuard(clientfd);
 				int optval = 1;
-				
+
 				setNonBlocking(clientfdGuard);
 				syscalls::setsockopt(clientfd, SOL_SOCKET, SO_KEEPALIVE,
 					&optval, sizeof(optval));
-				
+
 				EventedClient *client = createClient(clientfdGuard);
 				client->onReadable    = _onReadable;
 				client->onDisconnect  = _onDisconnect;
@@ -235,9 +235,9 @@ private:
 				client->onSystemError = _onSystemError;
 				client->userData      = this;
 				client->notifyReads(true);
-				
+
 				pair<ClientSet::iterator, bool> p = clients.insert(client);
-				
+
 				client->ref();
 				// client refcount == 2
 				{
@@ -250,7 +250,7 @@ private:
 					g.clear();
 					// If exception occurred: client refcount == 0
 				}
-				
+
 				/* No exception occured.
 				 * If onNewClient() disconnected or detached the client:
 				 *     client refcount == 1
@@ -264,7 +264,7 @@ private:
 			i++;
 		}
 	}
-	
+
 public:
 	EventedServer(struct ev_loop *_loop, FileDescriptor serverFd)
 		: loop(_loop),
@@ -275,15 +275,15 @@ public:
 		acceptWatcher.set<EventedServer, &EventedServer::onAcceptable>(this);
 		acceptWatcher.start(fd, ev::READ);
 	}
-	
+
 	virtual ~EventedServer() {
 		freeAllClients();
 	}
-	
+
 	struct ev_loop *getLoop() const {
 		return loop;
 	}
-	
+
 	FileDescriptor getServerFd() const {
 		return fd;
 	}

data/ext/common/Exceptions.h

@@ -116,32 +116,32 @@ public:
 	 */
 	SystemException(const string &briefMessage, int errorCode) {
 		stringstream str;
-		
+
 		str << strerror(errorCode) << " (errno=" << errorCode << ")";
 		systemMessage = str.str();
-		
+
 		setBriefMessage(briefMessage);
 		m_code = errorCode;
 	}
-	
+
 	virtual ~SystemException() throw() {}
-	
+
 	virtual const char *what() const throw() {
 		return fullMessage.c_str();
 	}
-	
+
 	void setBriefMessage(const string &message) {
 		briefMessage = message;
 		fullMessage = briefMessage + ": " + systemMessage;
 	}
-	
+
 	/**
 	 * The value of <tt>errno</tt> at the time the error occured.
 	 */
 	int code() const throw() {
 		return m_code;
 	}
-	
+
 	/**
 	 * Returns a brief version of the exception message. This message does
 	 * not include the system error description, and is equivalent to the
@@ -150,7 +150,7 @@ public:
 	string brief() const throw() {
 		return briefMessage;
 	}
-	
+
 	/**
 	 * Returns the system's error message. This message contains both the
 	 * content of <tt>strerror(errno)</tt> and the errno number itself.
@@ -174,9 +174,9 @@ public:
 		const string &filename)
 		: SystemException(message, errorCode),
 		  m_filename(filename) {}
-	
+
 	virtual ~FileSystemException() throw() {}
-	
+
 	/**
 	 * The filename that's associated to the error.
 	 */
@@ -277,7 +277,7 @@ public:
 		 * It DID explicitly supply an error message. */
 		APP_STARTUP_EXPLAINABLE_ERROR
 	};
-	
+
 private:
 	ErrorKind errorKind;
 	string msg;
@@ -286,7 +286,7 @@ private:
 	string m_errorPage;
 	string preloaderCommand;
 	map<string, string> annotations;
-	
+
 public:
 	SpawnException(const string &message, ErrorKind errorKind = UNDEFINED_ERROR)
 		: msg(message)
@@ -295,7 +295,7 @@ public:
 		m_hasErrorPage = false;
 		m_isHTML = false;
 	}
-	
+
 	SpawnException(const string &message, const string &errorPage,
 		bool isHTML = true, ErrorKind errorKind = UNDEFINED_ERROR)
 		: msg(message), m_errorPage(errorPage)
@@ -304,9 +304,9 @@ public:
 		m_hasErrorPage = true;
 		m_isHTML = isHTML;
 	}
-	
+
 	virtual ~SpawnException() throw() {}
-	
+
 	virtual const char *what() const throw() {
 		return msg.c_str();
 	}
@@ -314,24 +314,24 @@ public:
 	bool hasErrorPage() const {
 		return m_hasErrorPage;
 	}
-	
+
 	const string &getErrorPage() const {
 		return m_errorPage;
 	}
-	
+
 	bool isHTML() const {
 		return m_isHTML;
 	}
-	
+
 	ErrorKind getErrorKind() const {
 		return errorKind;
 	}
-	
+
 	SpawnException &setPreloaderCommand(const string &filename) {
 		preloaderCommand = filename;
 		return *this;
 	}
-	
+
 	const string &getPreloaderCommand() const {
 		return preloaderCommand;
 	}
@@ -379,13 +379,13 @@ public:
 	GetAbortedException(const string &message)
 		: msg(message)
 		{ }
-	
+
 	GetAbortedException(const oxt::tracable_exception::no_backtrace &tag)
 		: oxt::tracable_exception(tag)
 		{ }
 
 	virtual ~GetAbortedException() throw() {}
-	
+
 	virtual const char *what() const throw() {
 		return msg.c_str();
 	}
@@ -400,7 +400,7 @@ public:
 	RequestQueueFullException()
 		: GetAbortedException(oxt::tracable_exception::no_backtrace())
 		{ }
-	
+
 	virtual const char *what() const throw() {
 		return "Request queue is full";
 	}