passenger 4.0.27 → 4.0.28

data/ext/common/Logging.h

@@ -124,7 +124,29 @@ enum PassengerLogLevel {
 	#define P_TRACE(level, expr) do { /* nothing */ } while (false)
 #endif
 
+/**
+ * Print a message that was received from an application's stdout/stderr.
+ *
+ * @param pid The application's PID.
+ * @param channelName "stdout" or "stderr".
+ * @param message The message that was received.
+ */
+void printAppOutput(pid_t pid, const char *channelName, const char *message, unsigned int size);
+
+/**
+ * Controls how messages that are received from applications are printed.
+ *
+ * If `enabled` is true then messages are printed using P_DEBUG, meaning that
+ * the normal Passenger logging prefixes will be printed as well.
+ *
+ * If `enabled` is false (the default), then messages are printed directly
+ * to the log output channel using write(), with only a very short prefix
+ * that contains the PID and channel name.
+ */
+void setPrintAppOutputAsDebuggingMessages(bool enabled);
+
 
+/** Print a [BUG] error message and abort with a stack trace. */
 #define P_BUG(expr) \
 	do { \
 		TRACE_POINT(); \
@@ -165,7 +187,7 @@ public:
 
 /**
  * Put this in code sections where you don't expect *any* exceptions to be thrown.
- * This macro will automatically disables interruptions in the current scope,
+ * This macro will automatically disable interruptions in the current scope,
  * and will print an error message whenever the scope exits with an exception.
  *
  * When inside critical sections, you should put this macro right after the lock

data/ext/common/Utils.cpp

@@ -731,27 +731,6 @@ removeDirTree(const string &path) {
 	}
 }
 
-bool
-verifyRailsDir(const string &dir, CachedFileStat *cstat, unsigned int throttleRate) {
-	string temp(dir);
-	temp.append("/config/environment.rb");
-	return fileExists(temp, cstat, throttleRate);
-}
-
-bool
-verifyRackDir(const string &dir, CachedFileStat *cstat, unsigned int throttleRate) {
-	string temp(dir);
-	temp.append("/config.ru");
-	return fileExists(temp, cstat, throttleRate);
-}
-
-bool
-verifyWSGIDir(const string &dir, CachedFileStat *cstat, unsigned int throttleRate) {
-	string temp(dir);
-	temp.append("/passenger_wsgi.py");
-	return fileExists(temp, cstat, throttleRate);
-}
-
 void
 prestartWebApps(const ResourceLocator &locator, const string &ruby,
 	const vector<string> &prestartURLs)

data/ext/common/Utils.h

@@ -337,48 +337,6 @@ void makeDirTree(const string &path, const StaticString &mode = "u=rwx,g=,o=",
  */
 void removeDirTree(const string &path);
 
-/**
- * Check whether the specified directory is a valid Ruby on Rails
- * application root directory.
- *
- * @param cstat A CachedFileStat object, if you want to use cached statting.
- * @param throttleRate A throttle rate for cstat. Only applicable if cstat is not NULL.
- * @throws FileSystemException Unable to check because of a system error.
- * @throws TimeRetrievalException
- * @throws boost::thread_interrupted
- * @ingroup Support
- */
-bool verifyRailsDir(const string &dir, CachedFileStat *cstat = 0,
-                    unsigned int throttleRate = 0);
-
-/**
- * Check whether the specified directory is a valid Rack application
- * root directory.
- *
- * @param cstat A CachedFileStat object, if you want to use cached statting.
- * @param throttleRate A throttle rate for cstat. Only applicable if cstat is not NULL.
- * @throws FileSystemException Unable to check because of a filesystem error.
- * @throws TimeRetrievalException
- * @throws boost::thread_interrupted
- * @ingroup Support
- */
-bool verifyRackDir(const string &dir, CachedFileStat *cstat = 0,
-                   unsigned int throttleRate = 0);
-
-/**
- * Check whether the specified directory is a valid WSGI application
- * root directory.
- *
- * @param cstat A CachedFileStat object, if you want to use cached statting.
- * @param throttleRate A throttle rate for cstat. Only applicable if cstat is not NULL.
- * @throws FileSystemException Unable to check because of a filesystem error.
- * @throws TimeRetrievalException
- * @throws boost::thread_interrupted
- * @ingroup Support
- */
-bool verifyWSGIDir(const string &dir, CachedFileStat *cstat = 0,
-                   unsigned int throttleRate = 0);
-
 void prestartWebApps(const ResourceLocator &locator, const string &ruby,
 	const vector<string> &prestartURLs);
 

data/ext/common/Utils/CachedFileStat.hpp

@@ -237,7 +237,7 @@ public:
 	 */
 	bool knows(const StaticString &filename) const {
 		boost::unique_lock<boost::mutex> l(lock);
-		return cache.get(filename) != EntryList::iterator();
+		return cache.has(filename);
 	}
 };
 

data/ext/common/Utils/StrIntUtils.h

@@ -28,6 +28,8 @@
 #include <string>
 #include <vector>
 #include <sstream>
+#include <stdexcept>
+#include <new>
 #include <cstddef>
 #include <ctime>
 #include <oxt/macros.hpp>
@@ -38,6 +40,34 @@ namespace Passenger {
 using namespace std;
 
 
+/**
+ * A RAII construct for memory buffers that are dynamically allocated with malloc().
+ * Upon destruction of a DynamicBuffer, the memory buffer is freed.
+ */
+struct DynamicBuffer {
+	typedef string::size_type size_type;
+
+	char *data;
+	size_type size;
+
+	/**
+	 * @throws std::bad_alloc The buffer cannot be allocated.
+	 */
+	DynamicBuffer(size_type _size)
+		: size(_size)
+	{
+		data = (char *) malloc(_size);
+		if (data == NULL) {
+			throw std::bad_alloc();
+		}
+	}
+
+	~DynamicBuffer() throw() {
+		free(data);
+	}
+};
+
+
 /**
  * Given a prefix string, a middle string and a postfix string, try to build a string
  * that looks like <tt>prefix + middle + postfix</tt>, with as many characters from
@@ -162,39 +192,56 @@ string toHex(const StaticString &data);
  */
 void toHex(const StaticString & restrict_ref data, char * restrict output, bool upperCase = false);
 
+/**
+ * Reverse a string in-place.
+ */
+inline void
+reverseString(char *str, unsigned int size) {
+	char *end = str + size;
+	for (--end; str < end; str++, end--) {
+		*str = *str ^ *end,
+		*end = *str ^ *end,
+		*str = *str ^ *end;
+	}
+}
+
 /**
  * Convert the given integer to some other radix, placing
- * the result into the given output buffer. This buffer must be at
- * least <tt>2 * sizeof(IntegerType) + 1</tt> bytes. The output buffer
+ * the result into the given output buffer. The output buffer
  * will be NULL terminated. Supported radices are 2-36.
- *
+ * 
+ * @param outputSize The size of the output buffer, including space for
+ *                   the terminating NULL.
  * @return The size of the created string, excluding
  *         terminating NULL.
+ * @throws std::length_error The output buffer is not large enough.
  */
 template<typename IntegerType, int radix>
 unsigned int
-integerToOtherBase(IntegerType value, char *output) {
-	static const char hex_chars[] = {
+integerToOtherBase(IntegerType value, char *output, unsigned int outputSize) {
+	static const char chars[] = {
 		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
 		'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
 		'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
 		'u', 'v', 'w', 'x', 'y', 'z'
 	};
-	char buf[sizeof(value) * 2];
 	IntegerType remainder = value;
 	unsigned int size = 0;
 	
 	do {
-		buf[size] = hex_chars[remainder % radix];
+		output[size] = chars[remainder % radix];
 		remainder = remainder / radix;
 		size++;
-	} while (remainder != 0);
+	} while (remainder != 0 && size < outputSize - 1);
 	
-	for (unsigned int i = 0; i < size; i++) {
-		output[size - i - 1] = buf[i];
+	if (remainder == 0) {
+		reverseString(output, size);
+		output[size] = '\0';
+		return size;
+	} else {
+		throw std::length_error("Buffer not large enough to for integerToOtherBase()");
+		return -1; // Shut up compiler warning.
 	}
-	output[size] = '\0';
-	return size;
 }
 
 /**
@@ -209,7 +256,7 @@ integerToOtherBase(IntegerType value, char *output) {
 template<typename IntegerType>
 unsigned int
 integerToHex(IntegerType value, char *output) {
-	return integerToOtherBase<IntegerType, 16>(value, output);
+	return integerToOtherBase<IntegerType, 16>(value, output, 2 * sizeof(IntegerType) + 1);
 }
 
 /**
@@ -229,7 +276,7 @@ string integerToHex(long long value);
 template<typename IntegerType>
 unsigned int
 integerToHexatri(IntegerType value, char *output) {
-	return integerToOtherBase<IntegerType, 36>(value, output);
+	return integerToOtherBase<IntegerType, 36>(value, output, 2 * sizeof(IntegerType) + 1);
 }
 
 /**

data/ext/common/Utils/StringMap.h

@@ -170,6 +170,10 @@ public:
 			return it->second.thePair.second;
 		}
 	}
+
+	bool has(const StaticString &key) const {
+		return store.find(key) != store.end();
+	}
 	
 	bool set(const StaticString &key, const T &value) {
 		pair<InternalIterator, bool> result = store.insert(make_pair(key, Entry()));

data/ext/common/agents/HelperAgent/AgentOptions.h

@@ -36,7 +36,7 @@ using namespace std;
 using namespace boost;
 
 
-struct AgentOptions {
+struct AgentOptions: public VariantMap {
 	pid_t   webServerPid;
 	string  serverInstanceDir;
 	string  tempDir;
@@ -47,7 +47,6 @@ struct AgentOptions {
 	string  defaultRubyCommand;
 	unsigned int generationNumber;
 	unsigned int maxPoolSize;
-	unsigned int maxInstancesPerApp;
 	unsigned int poolIdleTime;
 	string requestSocketFilename;
 	string requestSocketPassword;
@@ -63,7 +62,9 @@ struct AgentOptions {
 
 	AgentOptions() { }
 
-	AgentOptions(const VariantMap &options) {
+	AgentOptions(const VariantMap &options)
+		: VariantMap(options)
+	{
 		testBinary = options.get("test_binary", false) == "1";
 		if (testBinary) {
 			return;
@@ -77,7 +78,6 @@ struct AgentOptions {
 		defaultUser        = options.get("default_user");
 		defaultGroup       = options.get("default_group");
 		maxPoolSize        = options.getInt("max_pool_size");
-		maxInstancesPerApp = options.getInt("max_instances_per_app");
 		poolIdleTime       = options.getInt("pool_idle_time");
 
 		// Required options only set by the Watchdog.

data/ext/common/agents/HelperAgent/Main.cpp

@@ -450,11 +450,10 @@ public:
 			"logging", options.loggingAgentPassword);
 		spawnerFactory = boost::make_shared<SpawnerFactory>(poolLoop.safe,
 			resourceLocator, generation, boost::make_shared<SpawnerConfig>(randomGenerator));
-		pool = boost::make_shared<Pool>(poolLoop.safe.get(), spawnerFactory, loggerFactory,
-			randomGenerator);
+		pool = boost::make_shared<Pool>(spawnerFactory, loggerFactory,
+			randomGenerator, &options);
 		pool->initialize();
 		pool->setMax(options.maxPoolSize);
-		//pool->setMaxPerApp(maxInstancesPerApp);
 		pool->setMaxIdleTime(options.poolIdleTime * 1000000);
 		
 		requestHandler = boost::make_shared<RequestHandler>(requestLoop.safe,

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -90,6 +90,7 @@
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
+#include <utility>
 #include <typeinfo>
 #include <cassert>
 #include <cctype>
@@ -184,6 +185,7 @@ private:
 		contentLength = 0;
 		clientBodyAlreadyRead = 0;
 		checkoutSessionAfterCommit = false;
+		stickySession = false;
 		sessionCheckedOut = false;
 		sessionCheckoutTry = 0;
 		responseHeaderSeen = false;
@@ -283,6 +285,7 @@ public:
 	bool requestBodyIsBuffered;
 	bool sessionCheckedOut;
 	bool checkoutSessionAfterCommit;
+	bool stickySession;
 
 	bool responseHeaderSeen;
 	bool chunkedResponse;
@@ -1044,6 +1047,16 @@ private:
 			headerData.append("X-Powered-By: Phusion Passenger\r\n");
 		}
 
+		// Add sticky session ID.
+		if (client->stickySession && client->session != NULL) {
+			StaticString cookieName = getStickySessionCookieName(client);
+			headerData.append("Set-Cookie: ");
+			headerData.append(cookieName.data(), cookieName.size());
+			headerData.append("=");
+			headerData.append(toString(client->session->getStickySessionId()));
+			headerData.append("; HttpOnly\r\n");
+		}
+
 		// Add Date header. https://code.google.com/p/phusion-passenger/issues/detail?id=485
 		if (lookupHeader(headerData, "Date", "date").empty()) {
 			char dateStr[60];
@@ -1341,7 +1354,7 @@ private:
 			} else {
 				ClientPtr client = boost::make_shared<Client>();
 				client->associate(this, fd);
-				clients.insert(make_pair<int, ClientPtr>(fd, client));
+				clients.insert(make_pair((int) fd, client));
 				acceptedClients[count] = client;
 				count++;
 				RH_DEBUG(client, "New client accepted; new client count = " << clients.size());
@@ -1721,7 +1734,8 @@ private:
 		fillPoolOption(client, options.nodejs, "PASSENGER_NODEJS");
 		fillPoolOption(client, options.user, "PASSENGER_USER");
 		fillPoolOption(client, options.group, "PASSENGER_GROUP");
-		fillPoolOption(client, options.minProcesses, "PASSENGER_MIN_INSTANCES");
+		fillPoolOption(client, options.minProcesses, "PASSENGER_MIN_PROCESSES");
+		fillPoolOption(client, options.maxProcesses, "PASSENGER_MAX_PROCESSES");
 		fillPoolOption(client, options.maxRequests, "PASSENGER_MAX_REQUESTS");
 		fillPoolOption(client, options.spawnMethod, "PASSENGER_SPAWN_METHOD");
 		fillPoolOption(client, options.startCommand, "PASSENGER_START_COMMAND");
@@ -1734,6 +1748,8 @@ private:
 		fillPoolOption(client, options.loadShellEnvvars, "PASSENGER_LOAD_SHELL_ENVVARS");
 		fillPoolOption(client, options.debugger, "PASSENGER_DEBUGGER");
 		fillPoolOption(client, options.raiseInternalError, "PASSENGER_RAISE_INTERNAL_ERROR");
+		setStickySessionId(client);
+		/******************/
 		
 		for (it = client->scgiParser.begin(); it != end; it++) {
 			if (!startsWith(it->first, "PASSENGER_")
@@ -1788,6 +1804,53 @@ private:
 		}
 	}
 
+	void setStickySessionId(const ClientPtr &client) {
+		ScgiRequestParser &parser = client->scgiParser;
+		if (parser.getHeader("PASSENGER_STICKY_SESSION") == "true") {
+			// TODO: This is not entirely correct. Clients MAY send multiple Cookie
+			// headers, although this is in practice extremely rare.
+			// http://stackoverflow.com/questions/16305814/are-multiple-cookie-headers-allowed-in-an-http-request
+			StaticString cookie = parser.getHeader("HTTP_COOKIE");
+			StaticString cookieName = getStickySessionCookieName(client);
+			vector<StaticString> parts;
+
+			client->stickySession = true;
+			split(cookie, ';', parts);
+			foreach (StaticString part, parts) {
+				const char *begin = part.data();
+				const char *end = part.data() + part.size();
+				const char *sep;
+
+				// Skip leading whitespace in the name.
+				while (begin < end && *begin == ' ') {
+					begin++;
+				}
+				part = StaticString(begin, end - begin);
+
+				// Find the separator ('=').
+				sep = (const char *) memchr(begin, '=', end - begin);
+				if (sep != NULL) {
+					StaticString name(begin, sep - begin);
+					if (name == cookieName) {
+						// This cookie matches the one we're looking for.
+						StaticString value(sep + 1, end - (sep + 1));
+						client->options.stickySessionId = stringToUint(value);
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	StaticString getStickySessionCookieName(const ClientPtr &client) const {
+		StaticString value = client->scgiParser.getHeader("PASSENGER_STICKY_SESSION_COOKIE_NAME");
+		if (value.empty()) {
+			return StaticString("_passenger_route", sizeof("_passenger_route") - 1);
+		} else {
+			return value;
+		}
+	}
+
 	size_t state_readingHeader_onClientData(const ClientPtr &client, const char *data, size_t size) {
 		ScgiRequestParser &parser = client->scgiParser;
 		size_t consumed = parser.feed(data, size);

data/ext/common/agents/LoggingAgent/FilterSupport.h

@@ -33,8 +33,10 @@
 
 #include <string>
 #include <set>
+// Checking for _PCREPOSIX_H avoids conflicts with headers provided by Apache.
+// https://code.google.com/p/phusion-passenger/issues/detail?id=651
 #ifndef _PCREPOSIX_H
-	#include <regex.h>
+	#include <boost/regex.h>
 #endif
 #include <cstdio>
 #include <cstring>