passenger 4.0.48 → 4.0.49

data/ext/common/ApplicationPool2/SpawnerFactory.h

@@ -44,7 +44,7 @@ private:
 	boost::mutex syncher;
 	SpawnerConfigPtr config;
 	DummySpawnerPtr dummySpawner;
-	
+
 	SpawnerPtr tryCreateSmartSpawner(const Options &options) {
 		string dir = config->resourceLocator.getHelperScriptsDir();
 		vector<string> preloaderCommand;
@@ -60,16 +60,16 @@ private:
 		return boost::make_shared<SmartSpawner>(generation, preloaderCommand,
 			options, config);
 	}
-	
+
 public:
 	SpawnerFactory(const ServerInstanceDir::GenerationPtr &_generation,
 		const SpawnerConfigPtr &_config)
 		: generation(_generation),
 		  config(_config)
 		{ }
-	
+
 	virtual ~SpawnerFactory() { }
-	
+
 	virtual SpawnerPtr create(const Options &options) {
 		if (options.spawnMethod == "smart" || options.spawnMethod == "smart-lv2") {
 			SpawnerPtr spawner = tryCreateSmartSpawner(options);

data/ext/common/ApplicationPool2/SuperGroup.h

@@ -122,12 +122,12 @@ public:
 		 * failed it will transition to `DESTROYED`.
 		 */
 		INITIALIZING,
-		
+
 		/** This SuperGroup is loaded and is ready for action. From
 		 * here the state can transition to `RESTARTING` or `DESTROYING`.
 		 */
 		READY,
-		
+
 		/** This SuperGroup is being restarted. The SuperGroup
 		 * information is being reloaded from the data source
 		 * and processes are being restarted. In this state
@@ -143,7 +143,7 @@ public:
 		 * cause a transition to `DESTROYING`.
 		 */
 		RESTARTING,
-		
+
 		/** This SuperGroup is being destroyed. Processes are being shut
 		 * down and other resources are being cleaned up. In this state,
 		 * `groups` is empty.
@@ -151,7 +151,7 @@ public:
 		 * transition to `INITIALIZING`.
 		 */
 		DESTROYING,
-		
+
 		/** This SuperGroup has been destroyed and all resources have been
 		 * freed. Restarting won't have any effect but calling `get()` will
 		 * make it transition to `INITIALIZING`.
@@ -169,11 +169,11 @@ public:
 	};
 
 	typedef boost::function<void (ShutdownResult result)> ShutdownCallback;
-	
+
 private:
 	friend class Pool;
 	friend class Group;
-	
+
 	Options options;
 	/** A number for concurrency control, incremented every time the state changes.
 	 * Every background thread that SuperGroup spawns knows the generation number
@@ -186,8 +186,8 @@ private:
 	 * problems.
 	 */
 	unsigned int generation;
-	
-	
+
+
 	// Thread-safe.
 	static boost::mutex &getPoolSyncher(const PoolPtr &pool);
 	static void runAllActions(const vector<Callback> &actions);
@@ -195,13 +195,13 @@ private:
 	void runInitializationHooks() const;
 	void runDestructionHooks() const;
 	void setupInitializationOrDestructionHook(HookScriptOptions &options) const;
-	
+
 	void createInterruptableThread(const boost::function<void ()> &func, const string &name,
 		unsigned int stackSize);
-	
+
 	void verifyInvariants() const {
 		// !a || b: logical equivalent of a IMPLIES b.
-		
+
 		assert(groups.empty() ==
 			(state == INITIALIZING || state == DESTROYING || state == DESTROYED));
 		assert((defaultGroup == NULL) ==
@@ -210,7 +210,7 @@ private:
 			( getWaitlist.empty() ));
 		assert(!( state == DESTROYED ) || ( detachedGroups.empty() ));
 	}
-	
+
 	void setState(State newState) {
 		state = newState;
 		generation++;
@@ -224,10 +224,10 @@ private:
 		infos.push_back(info);
 		return infos;
 	}
-	
+
 	Group *findDefaultGroup(const vector<GroupPtr> &groups) const {
 		vector<GroupPtr>::const_iterator it;
-		
+
 		for (it = groups.begin(); it != groups.end(); it++) {
 			const GroupPtr &group = *it;
 			if (group->componentInfo.isDefault) {
@@ -236,7 +236,7 @@ private:
 		}
 		return NULL;
 	}
-	
+
 	pair<GroupPtr, unsigned int> findGroupCorrespondingToComponent(
 		const vector<GroupPtr> &groups, const ComponentInfo &info) const
 	{
@@ -249,7 +249,7 @@ private:
 		}
 		return make_pair(GroupPtr(), 0);
 	}
-	
+
 	static void oneGroupHasBeenShutDown(SuperGroupPtr self, GroupPtr group) {
 		// This function is either called from the pool event loop or directly from
 		// the detachAllGroups post lock actions. In both cases getPool() is never NULL.
@@ -264,7 +264,7 @@ private:
 			}
 		}
 	}
-	
+
 	/** One of the post lock actions can potentially perform a long-running
 	 * operation, so running them in a thread is advised.
 	 */
@@ -274,7 +274,7 @@ private:
 			if (group == NULL) {
 				continue;
 			}
-			
+
 			while (!group->getWaitlist.empty()) {
 				getWaitlist.push_back(group->getWaitlist.front());
 				group->getWaitlist.pop_front();
@@ -290,7 +290,7 @@ private:
 
 		groups.clear();
 	}
-	
+
 	void assignGetWaitlistToGroups(vector<Callback> &postLockActions) {
 		while (!getWaitlist.empty()) {
 			GetWaiter &waiter = getWaitlist.front();
@@ -306,7 +306,7 @@ private:
 			getWaitlist.pop_front();
 		}
 	}
-	
+
 	void adjustOptions(Options &options, const Group *group) const {
 		// No-op.
 	}
@@ -321,12 +321,12 @@ private:
 
 	void realDoInitialize(const Options &options, unsigned int generation);
 	void realDoRestart(const Options &options, unsigned int generation);
-	
+
 	void doDestroy(SuperGroupPtr self, unsigned int generation, ShutdownCallback callback) {
 		TRACE_POINT();
-		
+
 		runDestructionHooks();
-		
+
 		// Wait until 'detachedGroups' is empty.
 		UPDATE_TRACE_POINT();
 		PoolPtr pool = getPool();
@@ -350,7 +350,7 @@ private:
 				verifyInvariants();
 			}
 		}
-		
+
 		UPDATE_TRACE_POINT();
 		assert(state == DESTROYING);
 		state = DESTROYED;
@@ -361,29 +361,29 @@ private:
 			callback(SUCCESS);
 		}
 	}
-	
+
 	/*********************/
-	
+
 	/*********************/
-	
+
 public:
 	mutable boost::mutex backrefSyncher;
 	const boost::weak_ptr<Pool> pool;
-	
+
 	State state;
 	string name;
 	string secret;
-	
+
 	/** Invariant:
 	 * groups.empty() == (state == INITIALIZING || state == DESTROYING || state == DESTROYED)
 	 */
 	vector<GroupPtr> groups;
-	
+
 	/** Invariant:
 	 * (defaultGroup == NULL) == (state == INITIALIZING || state == DESTROYING || state == DESTROYED)
 	 */
 	Group *defaultGroup;
-	
+
 	/**
 	 * get() requests for this super group that cannot be immediately satisfied
 	 * are put on this wait list, which must be processed as soon as the
@@ -413,7 +413,7 @@ public:
 	 *       detachedGroups.empty()
 	 */
 	vector<GroupPtr> detachedGroups;
-	
+
 	/** One MUST call initialize() after construction because shared_from_this()
 	 * is not available in the constructor.
 	 */
@@ -446,7 +446,7 @@ public:
 			"SuperGroup initializer: " + name,
 			POOL_HELPER_THREAD_STACK_SIZE);
 	}
-	
+
 	/**
 	 * Thread-safe.
 	 *
@@ -462,7 +462,7 @@ public:
 	bool isAlive() const {
 		return state != DESTROYING && state != DESTROYED;
 	}
-	
+
 	const char *getStateName() const {
 		switch (state) {
 		case INITIALIZING:
@@ -551,7 +551,7 @@ public:
 			verifyInvariants();
 		}
 	}
-	
+
 	/**
 	 * @post
 	 *    if result:
@@ -561,7 +561,7 @@ public:
 		/* if (state == READY) {
 			vector<GroupPtr>::const_iterator it, end = groups.end();
 			bool result = true;
-			
+
 			for (it = groups.begin(); result && it != end; it++) {
 				result = result && (*it)->garbageCollectable(now);
 			}
@@ -573,7 +573,7 @@ public:
 		} */
 		return false;
 	}
-	
+
 	SessionPtr get(const Options &newOptions, const GetCallback &callback,
 		vector<Callback> &postLockActions)
 	{
@@ -616,15 +616,15 @@ public:
 			return SessionPtr(); // Shut up compiler warning.
 		};
 	}
-	
+
 	Group *route(const Options &options) const {
 		return defaultGroup;
 	}
-	
+
 	unsigned int capacityUsed() const {
 		vector<GroupPtr>::const_iterator it, end = groups.end();
 		unsigned int result = 0;
-		
+
 		for (it = groups.begin(); it != end; it++) {
 			result += (*it)->capacityUsed();
 		}
@@ -647,7 +647,7 @@ public:
 	bool needsRestart() const {
 		return false;
 	}
-	
+
 	void restart(const Options &options) {
 		verifyInvariants();
 		if (state == READY) {

data/ext/common/BackgroundEventLoop.cpp

@@ -63,7 +63,7 @@ startBackgroundLoop(BackgroundEventLoop *bg) {
 
 BackgroundEventLoop::BackgroundEventLoop(bool scalable) {
 	TRACE_POINT();
-	
+
 	if (scalable) {
 		loop = ev_loop_new(EVBACKEND_KQUEUE);
 		if (loop == NULL) {

data/ext/common/BackgroundEventLoop.h

@@ -48,10 +48,10 @@ namespace Passenger {
 		ev_async *async;
 		boost::shared_ptr<SafeLibev> safe;
 		BackgroundEventLoopPrivate *priv;
-		
+
 		BackgroundEventLoop(bool scalable = false);
 		~BackgroundEventLoop();
-		
+
 		void start(const string &threadName = "", unsigned int stackSize = 1024 * 1024);
 		void stop();
 		bool isStarted() const;

data/ext/common/Constants.h

@@ -90,7 +90,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.48"
+	#define PASSENGER_VERSION "4.0.49"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/EventedBufferedInput.h

@@ -90,7 +90,7 @@ private:
 	/**
 	 * Whether this EventedBufferedInput is paused (not started). If it's
 	 * paused it should not emit data events.
-	 * 
+	 *
 	 * @invariant
 	 *    if paused:
 	 *       socketPaused
@@ -123,13 +123,13 @@ private:
 
 	void verifyInvariants() {
 		// !a || b: logical equivalent of a IMPLIES b.
-		
+
 		assert(!( state == END_OF_STREAM ) || ( paused ));
 		assert(!( state == END_OF_STREAM ) || ( socketPaused ));
-		
+
 		assert(!( state == READ_ERROR ) || ( paused ));
 		assert(!( state == READ_ERROR ) || ( socketPaused ));
-		
+
 		assert(!( paused ) || ( socketPaused ));
 	}
 
@@ -381,7 +381,7 @@ public:
 			EBI_TRACE("start()");
 			verifyInvariants();
 			assert(socketPaused);
-			
+
 			paused = false;
 			if (!buffer.empty()) {
 				processBufferInNextTick();

data/ext/common/EventedClient.h

@@ -91,7 +91,7 @@ using namespace oxt;
  * void onReadable(EventedClient *client) {
  *     // do whatever you want
  * }
- * 
+ *
  * ...
  * client->onReadable = onReadable;
  * client->notifyReads(true);
@@ -107,7 +107,7 @@ class EventedClient {
 public:
 	typedef void (*Callback)(EventedClient *client);
 	typedef void (*SystemErrorCallback)(EventedClient *client, const string &message, int code);
-	
+
 protected:
 	enum {
 		/**
@@ -117,7 +117,7 @@ protected:
 		 * only be watching for read events.
 		 */
 		EC_CONNECTED,
-		
+
 		/**
 		 * This state is entered from EC_CONNECTED when the write()
 		 * method fails to send all data immediately and EventedClient
@@ -127,7 +127,7 @@ protected:
 		 * will transition back to EC_CONNECTED.
 		 */
 		EC_WRITES_PENDING,
-		
+
 		/**
 		 * This state is entered from EC_WRITES_PENDING or from EC_CONNECTED
 		 * when the write() method fails to send all data immediately, and
@@ -139,14 +139,14 @@ protected:
 		 * to EC_CONNECTED.
 		 */
 		EC_TOO_MANY_WRITES_PENDING,
-		
+
 		/**
 		 * This state is like EC_CONNECTED, but indicates that the write
 		 * side of the connection has been closed. In this state write()
 		 * calls won't have any effect.
 		 */
 		EC_RO_CONNECTED,
-		
+
 		/**
 		 * This state is entered from EC_WRITES_PENDING when
 		 * closeWrite() has been called. The system will continue
@@ -155,7 +155,7 @@ protected:
 		 * the system will transition to EC_RO_CONNECTED.
 		 */
 		EC_RO_CONNECTED_WITH_WRITES_PENDING,
-		
+
 		/**
 		 * This state is entered from the EC_WRITES_PENDING,
 		 * EC_TOO_MANY_WRITES_PENDING, EC_RO_CONNECTED_WITH_WIRTES_PENDING
@@ -167,14 +167,14 @@ protected:
 		 * I/O should be allowed.
 		 */
 		EC_DISCONNECTING_WITH_WRITES_PENDING,
-		
+
 		/**
 		 * Final state. Client connection has been closed. No
 		 * I/O with the client is possible.
 		 */
 		EC_DISCONNECTED
 	} state;
-	
+
 	/** A libev watcher on for watching read events on <tt>fd</tt>. */
 	ev::io readWatcher;
 	/** A libev watcher on for watching write events on <tt>fd</tt>. */
@@ -184,21 +184,21 @@ protected:
 	int refcount;
 	unsigned int outboxLimit;
 	bool m_notifyReads;
-	
+
 	void _onReadable(ev::io &w, int revents) {
 		emitEvent(onReadable);
 	}
-	
+
 	void onWritable(ev::io &w, int revents) {
 		assert(state != EC_CONNECTED);
 		assert(state != EC_RO_CONNECTED);
 		assert(state != EC_DISCONNECTED);
-		
+
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
 		size_t sent = 0;
 		bool done = outbox.empty();
-		
+
 		while (!done) {
 			ssize_t ret = syscalls::write(fd,
 				outbox.data() + sent,
@@ -223,17 +223,17 @@ protected:
 		if (sent > 0) {
 			outbox.erase(0, sent);
 		}
-		
+
 		updateWatcherStates();
 		if (outbox.empty()) {
 			emitEvent(onPendingDataFlushed);
 		}
 	}
-	
+
 	bool outboxTooLarge() {
 		return outbox.size() > 0 && outbox.size() >= outboxLimit;
 	}
-	
+
 	void updateWatcherStates() {
 		if (outbox.empty()) {
 			switch (state) {
@@ -303,7 +303,7 @@ protected:
 			}
 		}
 	}
-	
+
 	void watchReadEvents(bool enable = true) {
 		if (readWatcher.is_active() && !enable) {
 			readWatcher.stop();
@@ -311,7 +311,7 @@ protected:
 			readWatcher.start();
 		}
 	}
-	
+
 	void watchWriteEvents(bool enable = true) {
 		if (writeWatcher.is_active() && !enable) {
 			writeWatcher.stop();
@@ -319,23 +319,23 @@ protected:
 			writeWatcher.start();
 		}
 	}
-	
+
 	void emitEvent(Callback callback) {
 		if (callback != NULL) {
 			callback(this);
 		}
 	}
-	
+
 	void emitSystemErrorEvent(const string &message, int code) {
 		if (onSystemError != NULL) {
 			onSystemError(this, message, code);
 		}
 	}
-	
+
 public:
 	/** The client's file descriptor. Could be -1: see <tt>ioAllowed()</tt>. */
 	FileDescriptor fd;
-	
+
 	/** Controls what to do when a write error is encountered. */
 	enum {
 		/** Forcefully disconnect the client. */
@@ -343,7 +343,7 @@ public:
 		/** Close the writer side of the connection, but continue allowing reading. */
 		DISCONNECT_WRITE
 	} writeErrorAction;
-	
+
 	/**
 	 * Called when the file descriptor becomes readable and read notifications
 	 * are enabled (see <tt>notifyRead()</tt>). When there's too much pending
@@ -351,7 +351,7 @@ public:
 	 * <tt>write()</tt> for details.
 	 */
 	Callback onReadable;
-	
+
 	/**
 	 * Called when the client is disconnected. This happens either immediately
 	 * when <tt>disconnect()</tt> is called, or a short amount of time later.
@@ -361,12 +361,12 @@ public:
 	 * this callback to be called.
 	 */
 	Callback onDisconnect;
-	
+
 	/**
 	 * Called when <tt>detach()</tt> is called for the first time.
 	 */
 	Callback onDetach;
-	
+
 	/**
 	 * Called after all pending outgoing data have been written out.
 	 * If <tt>write()</tt> can be completed immediately without scheduling
@@ -374,17 +374,17 @@ public:
 	 * immediately after writing.
 	 */
 	Callback onPendingDataFlushed;
-	
+
 	/**
 	 * System call errors are reported with this callback.
 	 */
 	SystemErrorCallback onSystemError;
-	
+
 	/**
 	 * EventedClient doesn't do anything with this. Set it to whatever you want.
 	 */
 	void *userData;
-	
+
 	/**
 	 * Creates a new EventedClient with the given libev loop and file descriptor.
 	 * The initial reference count is 1.
@@ -410,21 +410,21 @@ public:
 		writeWatcher.set<EventedClient, &EventedClient::onWritable>(this);
 		writeWatcher.set(fd, ev::WRITE);
 	}
-	
+
 	virtual ~EventedClient() {
 		// Unregister file descriptor from the event loop poller before
 		// closing the file descriptor.
 		watchReadEvents(false);
 		watchWriteEvents(false);
 	}
-	
+
 	/**
 	 * Increase reference count.
 	 */
 	void ref() {
 		refcount++;
 	}
-	
+
 	/**
 	 * Decrease reference count. Upon reaching 0, this EventedClient object
 	 * will be destroyed.
@@ -436,7 +436,7 @@ public:
 			delete this;
 		}
 	}
-	
+
 	/**
 	 * Returns whether it is allowed to perform some kind of I/O with
 	 * this client, either reading or writing.
@@ -452,7 +452,7 @@ public:
 		return state != EC_DISCONNECTING_WITH_WRITES_PENDING
 			&& state != EC_DISCONNECTED;
 	}
-	
+
 	/**
 	 * Returns whether it is allowed to write data to the client.
 	 * Usually true, and false when the client is either being disconnected
@@ -466,22 +466,22 @@ public:
 			|| state == EC_TOO_MANY_WRITES_PENDING
 			|| state == EC_RO_CONNECTED_WITH_WRITES_PENDING;
 	}
-	
+
 	/** Used by unit tests. */
 	bool readWatcherActive() const {
 		return readWatcher.is_active();
 	}
-	
+
 	/**
 	 * Returns the number of bytes that are scheduled to be sent to the
 	 * client at a later time.
-	 * 
+	 *
 	 * @see write()
 	 */
 	size_t pendingWrites() const {
 		return outbox.size();
 	}
-	
+
 	/**
 	 * Sets whether you're interested in read events. This will start or
 	 * stop the input readiness watcher appropriately according to the
@@ -494,13 +494,13 @@ public:
 		if (!ioAllowed()) {
 			return;
 		}
-		
+
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
 		m_notifyReads = enable;
 		updateWatcherStates();
 	}
-	
+
 	/**
 	 * Sets a limit on the client outbox. The outbox is where data is stored
 	 * that could not be immediately sent to the client, e.g. because of
@@ -521,17 +521,17 @@ public:
 		if (!ioAllowed()) {
 			return;
 		}
-		
+
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
 		outboxLimit = size;
 		updateWatcherStates();
 	}
-	
+
 	void write(const StaticString &data) {
 		write(&data, 1);
 	}
-	
+
 	/**
 	 * Sends data to this client. This method will try to send the data
 	 * immediately (in which no intermediate copies of the data will be made),
@@ -558,11 +558,11 @@ public:
 		if (!writeAllowed()) {
 			return;
 		}
-		
+
 		ssize_t ret;
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
-		
+
 		ret = gatheredWrite(fd, data, count, outbox);
 		if (ret == -1) {
 			int e = errno;
@@ -579,7 +579,7 @@ public:
 			}
 		}
 	}
-	
+
 	/**
 	 * Close only the writer side of the client connection.
 	 * After calling this method, subsequent write() calls won't do anything
@@ -591,7 +591,7 @@ public:
 	 */
 	void closeWrite() {
 		this_thread::disable_syscall_interruption dsi;
-		
+
 		switch (state) {
 		case EC_CONNECTED:
 			assert(outbox.empty());
@@ -612,7 +612,7 @@ public:
 		}
 		updateWatcherStates();
 	}
-	
+
 	/**
 	 * Disconnects the client. This actually closes the underlying file
 	 * descriptor, even if the FileDescriptor object still has references.
@@ -642,10 +642,10 @@ public:
 		if (!ioAllowed() && !(state == EC_DISCONNECTING_WITH_WRITES_PENDING && force)) {
 			return;
 		}
-		
+
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
-		
+
 		if (state == EC_CONNECTED || state == EC_RO_CONNECTED || force) {
 			state = EC_DISCONNECTED;
 			watchReadEvents(false);
@@ -668,7 +668,7 @@ public:
 			}
 		}
 	}
-	
+
 	/**
 	 * Detaches the client file descriptor so that this EventedClient no longer
 	 * has any control over it. Any EventedClient I/O watchers on the client file