passenger 5.0.10 → 5.0.11

data/ext/common/Account.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -62,7 +62,7 @@ public:
 		ALL                       = ~0,
 		NONE                      = 0,
 
-		// HelperAgent ApplicationPool rights.
+		// Passenger core ApplicationPool rights.
 		CLEAR                     = 1 << 0,
 		DETACH                    = 1 << 1,
 		SET_PARAMETERS            = 1 << 2,
@@ -70,7 +70,7 @@ public:
 		INSPECT_BASIC_INFO        = 1 << 4,
 		INSPECT_SENSITIVE_INFO    = 1 << 5,
 
-		// HelperAgent admin rights.
+		// Passenger core admin rights.
 		INSPECT_REQUESTS          = 1 << 8,
 		INSPECT_BACKTRACES        = 1 << 9,
 

data/ext/common/AgentsStarter.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -137,21 +137,21 @@ pp_agents_starter_start(PP_AgentsStarter *as,
 }
 
 const char *
-pp_agents_starter_get_server_address(PP_AgentsStarter *as, unsigned int *size) {
+pp_agents_starter_get_core_address(PP_AgentsStarter *as, unsigned int *size) {
 	Passenger::AgentsStarter *agentsStarter = (Passenger::AgentsStarter *) as;
 	if (size != NULL) {
-		*size = agentsStarter->getServerAddress().size();
+		*size = agentsStarter->getCoreAddress().size();
 	}
-	return agentsStarter->getServerAddress().c_str();
+	return agentsStarter->getCoreAddress().c_str();
 }
 
 const char *
-pp_agents_starter_get_server_password(PP_AgentsStarter *as, unsigned int *size) {
+pp_agents_starter_get_core_password(PP_AgentsStarter *as, unsigned int *size) {
 	Passenger::AgentsStarter *agentsStarter = (Passenger::AgentsStarter *) as;
 	if (size != NULL) {
-		*size = agentsStarter->getServerPassword().size();
+		*size = agentsStarter->getCorePassword().size();
 	}
-	return agentsStarter->getServerPassword().c_str();
+	return agentsStarter->getCorePassword().c_str();
 }
 
 const char *

data/ext/common/AgentsStarter.h

@@ -72,8 +72,8 @@ int pp_agents_starter_start(PP_AgentsStarter *as,
 	const PP_AfterForkCallback afterFork,
 	void *callbackArgument,
 	char **errorMessage);
-const char *pp_agents_starter_get_server_address(PP_AgentsStarter *as, unsigned int *size);
-const char *pp_agents_starter_get_server_password(PP_AgentsStarter *as, unsigned int *size);
+const char *pp_agents_starter_get_core_address(PP_AgentsStarter *as, unsigned int *size);
+const char *pp_agents_starter_get_core_password(PP_AgentsStarter *as, unsigned int *size);
 const char *pp_agents_starter_get_instance_dir(PP_AgentsStarter *as, unsigned int *size);
 pid_t       pp_agents_starter_get_pid(PP_AgentsStarter *as);
 void        pp_agents_starter_detach(PP_AgentsStarter *as);
@@ -130,15 +130,15 @@ private:
 	 /** The watchdog's feedback file descriptor. */
 	FileDescriptor feedbackFd;
 
-	/** The address on which the Phusion Passenger HTTP server listens, and the
+	/** The address on which the Passenger core listens for HTTP requests, and the
 	 * corresponding password.
 	 */
-	string serverAddress;
-	string serverPassword;
+	string coreAddress;
+	string corePassword;
 
-	/** The logging agent's socket address and its password. */
-	string loggingAgentAddress;
-	string loggingAgentPassword;
+	/** The UstRouter's socket address and its password. */
+	string ustRouterAddress;
+	string ustRouterPassword;
 
 	string instanceDir;
 
@@ -291,20 +291,20 @@ public:
 
 	// The 'const string &' here is on purpose. The C getter functions
 	// return the string pointer directly.
-	const string &getServerAddress() const {
-		return serverAddress;
+	const string &getCoreAddress() const {
+		return coreAddress;
 	}
 
-	const string &getServerPassword() const {
-		return serverPassword;
+	const string &getCorePassword() const {
+		return corePassword;
 	}
 
-	const string &getLoggingAgentAddress() const {
-		return loggingAgentAddress;
+	const string &getUstRouterAddress() const {
+		return ustRouterAddress;
 	}
 
-	const string &getLoggingAgentPassword() const {
-		return loggingAgentPassword;
+	const string &getUstRouterPassword() const {
+		return ustRouterPassword;
 	}
 
 	const string &getInstanceDir() const {
@@ -475,11 +475,11 @@ public:
 
 				this->pid        = pid;
 				this->feedbackFd = feedbackFd;
-				serverAddress    = info.get("server_address");
-				serverPassword   = info.get("server_password");
+				coreAddress      = info.get("core_address");
+				corePassword     = info.get("core_password");
 				instanceDir      = info.get("instance_dir");
-				loggingAgentAddress  = info.get("logging_agent_address");
-				loggingAgentPassword = info.get("logging_agent_password");
+				ustRouterAddress  = info.get("ust_router_address");
+				ustRouterPassword = info.get("ust_router_password");
 				guard.clear();
 			} else if (args[0] == "Watchdog startup error") {
 				killProcessGroupAndWait(&pid, 5000);

data/ext/common/ApplicationPool2/Options.h

@@ -108,9 +108,9 @@ private:
 		result.push_back(&options.meteorAppSettings);
 
 		result.push_back(&options.environmentVariables);
-		result.push_back(&options.loggingAgentAddress);
-		result.push_back(&options.loggingAgentUsername);
-		result.push_back(&options.loggingAgentPassword);
+		result.push_back(&options.ustRouterAddress);
+		result.push_back(&options.ustRouterUsername);
+		result.push_back(&options.ustRouterPassword);
 		result.push_back(&options.apiKey);
 		result.push_back(&options.hostName);
 		result.push_back(&options.uri);
@@ -303,13 +303,13 @@ public:
 	 * It does *not* necessarily result in a request logging data to Union Station.
 	 * That depends on whether the `transaction` member is set.
 	 *
-	 * If this is set to true, then 'loggingAgentAddress', 'loggingAgentUsername'
-	 * and 'loggingAgentPassword' must be non-empty.
+	 * If this is set to true, then 'ustRouterAddress', 'ustRouterUsername'
+	 * and 'ustRouterPassword' must be non-empty.
 	 */
 	bool analytics;
-	StaticString loggingAgentAddress;
-	StaticString loggingAgentUsername;
-	StaticString loggingAgentPassword;
+	StaticString ustRouterAddress;
+	StaticString ustRouterUsername;
+	StaticString ustRouterPassword;
 
 	/**
 	 * Whether Spawner should raise an internal error when spawning. Used
@@ -597,9 +597,9 @@ public:
 			appendKeyValue (vec, "python",             python);
 			appendKeyValue (vec, "nodejs",             nodejs);
 			appendKeyValue (vec, "meteor_app_settings", meteorAppSettings);
-			appendKeyValue (vec, "logging_agent_address",  loggingAgentAddress);
-			appendKeyValue (vec, "logging_agent_username", loggingAgentUsername);
-			appendKeyValue (vec, "logging_agent_password", loggingAgentPassword);
+			appendKeyValue (vec, "ust_router_address",  ustRouterAddress);
+			appendKeyValue (vec, "ust_router_username", ustRouterUsername);
+			appendKeyValue (vec, "ust_router_password", ustRouterPassword);
 			appendKeyValue4(vec, "debugger",           debugger);
 			appendKeyValue4(vec, "analytics",          analytics);
 
@@ -683,7 +683,7 @@ public:
 
 	unsigned long getMaxPreloaderIdleTime() const {
 		if (maxPreloaderIdleTime == -1) {
-			return 5 * 60;
+			return DEFAULT_MAX_PRELOADER_IDLE_TIME;
 		} else {
 			return maxPreloaderIdleTime;
 		}

data/ext/common/Constants.h

@@ -64,14 +64,12 @@
 
 	#define DEFAULT_HTTP_SERVER_LISTEN_ADDRESS "tcp://127.0.0.1:3000"
 
-	#define DEFAULT_LOGGING_AGENT_API_LISTEN_ADDRESS "tcp://127.0.0.1:9345"
-
-	#define DEFAULT_LOGGING_AGENT_LISTEN_ADDRESS "tcp://127.0.0.1:9344"
-
 	#define DEFAULT_LOG_LEVEL 3
 
 	#define DEFAULT_MAX_POOL_SIZE 6
 
+	#define DEFAULT_MAX_PRELOADER_IDLE_TIME 300
+
 	#define DEFAULT_MBUF_CHUNK_SIZE 512
 
 	#define DEFAULT_NODEJS "node"
@@ -96,6 +94,10 @@
 
 	#define DEFAULT_UNION_STATION_GATEWAY_PORT 443
 
+	#define DEFAULT_UST_ROUTER_API_LISTEN_ADDRESS "tcp://127.0.0.1:9345"
+
+	#define DEFAULT_UST_ROUTER_LISTEN_ADDRESS "tcp://127.0.0.1:9344"
+
 	#define DEFAULT_WEB_APP_USER "nobody"
 
 	#define ENTERPRISE_URL "https://www.phusionpassenger.com/enterprise"
@@ -122,7 +124,7 @@
 
 	#define PASSENGER_DEFAULT_USER "nobody"
 
-	#define PASSENGER_VERSION "5.0.10"
+	#define PASSENGER_VERSION "5.0.11"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 
@@ -142,9 +144,9 @@
 
 	#define SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION 2
 
-	#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 1
+	#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 3
 
-	#define SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION 0
+	#define SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION 3
 
 	#define SERVER_KIT_MAX_SERVER_ENDPOINTS 4
 
@@ -154,7 +156,7 @@
 
 	#define STANDALONE_DOC_URL "https://www.phusionpassenger.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 --with-http_ssl_module"
+	#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 --with-http_ssl_module --with-http_realip_module"
 
 	#define SUPPORT_URL "https://www.phusionpassenger.com/documentation_and_support"
 

data/ext/common/Logging.cpp

@@ -44,6 +44,7 @@ static bool printAppOutputAsDebuggingMessages = false;
 
 static boost::mutex logFileMutex;
 static string logFile;
+static int logFd = STDERR_FILENO;
 
 static int fileDescriptorLog = -1;
 static string fileDescriptorLogFile;
@@ -85,6 +86,26 @@ setLogFileWithFd(const string &path, int fd) {
 	logFile = path;
 }
 
+bool
+setLogFileWithoutRedirectingStderr(const string &path, int *errcode) {
+	int fd = open(path.c_str(), O_WRONLY | O_CREAT | O_APPEND, 0644);
+	if (fd != -1) {
+		int oldLogFd = logFd;
+		logFd = fd;
+		if (oldLogFd != STDERR_FILENO) {
+			close(oldLogFd);
+		}
+		boost::lock_guard<boost::mutex> l(logFileMutex);
+		logFile = path;
+		return true;
+	} else {
+		if (errcode != NULL) {
+			*errcode = errno;
+		}
+		return false;
+	}
+}
+
 bool
 hasFileDescriptorLogFile() {
 	return fileDescriptorLog != -1;
@@ -195,7 +216,7 @@ writeExactWithoutOXT(int fd, const char *str, unsigned int size) {
 
 void
 _writeLogEntry(const char *str, unsigned int size) {
-	writeExactWithoutOXT(STDERR_FILENO, str, size);
+	writeExactWithoutOXT(logFd, str, size);
 }
 
 void

data/ext/common/Logging.h

@@ -84,14 +84,14 @@ void setLogLevel(int value);
  * Returns the general log file that we're using, or the empty string
  * if we're not using a log file.
  *
- * This method is NOT thread-safe.
+ * This method is thread-safe.
  */
 string getLogFile();
 
 /**
  * Sets the general log file. This method is thread-safe.
  * Returns whether the new log file can be opened. If not,
- * errcode (if non-NULL) is set to the relevant filesystem
+ * `errcode` (if non-NULL) is set to the relevant filesystem
  * error code.
  */
 bool setLogFile(const string &path, int *errcode = NULL);
@@ -102,6 +102,23 @@ bool setLogFile(const string &path, int *errcode = NULL);
  */
 void setLogFileWithFd(const string &path, int fd);
 
+/**
+ * Sets the general log file. Unlike `setLogFile()` and `setLogFileWithFd()`,
+ * this method does not redirect stderr to that file. This is useful in
+ * e.g. the Apache module where redirecting stderr is not safe because it
+ * would affect all the other Apache modules too.
+ *
+ * Returns whether the new log file can be opened. If not,
+ * `errcode` (if non-NULL) is set to the relevant filesystem
+ * error code.
+ *
+ * WARNING:
+ * This method is NOT thread-safe.
+ * Once you have called this method, you may not call `setLogFile()`
+ * or `setLogFileWithFd()`.
+ */
+bool setLogFileWithoutRedirectingStderr(const string &path, int *errcode = NULL);
+
 /**
  * Returns whether we're using a separate log file for logging file
  * descriptor opening and closing.

data/ext/common/ServerKit/AcceptLoadBalancer.h

@@ -74,9 +74,9 @@ using namespace boost;
  * accepts are distributed to all registered Server objects, in a
  * round-robin manner.
  *
- * Inside the "PassengerAgent server", we activate AcceptLoadBalancer
- * only if `server_threads > 1`, which is often the case because
- * `server_threads` defaults to the number of CPU cores.
+ * Inside the "PassengerAgent core", we activate AcceptLoadBalancer
+ * only if `core_threads > 1`, which is often the case because
+ * `core_threads` defaults to the number of CPU cores.
  */
 template<typename Server>
 class AcceptLoadBalancer {

data/ext/common/ServerKit/Server.h

@@ -807,6 +807,30 @@ public:
 		return NULL;
 	}
 
+	bool clientOnUnixDomainSocket(Client *client) {
+		union {
+			struct sockaddr genericAddress;
+			struct sockaddr_un unixAddress;
+			struct sockaddr_in inetAddress;
+		} addr;
+		socklen_t len = sizeof(addr);
+		int ret;
+
+		do {
+			ret = getsockname(client->getFd(), &addr.genericAddress, &len);
+		} while (ret == -1 && errno == EINTR);
+		if (ret == -1) {
+			int e = errno;
+			throw SystemException("Unable to autodetect socket type (getsockname() failed)", e);
+		} else {
+			#ifdef AF_UNIX
+				return addr.genericAddress.sa_family == AF_UNIX;
+			#else
+				return addr.genericAddress.sa_family == AF_LOCAL;
+			#endif
+		}
+	}
+
 	/** Increase client reference count. */
 	void refClient(Client *client, const char *file, unsigned int line) {
 		int oldRefcount = client->refcount.fetch_add(1, boost::memory_order_relaxed);

data/ext/common/UnionStation/Connection.h

@@ -83,7 +83,7 @@ public:
 
 
 /**
- * Represents a connection to the logging server.
+ * Represents a connection to the UstRouter.
  * All access to the file descriptor must be synchronized through the syncher.
  * You can use the ConnectionLock to do that.
  */

data/ext/common/UnionStation/Core.h

@@ -145,17 +145,17 @@ private:
 		fd = connectToServer(serverAddress, __FILE__, __LINE__);
 		FdGuard guard(fd, NULL, 0, true);
 
-		P_LOG_FILE_DESCRIPTOR_PURPOSE(fd, "Connection to " AGENT_EXE " logger");
+		P_LOG_FILE_DESCRIPTOR_PURPOSE(fd, "Connection to " SHORT_PROGRAM_NAME " UstRouter");
 
 		// Handshake: process protocol version number.
 		if (!readArrayMessage(fd, args, &timeout)) {
-			throw IOException("The logging agent closed the connection before sending a version identifier.");
+			throw IOException("The UstRouter closed the connection before sending a version identifier.");
 		}
 		if (args.size() != 2 || args[0] != "version") {
-			throw IOException("The logging agent server didn't sent a valid version identifier.");
+			throw IOException("The UstRouter server didn't sent a valid version identifier.");
 		}
 		if (args[1] != "1") {
-			string message = "Unsupported logging agent protocol version " +
+			string message = "Unsupported UstRouter protocol version " +
 				args[1] + ".";
 			throw IOException(message);
 		}
@@ -167,24 +167,24 @@ private:
 
 		UPDATE_TRACE_POINT();
 		if (!readArrayMessage(fd, args, &timeout)) {
-			throw IOException("The logging agent did not send an authentication response.");
+			throw IOException("The UstRouter did not send an authentication response.");
 		} else if (args.size() != 1) {
-			throw IOException("The authentication response that the logging agent sent is not valid.");
+			throw IOException("The authentication response that the UstRouter sent is not valid.");
 		} else if (args[0] != "ok") {
-			throw SecurityException("The logging agent server denied authentication: " + args[0]);
+			throw SecurityException("The UstRouter server denied authentication: " + args[0]);
 		}
 
 		// Initialize session.
 		UPDATE_TRACE_POINT();
 		writeArrayMessage(fd, &timeout, "init", nodeName.c_str(), NULL);
 		if (!readArrayMessage(fd, args, &timeout)) {
-			throw SystemException("Cannot connect to logging server", ECONNREFUSED);
+			throw SystemException("Cannot connect to the UstRouter", ECONNREFUSED);
 		} else if (args.size() != 1) {
-			throw IOException("Logging server returned an invalid reply for the 'init' command");
+			throw IOException("UstRouter returned an invalid reply for the 'init' command");
 		} else if (args[0] == "server shutting down") {
 			throw SystemException("Cannot connect to server", ECONNREFUSED);
 		} else if (args[0] != "ok") {
-			throw IOException("Logging server returned an invalid reply for the 'init' command");
+			throw IOException("UstRouter returned an invalid reply for the 'init' command");
 		}
 
 		ConnectionPtr connection = boost::make_shared<Connection>(fd);
@@ -226,13 +226,13 @@ public:
 			}
 
 			l.unlock();
-			P_TRACE(3, "Creating new connection with logging agent");
+			P_TRACE(3, "Creating new connection with UstRouter");
 			ConnectionPtr connection;
 			try {
 				connection = createNewConnection();
 			} catch (const TimeoutException &) {
 				l.lock();
-				P_WARN("Timeout trying to connect to the logging agent at " << serverAddress << "; " <<
+				P_WARN("Timeout trying to connect to the UstRouter at " << serverAddress << "; " <<
 					"will reconnect in " << reconnectTimeout / 1000000 << " second(s).");
 				nextReconnectTime = SystemTime::getUsec() + reconnectTimeout;
 				return ConnectionPtr();
@@ -240,7 +240,7 @@ public:
 				l.lock();
 				nextReconnectTime = SystemTime::getUsec() + reconnectTimeout;
 				if (instanceof<IOException>(e) || instanceof<SystemException>(e)) {
-					P_WARN("Cannot connect to the logging agent at " << serverAddress <<
+					P_WARN("Cannot connect to the UstRouter at " << serverAddress <<
 						" (" << e.what() << "); will reconnect in " <<
 						reconnectTimeout / 1000000 << " second(s).");
 					return ConnectionPtr();
@@ -285,7 +285,7 @@ public:
 				vector<string> args;
 				if (!readArrayMessage(connection->fd, args, &timeout)) {
 					boost::lock_guard<boost::mutex> l(syncher);
-					P_WARN("The logging agent at " << serverAddress <<
+					P_WARN("The UstRouter at " << serverAddress <<
 						" closed the connection (no error message given);" <<
 						" will reconnect in " << reconnectTimeout / 1000000 <<
 						" second(s).");
@@ -293,7 +293,7 @@ public:
 					return false;
 				} else if (args.size() == 2 && args[0] == "error") {
 					boost::lock_guard<boost::mutex> l(syncher);
-					P_WARN("The logging agent at " << serverAddress <<
+					P_WARN("The UstRouter at " << serverAddress <<
 						" closed the connection (error message: " << args[1] <<
 						"); will reconnect in " << reconnectTimeout / 1000000 <<
 						" second(s).");
@@ -301,7 +301,7 @@ public:
 					return false;
 				} else if (args.empty() || args[0] != "ok") {
 					boost::lock_guard<boost::mutex> l(syncher);
-					P_WARN("The logging agent at " << serverAddress <<
+					P_WARN("The UstRouter at " << serverAddress <<
 						" sent an unexpected reply;" <<
 						" will reconnect in " << reconnectTimeout / 1000000 <<
 						" second(s).");
@@ -315,7 +315,7 @@ public:
 
 		} catch (const TimeoutException &) {
 			boost::lock_guard<boost::mutex> l(syncher);
-			P_WARN("Timeout trying to communicate with the logging agent at " << serverAddress << "; " <<
+			P_WARN("Timeout trying to communicate with the UstRouter at " << serverAddress << "; " <<
 				"will reconnect in " << reconnectTimeout / 1000000 << " second(s).");
 			nextReconnectTime = SystemTime::getUsec() + reconnectTimeout;
 			return false;
@@ -329,12 +329,12 @@ public:
 				gotErrorResponse = connection->disconnect(errorResponse);
 				boost::lock_guard<boost::mutex> l(syncher);
 				if (gotErrorResponse) {
-					P_WARN("The logging agent at " << serverAddress <<
+					P_WARN("The UstRouter at " << serverAddress <<
 						" closed the connection (error message: " << errorResponse <<
 						"); will reconnect in " << reconnectTimeout / 1000000 <<
 						" second(s).");
 				} else {
-					P_WARN("The logging agent at " << serverAddress <<
+					P_WARN("The UstRouter at " << serverAddress <<
 						" closed the connection (no error message given);" <<
 						" will reconnect in " << reconnectTimeout / 1000000 <<
 						" second(s).");
@@ -380,7 +380,7 @@ public:
 		};
 		unsigned int nparams = sizeof(params) / sizeof(StaticString);
 
-		// Get a connection to the logging server.
+		// Get a connection to the UstRouter.
 		ConnectionPtr connection = checkoutConnection();
 		if (connection == NULL) {
 			P_TRACE(2, "Created NULL Union Station transaction: group=" << groupName <<
@@ -440,7 +440,7 @@ public:
 		};
 		unsigned int nparams = sizeof(params) / sizeof(StaticString);
 
-		// Get a connection to the logging server.
+		// Get a connection to the UstRouter.
 		ConnectionPtr connection = checkoutConnection();
 		if (connection == NULL) {
 			return createNullTransaction();