passenger 4.0.14 → 4.0.16

data/ext/common/ApplicationPool2/Options.h

@@ -297,6 +297,20 @@ public:
 	
 	/** The number of seconds that preloader processes may stay alive idling. */
 	long maxPreloaderIdleTime;
+
+	/**
+	 * The maximum number of processes inside a group that may be performing
+	 * out-of-band work at the same time.
+	 */
+	unsigned int maxOutOfBandWorkInstances;
+
+	/**
+	 * The maximum number of requests that may live in the Group.getWaitlist queue.
+	 * A value of 0 means unlimited.
+	 */
+	unsigned int maxRequestQueueSize;
+
+	/*-----------------*/
 	
 	
 	/*********** Per-request options that should be set manually and that only matter to Pool ***********/
@@ -370,8 +384,8 @@ public:
 		baseURI                 = "/";
 		spawnMethod             = "smart";
 		defaultUser             = "nobody";
-		ruby                    = "ruby";
-		python                  = "python";
+		ruby                    = DEFAULT_RUBY;
+		python                  = DEFAULT_PYTHON;
 		rights                  = DEFAULT_BACKEND_ACCOUNT_RIGHTS;
 		debugger                = false;
 		loadShellEnvvars        = true;
@@ -380,6 +394,8 @@ public:
 		
 		minProcesses            = 1;
 		maxPreloaderIdleTime    = -1;
+		maxOutOfBandWorkInstances = 1;
+		maxRequestQueueSize     = 100;
 		
 		statThrottleRate        = 0;
 		maxRequests             = 0;
@@ -528,6 +544,7 @@ public:
 		if (fields & PER_GROUP_POOL_OPTIONS) {
 			appendKeyValue3(vec, "min_processes",       minProcesses);
 			appendKeyValue2(vec, "max_preloader_idle_time", maxPreloaderIdleTime);
+			appendKeyValue3(vec, "max_out_of_band_work_instances", maxOutOfBandWorkInstances);
 		}
 		
 		/*********************************/
@@ -567,6 +584,10 @@ public:
 			return ruby + "\t" + resourceLocator.getHelperScriptsDir() + "/rack-loader.rb";
 		} else if (appType == "wsgi") {
 			return python + "\t" + resourceLocator.getHelperScriptsDir() + "/wsgi-loader.py";
+		} else if (appType == "node") {
+			return "node\t" + resourceLocator.getHelperScriptsDir() + "/node-loader.js";
+		} else if (appType == "meteor") {
+			return ruby + "\t" + resourceLocator.getHelperScriptsDir() + "/meteor-loader.rb";
 		} else {
 			return startCommand;
 		}

data/ext/common/ApplicationPool2/Pool.h

@@ -100,6 +100,7 @@ public:
 		bool spawning;
 		bool superGroup;
 		bool oobw;
+		bool testOverflowRequestQueue;
 
 		// The following fields may only be accessed by Pool.
 		boost::mutex syncher;
@@ -112,6 +113,7 @@ public:
 			spawning   = true;
 			superGroup = false;
 			oobw       = false;
+			testOverflowRequestQueue = false;
 			spawnLoopIteration = 0;
 		}
 	};
@@ -571,7 +573,8 @@ public:
 			process->lastUsed + maxIdleTime;
 		if (process->sessions == 0
 		 && state.now >= processGcTime
-		 && (unsigned long) group->enabledCount > group->options.minProcesses) {
+		 && (unsigned long) group->getProcessCount() > group->options.minProcesses)
+		{
 			ProcessList::iterator prev = p_it;
 			prev--;
 			P_DEBUG("Garbage collect idle process: " << process->inspect() <<
@@ -1165,6 +1168,10 @@ public:
 		return result;
 	}
 	
+	/**
+	 * Returns the total number of processes in the pool, including all disabling and
+	 * disabled processes, but excluding processes that are shutting down.
+	 */
 	unsigned int getProcessCount(bool lock = true) const {
 		DynamicScopedLock l(syncher, lock);
 		unsigned int result = 0;

data/ext/common/ApplicationPool2/Process.h

@@ -465,6 +465,15 @@ public:
 			return false;
 		}
 	}
+
+	/** Kill the OS process with the given signal. */
+	int kill(int signo) {
+		if (osProcessExists()) {
+			return syscalls::kill(pid, signo);
+		} else {
+			return 0;
+		}
+	}
 	
 	int utilization() const {
 		/* Different processes within a Group may have different

data/ext/common/ApplicationPool2/Session.h

@@ -110,6 +110,7 @@ public:
 	const string &getGupid() const;
 	const GroupPtr getGroup() const;
 	void requestOOBW();
+	int kill(int signo);
 	
 	bool isClosed() const {
 		return closed;

data/ext/common/ApplicationPool2/Spawner.h

@@ -781,17 +781,10 @@ protected:
 					getProcessUsername() + "; it looks like your system's " +
 					"user database is broken, please fix it.");
 			}
-			struct group *groupInfo = getgrgid(userInfo->pw_gid);
-			if (groupInfo == NULL) {
-				throw RuntimeException(string("Cannot get group database entry for ") +
-					"the default group belonging to username '" +
-					getProcessUsername() + "'; it looks like your system's " +
-					"user database is broken, please fix it.");
-			}
 			
 			info.switchUser = false;
 			info.username = userInfo->pw_name;
-			info.groupname = groupInfo->gr_name;
+			info.groupname = getGroupName(userInfo->pw_gid);
 			info.home = userInfo->pw_dir;
 			info.shell = userInfo->pw_shell;
 			info.uid = geteuid();
@@ -804,7 +797,7 @@ protected:
 		string defaultGroup;
 		string startupFile = absolutizePath(options.getStartupFile(), info.appRoot);
 		struct passwd *userInfo = NULL;
-		struct group *groupInfo = NULL;
+		gid_t  groupId = (gid_t) -1;
 		
 		if (options.defaultGroup.empty()) {
 			struct passwd *info = getpwnam(options.defaultUser.c_str());
@@ -848,22 +841,31 @@ protected:
 					throw SystemException("Cannot lstat(\"" +
 						startupFile + "\")", e);
 				}
-				groupInfo = getgrgid(buf.st_gid);
+				if (getgrgid(buf.st_gid) != NULL) {
+					groupId = buf.st_gid;
+				} else {
+					groupId = (gid_t) -1;
+				}
 			} else {
-				groupInfo = getgrnam(options.group.c_str());
+				struct group *groupInfo = getgrnam(options.group.c_str());
+				if (groupInfo != NULL) {
+					groupId = groupInfo->gr_gid;
+				} else {
+					groupId = (gid_t) -1;
+				}
 			}
 		} else if (userInfo != NULL) {
-			groupInfo = getgrgid(userInfo->pw_gid);
+			groupId = userInfo->pw_gid;
 		}
-		if (groupInfo == NULL || groupInfo->gr_gid == 0) {
-			groupInfo = getgrnam(defaultGroup.c_str());
+		if (groupId == 0 || groupId == (gid_t) -1) {
+			groupId = lookupGid(defaultGroup);
 		}
-		
+
 		UPDATE_TRACE_POINT();
 		if (userInfo == NULL) {
 			throw RuntimeException("Cannot determine a user to lower privilege to");
 		}
-		if (groupInfo == NULL) {
+		if (groupId == (gid_t) -1) {
 			throw RuntimeException("Cannot determine a group to lower privilege to");
 		}
 		
@@ -877,16 +879,16 @@ protected:
 		#endif
 		info.switchUser = true;
 		info.username = userInfo->pw_name;
-		info.groupname = groupInfo->gr_name;
+		info.groupname = getGroupName(groupId);
 		info.home = userInfo->pw_dir;
 		info.shell = userInfo->pw_shell;
 		info.uid = userInfo->pw_uid;
-		info.gid = groupInfo->gr_gid;
+		info.gid = groupId;
 		#if !defined(HAVE_GETGROUPLIST) && (defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__))
 			#define HAVE_GETGROUPLIST
 		#endif
 		#ifdef HAVE_GETGROUPLIST
-			int ret = getgrouplist(userInfo->pw_name, groupInfo->gr_gid,
+			int ret = getgrouplist(userInfo->pw_name, groupId,
 				groups, &info.ngroups);
 			if (ret == -1) {
 				int e = errno;

data/ext/common/ApplicationPool2/SuperGroup.h

@@ -656,7 +656,7 @@ public:
 		vector<GroupPtr>::const_iterator g_it, g_end = groups.end();
 		for (g_it = groups.begin(); g_it != g_end; g_it++) {
 			const GroupPtr &group = *g_it;
-			result += group->enabledCount + group->disablingCount + group->disabledCount;
+			result += group->getProcessCount();
 		}
 		return result;
 	}

data/ext/common/Constants.h

@@ -36,51 +36,55 @@
 #define DEFAULT_BACKEND_ACCOUNT_RIGHTS Account::DETACH
 
 
-	#define DEFAULT_LOG_LEVEL 0
-
-	#define DEFAULT_RUBY "ruby"
+	#define DEFAULT_ANALYTICS_LOG_GROUP ""
 
-	#define DEFAULT_PYTHON "python"
+	#define DEFAULT_ANALYTICS_LOG_PERMISSIONS "u=rwx,g=rx,o=rx"
 
-	#define DEFAULT_MAX_POOL_SIZE 6
+	#define DEFAULT_ANALYTICS_LOG_USER "nobody"
 
-	#define DEFAULT_POOL_IDLE_TIME 300
+	#define DEFAULT_LOG_LEVEL 0
 
 	#define DEFAULT_MAX_INSTANCES_PER_APP 0
 
-	#define DEFAULT_WEB_APP_USER "nobody"
+	#define DEFAULT_MAX_POOL_SIZE 6
 
-	#define DEFAULT_ANALYTICS_LOG_USER "nobody"
+	#define DEFAULT_POOL_IDLE_TIME 300
 
-	#define DEFAULT_ANALYTICS_LOG_GROUP ""
+	#define DEFAULT_PYTHON "python"
 
-	#define DEFAULT_ANALYTICS_LOG_PERMISSIONS "u=rwx,g=rx,o=rx"
+	#define DEFAULT_RUBY "ruby"
+
+	#define DEFAULT_START_TIMEOUT 90000
 
 	#define DEFAULT_UNION_STATION_GATEWAY_ADDRESS "gateway.unionstationapp.com"
 
 	#define DEFAULT_UNION_STATION_GATEWAY_PORT 443
 
-	#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
+	#define DEFAULT_WEB_APP_USER "nobody"
+
+	#define FEEDBACK_FD 3
 
 	#define MESSAGE_SERVER_MAX_PASSWORD_SIZE 100
 
+	#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
+
+	#define PASSENGER_VERSION "4.0.16"
+
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 
 	#define PROCESS_SHUTDOWN_TIMEOUT 60
 
 	#define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"
 
-	#define PASSENGER_VERSION "4.0.14"
+	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION 2
+
+	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION 0
 
 	#define SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION 1
 
 	#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 0
 
-	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION 2
-
-	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION 0
-
-	#define FEEDBACK_FD 3
+	#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"
 
 
 #endif /* _PASSENGER_CONSTANTS_H */

data/ext/common/Constants.h.erb

@@ -35,7 +35,7 @@
 
 #define DEFAULT_BACKEND_ACCOUNT_RIGHTS Account::DETACH
 
-<% for constant_name in PhusionPassenger::SharedConstants.constants %>
+<% for constant_name in PhusionPassenger::SharedConstants.constants.sort %>
 	#define <%= constant_name %> <%=PhusionPassenger::SharedConstants.const_get(constant_name).inspect %>
 <% end %>
 

data/ext/common/Exceptions.h

@@ -316,6 +316,10 @@ public:
 		: msg(message)
 		{ }
 	
+	GetAbortedException(const oxt::tracable_exception::no_backtrace &tag)
+		: oxt::tracable_exception(tag)
+		{ }
+
 	virtual ~GetAbortedException() throw() {}
 	
 	virtual const char *what() const throw() {
@@ -323,6 +327,21 @@ public:
 	}
 };
 
+/**
+ * Indicates that a Pool::get() or Pool::asyncGet() request was denied because
+ * the getWaitlist queue was full.
+ */
+class RequestQueueFullException: public GetAbortedException {
+public:
+	RequestQueueFullException()
+		: GetAbortedException(oxt::tracable_exception::no_backtrace())
+		{ }
+	
+	virtual const char *what() const throw() {
+		return "Request queue is full";
+	}
+};
+
 /**
  * Indicates that a specified argument is incorrect or violates a requirement.
  *

data/ext/common/ServerInstanceDir.h

@@ -82,7 +82,6 @@ public:
 			TRACE_POINT();
 			bool runningAsRoot = geteuid() == 0;
 			struct passwd *defaultUserEntry;
-			struct group  *defaultGroupEntry;
 			uid_t defaultUid;
 			gid_t defaultGid;
 			
@@ -92,12 +91,11 @@ public:
 					"' does not exist.");
 			}
 			defaultUid = defaultUserEntry->pw_uid;
-			defaultGroupEntry = getgrnam(defaultGroup.c_str());
-			if (defaultGroupEntry == NULL) {
+			defaultGid = lookupGid(defaultGroup);
+			if (defaultGid == (gid_t) -1) {
 				throw NonExistentGroupException("Default group '" + defaultGroup +
 					"' does not exist.");
 			}
-			defaultGid = defaultGroupEntry->gr_gid;
 			
 			/* We set a very tight permission here: no read or write access for
 			 * anybody except the owner. The individual files and subdirectories
@@ -251,6 +249,12 @@ private:
 			throw FileSystemException("Cannot create server instance directory '" +
 				path + "'", e, path);
 		}
+		// Explicitly chmod the directory in case the umask is interfering.
+		if (chmod(path.c_str(), parseModeString("u=rwx,g=rx,o=rx")) == -1) {
+			int e = errno;
+			throw FileSystemException("Cannot set permissions on server instance directory '" +
+				path + "'", e, path);
+		}
 		// verifyDirectoryPermissions() checks for the owner/group so we must make
 		// sure the server instance directory has that owner/group, even when the
 		// parent directory has setgid on.

data/ext/common/Utils.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010, 2011, 2012 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -400,6 +400,38 @@ getProcessUsername() {
 	}
 }
 
+string
+getGroupName(gid_t gid) {
+	struct group *groupEntry;
+
+	groupEntry = getgrgid(gid);
+	if (groupEntry == NULL) {
+		return toString(gid);
+	} else {
+		return groupEntry->gr_name;
+	}
+}
+
+gid_t
+lookupGid(const StaticString &groupName) {
+	struct group *groupEntry;
+	char name[groupName.size() + 1];
+
+	memcpy(name, groupName.data(), groupName.size());
+	name[groupName.size()] = '\0';
+
+	groupEntry = getgrnam(name);
+	if (groupEntry == NULL) {
+		if (looksLikePositiveNumber(groupName)) {
+			return atoi(name);
+		} else {
+			return (gid_t) -1;
+		}
+	} else {
+		return groupEntry->gr_gid;
+	}
+}
+
 mode_t
 parseModeString(const StaticString &mode) {
 	mode_t modeBits = 0;

data/ext/common/Utils.h

@@ -210,6 +210,20 @@ string escapeForXml(const string &input);
  */
 string getProcessUsername();
 
+/**
+ * Returns either the group name for the given GID, or (if the group name
+ * couldn't be looked up) a string representation of the given GID.
+ */
+string getGroupName(gid_t gid);
+
+/**
+ * Given a `groupName` which is either the name of a group, or a string
+ * containing the GID of a group, looks up the GID as a gid_t.
+ *
+ * Returns `(gid_t) -1` if the lookup fails.
+ */
+gid_t lookupGid(const StaticString &groupName);
+
 /**
  * Converts a mode string into a mode_t value.
  *

data/ext/common/Utils/StrIntUtils.cpp

@@ -374,6 +374,22 @@ integerToHexatri(long long value) {
 	return string(buf);
 }
 
+bool
+looksLikePositiveNumber(const StaticString &str) {
+	if (str.empty()) {
+		return false;
+	} else {
+		bool result = true;
+		const char *data = str.data();
+		const char *end = str.data() + str.size();
+		while (result && data != end) {
+			result = result && (*data >= '0' && *data <= '9');
+			data++;
+		}
+		return result;
+	}
+}
+
 int
 atoi(const string &s) {
 	return ::atoi(s.c_str());