passenger 4.0.48 → 4.0.49

data/ext/common/ApplicationPool2/Process.h

@@ -69,11 +69,11 @@ public:
 			return *it;
 		}
 	}
-	
+
 	ProcessPtr &operator[](unsigned int index) {
 		return get(index);
 	}
-	
+
 	iterator last_iterator() {
 		if (empty()) {
 			return end();
@@ -128,7 +128,7 @@ class Process: public boost::enable_shared_from_this<Process> {
 // Actually private, but marked public so that unit tests can access the fields.
 public:
 	friend class Group;
-	
+
 	/** A mutex to protect access to `lifeStatus`. */
 	mutable boost::mutex lifetimeSyncher;
 
@@ -137,11 +137,11 @@ public:
 	 * Read-only; only set once during initialization.
 	 */
 	boost::weak_ptr<Group> group;
-	
+
 	/** A subset of 'sockets': all sockets that speak the
 	 * "session" protocol, sorted by socket.busyness(). */
 	PriorityQueue<Socket> sessionSockets;
-	
+
 	/** The iterator inside the associated Group's process list. */
 	ProcessList::iterator it;
 	/** The handle inside the associated Group's process priority queue. */
@@ -201,13 +201,13 @@ public:
 			concurrency = 0;
 		}
 	}
-	
+
 public:
 	/*************************************************************
 	 * Read-only fields, set once during initialization and never
 	 * written to again. Reading is thread-safe.
 	 *************************************************************/
-	
+
 	/** Process PID. */
 	pid_t pid;
 	/** An ID that uniquely identifies this Process in the Group, for
@@ -245,13 +245,13 @@ public:
 	 * processes are never added to Group.enabledProcesses.
 	 */
 	bool requiresShutdown;
-	
+
 	/*************************************************************
 	 * Information used by Pool. Do not write to these from
 	 * outside the Pool. If you read these make sure the Pool
 	 * isn't concurrently modifying.
 	 *************************************************************/
-	
+
 	/** Time at which we finished spawning this process, i.e. when this
 	 * process was finished initializing. Microseconds resolution.
 	 */
@@ -319,7 +319,7 @@ public:
 	time_t shutdownStartTime;
 	/** Collected by Pool::collectAnalytics(). */
 	ProcessMetrics metrics;
-	
+
 	Process(pid_t _pid,
 		const string &_gupid,
 		const string &_connectPassword,
@@ -365,15 +365,15 @@ public:
 			watcher->initialize();
 			watcher->start();
 		}
-		
+
 		if (OXT_LIKELY(sockets != NULL)) {
 			indexSessionSockets();
 		}
-		
+
 		lastUsed      = SystemTime::getUsec();
 		spawnEndTime  = lastUsed;
 	}
-	
+
 	~Process() {
 		if (OXT_UNLIKELY(!isDead() && requiresShutdown)) {
 			P_BUG("You must call Process::triggerShutdown() and Process::cleanup() before actually "
@@ -400,7 +400,7 @@ public:
 		assert(!isDead());
 		return group.lock();
 	}
-	
+
 	void setGroup(const GroupPtr &group) {
 		assert(this->group.lock() == NULL || this->group.lock() == group);
 		this->group = group;
@@ -536,7 +536,7 @@ public:
 			return 0;
 		}
 	}
-	
+
 	int busyness() const {
 		/* Different processes within a Group may have different
 		 * 'concurrency' values. We want:
@@ -557,7 +557,7 @@ public:
 			return (int) (((long long) sessions * INT_MAX) / (double) concurrency);
 		}
 	}
-	
+
 	/**
 	 * Whether we've reached the maximum number of concurrent sessions for this
 	 * process.
@@ -574,7 +574,7 @@ public:
 	bool canBeRoutedTo() const {
 		return !isTotallyBusy();
 	}
-	
+
 	/**
 	 * Create a new communication session with this process. This will connect to one
 	 * of the session sockets or reuse an existing connection. See Session for
@@ -596,13 +596,13 @@ public:
 			return boost::make_shared<Session>(shared_from_this(), socket);
 		}
 	}
-	
+
 	void sessionClosed(Session *session) {
 		Socket *socket = session->getSocket();
-		
+
 		assert(socket->sessions > 0);
 		assert(sessions > 0);
-		
+
 		socket->sessions--;
 		this->sessions--;
 		processed++;
@@ -636,7 +636,7 @@ public:
 		stream << "<last_used_desc>" << distanceOfTimeInWords(lastUsed / 1000000).c_str() << " ago</last_used_desc>";
 		stream << "<uptime>" << uptime() << "</uptime>";
 		if (!codeRevision.empty()) {
-			stream << "<code_revision>" << codeRevision << "</code_revision>";
+			stream << "<code_revision>" << escapeForXml(codeRevision) << "</code_revision>";
 		}
 		switch (lifeStatus) {
 		case ALIVE:

data/ext/common/ApplicationPool2/Session.h

@@ -57,11 +57,11 @@ private:
 	ProcessPtr process;
 	/** Socket to use for this session. Guaranteed to be alive thanks to the 'process' reference. */
 	Socket *socket;
-	
+
 	Connection connection;
 	FileDescriptor theFd;
 	bool closed;
-	
+
 	void deinitiate(bool success) {
 		connection.fail = !success;
 		socket->checkinConnection(connection);
@@ -74,7 +74,7 @@ private:
 			onInitiateFailure(this);
 		}
 	}
-	
+
 	void callOnClose() {
 		if (OXT_LIKELY(onClose != NULL)) {
 			onClose(this);
@@ -85,7 +85,7 @@ private:
 public:
 	Callback onInitiateFailure;
 	Callback onClose;
-	
+
 	Session(const ProcessPtr &_process, Socket *_socket)
 		: process(_process),
 		  socket(_socket),
@@ -93,7 +93,7 @@ public:
 		  onInitiateFailure(NULL),
 		  onClose(NULL)
 		{ }
-	
+
 	~Session() {
 		TRACE_POINT();
 		// If user doesn't close() explicitly, we penalize performance.
@@ -112,7 +112,7 @@ public:
 	const GroupPtr getGroup() const;
 	void requestOOBW();
 	int kill(int signo);
-	
+
 	bool isClosed() const {
 		return closed;
 	}
@@ -125,7 +125,7 @@ public:
 		assert(!closed);
 		return process;
 	}
-	
+
 	Socket *getSocket() const {
 		return socket;
 	}
@@ -133,7 +133,7 @@ public:
 	const string &getProtocol() const {
 		return socket->protocol;
 	}
-	
+
 	void initiate() {
 		assert(!closed);
 		ScopeGuard g(boost::bind(&Session::callOnInitiateFailure, this));
@@ -142,15 +142,15 @@ public:
 		theFd = FileDescriptor(connection.fd, false);
 		g.clear();
 	}
-	
+
 	bool initiated() const {
 		return connection.fd != -1;
 	}
-	
+
 	const FileDescriptor &fd() const {
 		return theFd;
 	}
-	
+
 	/**
 	 * This Session object becomes fully unsable after closing.
 	 */

data/ext/common/ApplicationPool2/SmartSpawner.h

@@ -68,7 +68,7 @@ private:
 	const vector<string> preloaderCommand;
 	map<string, string> preloaderAnnotations;
 	Options options;
-	
+
 	// Protects m_lastUsed and pid.
 	mutable boost::mutex simpleFieldSyncher;
 	// Protects everything else.
@@ -82,11 +82,11 @@ private:
 	// Upon starting the preloader, its preparation info is stored here
 	// for future reference.
 	SpawnPreparationInfo preparation;
-	
+
 	string getPreloaderCommandString() const {
 		string result;
 		unsigned int i;
-		
+
 		for (i = 0; i < preloaderCommand.size(); i++) {
 			if (i != 0) {
 				result.append(1, '\0');
@@ -95,13 +95,13 @@ private:
 		}
 		return result;
 	}
-	
+
 	vector<string> createRealPreloaderCommand(const Options &options,
 		shared_array<const char *> &args)
 	{
 		string agentsDir = config->resourceLocator.getAgentsDir();
 		vector<string> command;
-		
+
 		if (shouldLoadShellEnvvars(options, preparation)) {
 			command.push_back(preparation.shell);
 			command.push_back(preparation.shell);
@@ -121,11 +121,11 @@ private:
 		for (unsigned int i = 1; i < preloaderCommand.size(); i++) {
 			command.push_back(preloaderCommand[i]);
 		}
-		
+
 		createCommandArgs(command, args);
 		return command;
 	}
-	
+
 	void throwPreloaderSpawnException(const string &msg,
 		SpawnException::ErrorKind errorKind,
 		StartupDetails &details)
@@ -147,7 +147,7 @@ private:
 		if (stderrCapturer != NULL) {
 			stderrOutput = stderrCapturer->stop();
 		}
-		
+
 		// If the exception wasn't due to a timeout, try to capture the
 		// remaining stderr output for at most 2 seconds.
 		if (errorKind != SpawnException::PRELOADER_STARTUP_TIMEOUT
@@ -159,7 +159,7 @@ private:
 			while (!done) {
 				char buf[1024 * 32];
 				unsigned int ret;
-				
+
 				try {
 					ret = readExact(stderrCapturer->getFd(), buf,
 						sizeof(buf), &timeout);
@@ -177,7 +177,7 @@ private:
 			}
 		}
 		stderrCapturer.reset();
-		
+
 		// Now throw SpawnException with the captured stderr output
 		// as error response.
 		SpawnException e(msg,
@@ -206,7 +206,7 @@ private:
 		assert(!preloaderStarted());
 		P_DEBUG("Spawning new preloader: appRoot=" << options.appRoot);
 		checkChrootDirectories(options);
-		
+
 		shared_array<const char *> args;
 		preparation = prepareSpawn(options);
 		vector<string> command = createRealPreloaderCommand(options, args);
@@ -214,7 +214,7 @@ private:
 		Pipe errorPipe = createPipe();
 		DebugDirPtr debugDir = boost::make_shared<DebugDir>(preparation.uid, preparation.gid);
 		pid_t pid;
-		
+
 		pid = syscalls::fork();
 		if (pid == 0) {
 			setenv("PASSENGER_DEBUG_DIR", debugDir->getPath().c_str(), 1);
@@ -232,7 +232,7 @@ private:
 			switchUser(preparation);
 			setWorkingDirectory(preparation);
 			execvp(command[0].c_str(), (char * const *) args.get());
-			
+
 			int e = errno;
 			printf("!> Error\n");
 			printf("!> \n");
@@ -243,17 +243,17 @@ private:
 			fflush(stdout);
 			fflush(stderr);
 			_exit(1);
-			
+
 		} else if (pid == -1) {
 			int e = errno;
 			throw SystemException("Cannot fork a new process", e);
-			
+
 		} else {
 			ScopeGuard guard(boost::bind(nonInterruptableKillAndWaitpid, pid));
 			P_DEBUG("Preloader process forked for appRoot=" << options.appRoot << ": PID " << pid);
 			adminSocket.first.close();
 			errorPipe.second.close();
-			
+
 			StartupDetails details;
 			details.pid = pid;
 			details.adminSocket = adminSocket.second;
@@ -268,7 +268,7 @@ private:
 			details.debugDir = debugDir;
 			details.options = &options;
 			details.timeout = options.startTimeout * 1000;
-			
+
 			{
 				this_thread::restore_interruption ri(di);
 				this_thread::restore_syscall_interruption rsi(dsi);
@@ -279,7 +279,7 @@ private:
 				boost::lock_guard<boost::mutex> l(simpleFieldSyncher);
 				this->pid = pid;
 			}
-			
+
 			PipeWatcherPtr watcher;
 
 			watcher = boost::make_shared<PipeWatcher>(adminSocket.second,
@@ -291,7 +291,7 @@ private:
 				"stderr", pid);
 			watcher->initialize();
 			watcher->start();
-			
+
 			preloaderAnnotations = debugDir->readAll();
 			P_INFO("Preloader for " << options.appRoot <<
 				" started on PID " << pid <<
@@ -299,12 +299,12 @@ private:
 			guard.clear();
 		}
 	}
-	
+
 	void stopPreloader() {
 		TRACE_POINT();
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
-		
+
 		if (!preloaderStarted()) {
 			return;
 		}
@@ -327,7 +327,7 @@ private:
 		socketAddress.clear();
 		preparation = SpawnPreparationInfo();
 	}
-	
+
 	void sendStartupRequest(StartupDetails &details) {
 		TRACE_POINT();
 		try {
@@ -375,14 +375,14 @@ private:
 				details);
 		}
 	}
-	
+
 	string handleStartupResponse(StartupDetails &details) {
 		TRACE_POINT();
 		string socketAddress;
-		
+
 		while (true) {
 			string line;
-			
+
 			try {
 				line = readMessageLine(details);
 			} catch (const SystemException &e) {
@@ -397,7 +397,7 @@ private:
 					SpawnException::PRELOADER_STARTUP_TIMEOUT,
 					details);
 			}
-			
+
 			if (line.empty()) {
 				throwPreloaderSpawnException("An error occurred while starting up "
 					"the preloader. It unexpected closed the connection while "
@@ -413,7 +413,7 @@ private:
 			} else if (line == "\n") {
 				break;
 			}
-			
+
 			string::size_type pos = line.find(": ");
 			if (pos == string::npos) {
 				throwPreloaderSpawnException("An error occurred while starting up "
@@ -422,7 +422,7 @@ private:
 					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
 					details);
 			}
-			
+
 			string key = line.substr(0, pos);
 			string value = line.substr(pos + 2, line.size() - pos - 3);
 			if (key == "socket") {
@@ -436,7 +436,7 @@ private:
 					details);
 			}
 		}
-		
+
 		if (socketAddress.empty()) {
 			throwPreloaderSpawnException("An error occurred while starting up "
 				"the preloader. It did not report a socket address in its "
@@ -444,17 +444,17 @@ private:
 				SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
 				details);
 		}
-		
+
 		return socketAddress;
 	}
-	
+
 	void handleErrorResponse(StartupDetails &details) {
 		TRACE_POINT();
 		map<string, string> attributes;
-		
+
 		while (true) {
 			string line;
-			
+
 			try {
 				line = readMessageLine(details);
 			} catch (const SystemException &e) {
@@ -469,7 +469,7 @@ private:
 					SpawnException::PRELOADER_STARTUP_TIMEOUT,
 					details);
 			}
-			
+
 			if (line.empty()) {
 				throwPreloaderSpawnException("An error occurred while starting up "
 					"the preloader. It unexpected closed the connection while "
@@ -485,7 +485,7 @@ private:
 			} else if (line == "\n") {
 				break;
 			}
-			
+
 			string::size_type pos = line.find(": ");
 			if (pos == string::npos) {
 				throwPreloaderSpawnException("An error occurred while starting up "
@@ -494,12 +494,12 @@ private:
 					SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR,
 					details);
 			}
-			
+
 			string key = line.substr(0, pos);
 			string value = line.substr(pos + 2, line.size() - pos - 3);
 			attributes[key] = value;
 		}
-		
+
 		try {
 			string message = details.io.readAll(&details.timeout);
 			SpawnException e("An error occured while starting up the preloader.",
@@ -524,7 +524,7 @@ private:
 				details);
 		}
 	}
-	
+
 	void handleInvalidResponseType(StartupDetails &details, const string &line) {
 		if (line.empty()) {
 			throwPreloaderSpawnException("An error occurred while starting up "
@@ -540,7 +540,7 @@ private:
 				details);
 		}
 	}
-	
+
 	string negotiatePreloaderStartup(StartupDetails &details) {
 		TRACE_POINT();
 		string result;
@@ -558,7 +558,7 @@ private:
 				SpawnException::PRELOADER_STARTUP_TIMEOUT,
 				details);
 		}
-		
+
 		if (result == "I have control 1.0\n") {
 			UPDATE_TRACE_POINT();
 			sendStartupRequest(details);
@@ -591,12 +591,12 @@ private:
 				handleInvalidResponseType(details, result);
 			}
 		}
-		
+
 		// Never reached, shut up compiler warning.
 		abort();
 		return "";
 	}
-	
+
 	SpawnResult sendSpawnCommand(const Options &options) {
 		TRACE_POINT();
 		FileDescriptor fd;
@@ -612,14 +612,14 @@ private:
 				options,
 				DebugDirPtr());
 		}
-		
+
 		UPDATE_TRACE_POINT();
 		BufferedIO io(fd);
 		unsigned long long timeout = options.startTimeout * 1000;
 		string result;
 		vector<string> args;
 		vector<string>::const_iterator it;
-		
+
 		writeExact(fd, "spawn\n", &timeout);
 		options.toVector(args, config->resourceLocator, Options::SPAWN_OPTIONS);
 		for (it = args.begin(); it != args.end(); it++) {
@@ -629,12 +629,12 @@ private:
 			writeExact(fd, key + ": " + value + "\n", &timeout);
 		}
 		writeExact(fd, "\n", &timeout);
-		
+
 		result = io.readLine(1024, &timeout);
 		if (result == "OK\n") {
 			UPDATE_TRACE_POINT();
 			pid_t spawnedPid;
-			
+
 			spawnedPid = atoi(io.readLine(1024, &timeout).c_str());
 			if (spawnedPid <= 0) {
 				BackgroundIOCapturerPtr stderrCapturer;
@@ -660,29 +660,29 @@ private:
 					options,
 					DebugDirPtr());
 			}
-			
+
 			SpawnResult result;
 			result.pid = spawnedPid;
 			result.adminSocket = fd;
 			result.io = io;
 			return result;
-			
+
 		} else if (result == "Error\n") {
 			UPDATE_TRACE_POINT();
 			NegotiationDetails details;
 			details.io = io;
 			details.timeout = timeout;
 			handleSpawnErrorResponse(details);
-			
+
 		} else {
 			UPDATE_TRACE_POINT();
 			NegotiationDetails details;
 			handleInvalidSpawnResponseType(result, details);
 		}
-		
+
 		return SpawnResult(); // Never reached.
 	}
-	
+
 	template<typename Exception>
 	SpawnResult sendSpawnCommandAgain(const Exception &e, const Options &options) {
 		TRACE_POINT();
@@ -695,7 +695,7 @@ private:
 		guard.clear();
 		return result;
 	}
-	
+
 protected:
 	virtual void annotateAppSpawnException(SpawnException &e, NegotiationDetails &details) {
 		Spawner::annotateAppSpawnException(e, details);
@@ -713,23 +713,23 @@ public:
 		if (preloaderCommand.size() < 2) {
 			throw ArgumentException("preloaderCommand must have at least 2 elements");
 		}
-		
+
 		generation = _generation;
 		options    = _options.copyAndPersist().detachFromUnionStationTransaction();
 		pid        = -1;
 		m_lastUsed = SystemTime::getUsec();
 	}
-	
+
 	virtual ~SmartSpawner() {
 		boost::lock_guard<boost::mutex> l(syncher);
 		stopPreloader();
 	}
-	
+
 	virtual ProcessPtr spawn(const Options &options) {
 		TRACE_POINT();
 		assert(options.appType == this->options.appType);
 		assert(options.appRoot == this->options.appRoot);
-		
+
 		P_DEBUG("Spawning new process: appRoot=" << options.appRoot);
 		possiblyRaiseInternalError(options);
 
@@ -743,7 +743,7 @@ public:
 			UPDATE_TRACE_POINT();
 			startPreloader();
 		}
-		
+
 		UPDATE_TRACE_POINT();
 		SpawnResult result;
 		try {
@@ -755,7 +755,7 @@ public:
 		} catch (const SpawnException &e) {
 			result = sendSpawnCommandAgain(e, options);
 		}
-		
+
 		UPDATE_TRACE_POINT();
 		NegotiationDetails details;
 		details.preparation = &preparation;
@@ -772,7 +772,7 @@ public:
 	virtual bool cleanable() const {
 		return true;
 	}
-	
+
 	virtual void cleanup() {
 		TRACE_POINT();
 		{
@@ -787,7 +787,7 @@ public:
 		boost::lock_guard<boost::mutex> lock(simpleFieldSyncher);
 		return m_lastUsed;
 	}
-	
+
 	pid_t getPreloaderPid() const {
 		boost::lock_guard<boost::mutex> lock(simpleFieldSyncher);
 		return pid;