passenger 4.0.48 → 4.0.49

data/ext/apache2/MergeDirConfig.cpp

@@ -39,143 +39,143 @@
 
 
 
-	
+
 		config->ruby =
 			(add->ruby == NULL) ?
 			base->ruby :
 			add->ruby;
-	
 
-	
+
+
 		config->python =
 			(add->python == NULL) ?
 			base->python :
 			add->python;
-	
 
-	
+
+
 		config->nodejs =
 			(add->nodejs == NULL) ?
 			base->nodejs :
 			add->nodejs;
-	
 
-	
+
+
 		config->appEnv =
 			(add->appEnv == NULL) ?
 			base->appEnv :
 			add->appEnv;
-	
 
-	
+
+
 		config->minInstances =
 			(add->minInstances == UNSET_INT_VALUE) ?
 			base->minInstances :
 			add->minInstances;
-	
 
-	
+
+
 		config->maxInstancesPerApp =
 			(add->maxInstancesPerApp == UNSET_INT_VALUE) ?
 			base->maxInstancesPerApp :
 			add->maxInstancesPerApp;
-	
 
-	
+
+
 		config->user =
 			(add->user == NULL) ?
 			base->user :
 			add->user;
-	
 
-	
+
+
 		config->group =
 			(add->group == NULL) ?
 			base->group :
 			add->group;
-	
 
-	
+
+
 		config->errorOverride =
 			(add->errorOverride == DirConfig::UNSET) ?
 			base->errorOverride :
 			add->errorOverride;
-	
 
-	
+
+
 		config->maxRequests =
 			(add->maxRequests == UNSET_INT_VALUE) ?
 			base->maxRequests :
 			add->maxRequests;
-	
 
-	
+
+
 		config->startTimeout =
 			(add->startTimeout == UNSET_INT_VALUE) ?
 			base->startTimeout :
 			add->startTimeout;
-	
 
-	
+
+
 		config->highPerformance =
 			(add->highPerformance == DirConfig::UNSET) ?
 			base->highPerformance :
 			add->highPerformance;
-	
 
-	
+
+
 		config->enabled =
 			(add->enabled == DirConfig::UNSET) ?
 			base->enabled :
 			add->enabled;
-	
 
-	
+
+
 		config->maxRequestQueueSize =
 			(add->maxRequestQueueSize == UNSET_INT_VALUE) ?
 			base->maxRequestQueueSize :
 			add->maxRequestQueueSize;
-	
 
-	
+
+
 		config->loadShellEnvvars =
 			(add->loadShellEnvvars == DirConfig::UNSET) ?
 			base->loadShellEnvvars :
 			add->loadShellEnvvars;
-	
 
-	
+
+
 		config->bufferUpload =
 			(add->bufferUpload == DirConfig::UNSET) ?
 			base->bufferUpload :
 			add->bufferUpload;
-	
 
-	
+
+
 		config->appType =
 			(add->appType == NULL) ?
 			base->appType :
 			add->appType;
-	
 
-	
+
+
 		config->startupFile =
 			(add->startupFile == NULL) ?
 			base->startupFile :
 			add->startupFile;
-	
 
-	
+
+
 		config->stickySessions =
 			(add->stickySessions == DirConfig::UNSET) ?
 			base->stickySessions :
 			add->stickySessions;
-	
 
-	
+
+
 		config->stickySessionsCookieName =
 			(add->stickySessionsCookieName == DirConfig::UNSET) ?
 			base->stickySessionsCookieName :
 			add->stickySessionsCookieName;
-	
+
 

data/ext/common/Account.h

@@ -61,7 +61,7 @@ public:
 	enum Rights {
 		ALL                       = ~0,
 		NONE                      = 0,
-		
+
 		// HelperAgent ApplicationPool rights.
 		CLEAR                     = 1 << 0,
 		DETACH                    = 1 << 1,
@@ -69,11 +69,11 @@ public:
 		RESTART                   = 1 << 3,
 		INSPECT_BASIC_INFO        = 1 << 4,
 		INSPECT_SENSITIVE_INFO    = 1 << 5,
-		
+
 		// HelperAgent admin rights.
 		INSPECT_REQUESTS          = 1 << 8,
 		INSPECT_BACKTRACES        = 1 << 9,
-		
+
 		// Other rights.
 		EXIT                      = 1 << 31
 	};
@@ -87,19 +87,19 @@ private:
 public:
 	// Urgh, I can't use 'Rights' here as type because apparently bitwise
 	// ORing two enums results in an int type.
-	
+
 	static Rights parseRightsString(const string &str, int defaultValue = NONE) {
 		vector<string> rights_vec;
 		vector<string>::const_iterator it;
 		int result = defaultValue;
-		
+
 		split(str, ',', rights_vec);
 		for (it = rights_vec.begin(); it != rights_vec.end(); it++) {
 			if (*it == "all") {
 				result = ALL;
 			} else if (*it == "none") {
 				result = NONE;
-			
+
 			} else if (*it == "clear") {
 				result |= CLEAR;
 			} else if (*it == "detach") {
@@ -110,30 +110,30 @@ public:
 				result |= INSPECT_BASIC_INFO;
 			} else if (*it == "inspect_sensitive_info") {
 				result |= INSPECT_SENSITIVE_INFO;
-			
+
 			} else if (*it == "inspect_requests") {
 				result |= INSPECT_REQUESTS;
 			} else if (*it == "inspect_backtraces") {
 				result |= INSPECT_BACKTRACES;
-				
+
 			} else if (*it == "exit") {
 				result |= EXIT;
-				
+
 			} else if (*it != "") {
 				throw ArgumentException("Unknown right '" + *it + "'.");
 			}
 		}
-		
+
 		return (Rights) result;
 	}
-	
+
 	Account(const string &username, const string &passwordOrHash, bool hashGiven, int rights = ALL) {
 		this->username       = username;
 		this->passwordOrHash = passwordOrHash;
 		this->hashGiven      = hashGiven;
 		this->rights         = (Rights) rights;
 	}
-	
+
 	bool checkPasswordOrHash(const StaticString &userSuppliedPassword) const {
 		if (hashGiven) {
 			return passwordOrHash == createHash(userSuppliedPassword);
@@ -141,23 +141,23 @@ public:
 			return userSuppliedPassword == passwordOrHash;
 		}
 	}
-	
+
 	bool hasRights(int rights) const {
 		return this->rights & rights;
 	}
-	
+
 	void setRights(int rights) {
 		this->rights = (Rights) rights;
 	}
-	
+
 	string getUsername() const {
 		return username;
 	}
-	
+
 	string getRawPassword() const {
 		return passwordOrHash;
 	}
-	
+
 	static string createHash(const StaticString &userSuppliedPassword) {
 		// TODO: use bcrypt or something
 		return userSuppliedPassword;

data/ext/common/AccountsDatabase.h

@@ -49,34 +49,34 @@ private:
 	mutable boost::mutex lock;
 	map<string, AccountPtr> accounts;
 	unsigned int uniqueNumber;
-	
+
 public:
 	AccountsDatabase() {
 		uniqueNumber = 0;
 	}
-	
+
 	unsigned int size() const {
 		boost::lock_guard<boost::mutex> l(lock);
 		return (unsigned int) accounts.size();
 	}
-	
+
 	vector<string> listUsernames() const {
 		map<string, AccountPtr>::const_iterator it;
 		vector<string> result;
-		
+
 		for (it = accounts.begin(); it != accounts.end(); it++) {
 			result.push_back(it->second->getUsername());
 		}
 		return result;
 	}
-	
+
 	AccountPtr add(const string &username, const string &passwordOrHash, bool hashGiven, int rights = Account::ALL) {
 		AccountPtr account(new Account(username, passwordOrHash, hashGiven, rights));
 		boost::lock_guard<boost::mutex> l(lock);
 		accounts[username] = account;
 		return account;
 	}
-	
+
 	const AccountPtr get(const string &username) const {
 		boost::lock_guard<boost::mutex> l(lock);
 		map<string, AccountPtr>::const_iterator it = accounts.find(username);
@@ -86,7 +86,7 @@ public:
 			return it->second;
 		}
 	}
-	
+
 	AccountPtr authenticate(const string &username, const StaticString &userSuppliedPassword) const {
 		boost::lock_guard<boost::mutex> l(lock);
 		map<string, AccountPtr>::const_iterator it = accounts.find(username);
@@ -101,7 +101,7 @@ public:
 			}
 		}
 	}
-	
+
 	bool remove(const string &username) {
 		boost::lock_guard<boost::mutex> l(lock);
 		map<string, AccountPtr>::iterator it = accounts.find(username);
@@ -112,7 +112,7 @@ public:
 			return true;
 		}
 	}
-	
+
 	unsigned int getUniqueNumber() {
 		boost::lock_guard<boost::mutex> l(lock);
 		unsigned int result = uniqueNumber;

data/ext/common/AgentsStarter.cpp

@@ -87,7 +87,7 @@ pp_variant_map_set_strset(PP_VariantMap *m,
 {
 	Passenger::VariantMap *vm = (Passenger::VariantMap *) m;
 	std::set<string> the_set;
-	
+
 	for (unsigned int i = 0; i < count; i++) {
 		the_set.insert(strs[i]);
 	}
@@ -117,7 +117,7 @@ pp_agents_starter_start(PP_AgentsStarter *as,
 	this_thread::disable_syscall_interruption dsi;
 	try {
 		boost::function<void ()> afterForkFunctionObject;
-		
+
 		if (afterFork != NULL) {
 			afterForkFunctionObject = boost::bind(afterFork, callbackArgument);
 		}

data/ext/common/AgentsStarter.h

@@ -128,15 +128,15 @@ private:
 	pid_t pid;
 
 	/******* Information about the started services. Only valid when pid != 0. *******/
-	
+
 	 /** The watchdog's feedback file descriptor. */
 	FileDescriptor feedbackFd;
-	
+
 	/** The helper agent's request socket filename and its password. This socket
 	 * is for serving SCGI requests. */
 	string requestSocketFilename;
 	string requestSocketPassword;
-	
+
 	/** The socket on which the helper agent listens for administration commands,
 	 * and the corresponding password for the "web_server" account, which has the
 	 * authorization to shutdown the helper agent.
@@ -147,12 +147,12 @@ private:
 	/** The logging agent's socket address and its password. */
 	string loggingSocketAddress;
 	string loggingSocketPassword;
-	
+
 	/** The server instance dir and generation dir of the agents. */
 	ServerInstanceDirPtr serverInstanceDir;
 	/** The generation dir of the agents. */
 	ServerInstanceDir::GenerationPtr generation;
-	
+
 	/**
 	 * Safely dup2() the given file descriptor to 3 (FEEDBACK_FD).
 	 */
@@ -174,7 +174,7 @@ private:
 			}
 		}
 	}
-	
+
 	/**
 	 * Call this if the watchdog seems to have crashed. This function will try
 	 * to determine whether the watchdog is still running, whether it crashed
@@ -185,7 +185,7 @@ private:
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
 		int ret, status;
-		
+
 		/* Upon noticing that something went wrong, the watchdog
 		 * or its subprocesses might still be writing out an error
 		 * report, so we wait a while before killing the watchdog.
@@ -218,7 +218,7 @@ private:
 				"with exit code " + toString(WEXITSTATUS(status)));
 		}
 	}
-	
+
 	static void killProcessGroupAndWait(pid_t *pid, unsigned long long timeout = 0) {
 		if (*pid != -1 && (timeout == 0 || timedWaitPid(*pid, NULL, timeout) <= 0)) {
 			this_thread::disable_syscall_interruption dsi;
@@ -227,7 +227,7 @@ private:
 			*pid = -1;
 		}
 	}
-	
+
 	/**
 	 * Behaves like `waitpid(pid, status, WNOHANG)`, but waits at most
 	 * `timeout` miliseconds for the process to exit.
@@ -235,7 +235,7 @@ private:
 	static int timedWaitPid(pid_t pid, int *status, unsigned long long timeout) {
 		Timer timer;
 		int ret;
-		
+
 		do {
 			ret = syscalls::waitpid(pid, status, WNOHANG);
 			if (ret > 0 || ret == -1) {
@@ -246,7 +246,7 @@ private:
 		} while (timer.elapsed() < timeout);
 		return 0; // timed out
 	}
-	
+
 	/**
 	 * Gracefully shutdown an agent process by sending an exit command to its socket.
 	 * Returns whether the agent has successfully processed the exit command.
@@ -258,7 +258,7 @@ private:
 		try {
 			MessageClient client;
 			vector<string> args;
-			
+
 			client.connect(address, username, password);
 			client.write("exit", NULL);
 			return client.read(args) && args[0] == "Passed security" &&
@@ -269,7 +269,7 @@ private:
 		}
 		return false;
 	}
-	
+
 public:
 	/**
 	 * Construct a AgentsStarter object. The watchdog and the agents
@@ -281,7 +281,7 @@ public:
 		this->type = type;
 		pid = 0;
 	}
-	
+
 	~AgentsStarter() {
 		if (pid != 0) {
 			this_thread::disable_syscall_interruption dsi;
@@ -290,7 +290,7 @@ public:
 			cleanShutdown = cleanShutdown &&
 				gracefullyShutdownAgent(loggingSocketAddress,
 					"logging", loggingSocketPassword);
-			
+
 			/* Send a message down the feedback fd to tell the watchdog
 			 * Whether this is a clean shutdown. Closing the fd without
 			 * sending anything also indicates an unclean shutdown,
@@ -302,26 +302,26 @@ public:
 			} else {
 				syscalls::write(feedbackFd, "u", 1);
 			}
-			
+
 			/* If we failed to send an exit command to one of the agents then we have
 			 * to forcefully kill all agents now because otherwise one of them might
 			 * never exit. We do this by closing the feedback fd without sending a
 			 * random byte, to indicate that this is an abnormal shutdown. The watchdog
 			 * will then kill all agents.
 			 */
-			
+
 			feedbackFd.close();
 			syscalls::waitpid(pid, NULL, 0);
 		}
 	}
-	
+
 	/**
 	 * Returns the type as was passed to the constructor.
 	 */
 	PP_AgentsStarterType getType() const {
 		return type;
 	}
-	
+
 	/**
 	 * Returns the watchdog's PID. Equals 0 if the watchdog hasn't been started yet
 	 * or if detach() is called.
@@ -329,41 +329,41 @@ public:
 	pid_t getPid() const {
 		return pid;
 	}
-	
+
 	// The 'const string &' here is on purpose. The C getter functions
 	// return the string pointer directly.
 	const string &getRequestSocketFilename() const {
 		return requestSocketFilename;
 	}
-	
+
 	const string &getRequestSocketPassword() const {
 		return requestSocketPassword;
 	}
-	
+
 	string getHelperAgentAdminSocketFilename() const {
 		return parseUnixSocketAddress(helperAgentAdminSocketAddress);
 	}
-	
+
 	string getHelperAgentExitPassword() const {
 		return helperAgentExitPassword;
 	}
-	
+
 	string getLoggingSocketAddress() const {
 		return loggingSocketAddress;
 	}
-	
+
 	string getLoggingSocketPassword() const {
 		return loggingSocketPassword;
 	}
-	
+
 	ServerInstanceDirPtr getServerInstanceDir() const {
 		return serverInstanceDir;
 	}
-	
+
 	ServerInstanceDir::GenerationPtr getGeneration() const {
 		return generation;
 	}
-	
+
 	/**
 	 * Start the agents through the watchdog.
 	 *
@@ -399,7 +399,7 @@ public:
 		pid = syscalls::fork();
 		if (pid == 0) {
 			// Child
-			
+
 			/* Become the session leader so that Apache can't kill the
 			 * watchdog with killpg() during shutdown, so that a
 			 * Ctrl-C only affects the web server, and so that
@@ -424,7 +424,7 @@ public:
 			if (afterFork) {
 				afterFork();
 			}
-			
+
 			execl(watchdogFilename.c_str(), "PassengerWatchdog", (char *) 0);
 			e = errno;
 			try {
@@ -449,13 +449,13 @@ public:
 			FileDescriptor feedbackFd = fds[0];
 			vector<string> args;
 			bool result = false;
-			
+
 			ScopeGuard guard(boost::bind(&AgentsStarter::killProcessGroupAndWait, &pid, 0));
 			fds[1].close();
-			
-			
+
+
 			/****** Send arguments to watchdog through the feedback channel ******/
-			
+
 			UPDATE_TRACE_POINT();
 			/* Here we don't care about EPIPE and ECONNRESET errors. The watchdog
 			 * could have sent an error message over the feedback fd without
@@ -468,14 +468,14 @@ public:
 					inspectWatchdogCrashReason(pid);
 				}
 			}
-			
-			
+
+
 			/****** Read agents information report ******/
-			
+
 			this_thread::restore_interruption ri(di);
 			this_thread::restore_syscall_interruption rsi(dsi);
 			UPDATE_TRACE_POINT();
-			
+
 			try {
 				result = readArrayMessage(feedbackFd, args);
 			} catch (const SystemException &ex) {
@@ -493,7 +493,7 @@ public:
 				UPDATE_TRACE_POINT();
 				inspectWatchdogCrashReason(pid);
 			}
-			
+
 			if (args[0] == "Agents information") {
 				if ((args.size() - 1) % 2 != 0) {
 					throw RuntimeException("Unable to start the Phusion Passenger watchdog "
@@ -564,7 +564,7 @@ public:
 			}
 		}
 	}
-	
+
 	/**
 	 * Close any file descriptors that this object has, and make it so that the destructor
 	 * doesn't try to shut down the agents.