RubyGems - passenger - Versions diffs - 5.1.2 → 5.1.3 - Mend

passenger 5.1.2 → 5.1.3

Potentially problematic release.

This version of passenger might be problematic. Click here for more details.

Files changed (404) hide show

data/src/agent/Core/SpawningKit/Spawner.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2016 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -137,8 +137,8 @@ protected:
 					"in the format of '/tmp/passenger-spawn-debug.XXX'", e);
 			} else {
 				path = result;
-				this_thread::disable_interruption di;
-				this_thread::disable_syscall_interruption dsi;
+				boost::this_thread::disable_interruption di;
+				boost::this_thread::disable_syscall_interruption dsi;
 				syscalls::chown(result, uid, gid);
 			}
 		}
@@ -452,7 +452,7 @@ protected:
 	ConfigPtr config;
 	static void nonInterruptableKillAndWaitpid(pid_t pid) {
-		this_thread::disable_syscall_interruption dsi;
+		boost::this_thread::disable_syscall_interruption dsi;
 		syscalls::kill(pid, SIGKILL);
 		syscalls::waitpid(pid, NULL, 0);
 	}
@@ -819,8 +819,11 @@ protected:
 	bool shouldLoadShellEnvvars(const Options &options, const SpawnPreparationInfo &preparation) const {
 		if (options.loadShellEnvvars) {
 			string shellName = extractBaseName(preparation.userSwitching.shell);
-			return shellName == "bash" || shellName == "zsh" || shellName == "ksh";
+			bool retVal = shellName == "bash" || shellName == "zsh" || shellName == "ksh";
+			P_DEBUG("shellName = '" << shellName << "' in [bash,zsh,ksh]: " << (retVal ? "true" : "false"));
+			return retVal;
 		} else {
+			P_DEBUG("options.loadShellEnvvars = false");
 			return false;
 		}
 	}

data/src/agent/Core/SpawningKit/UserSwitchingRules.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/UnionStation/Connection.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -106,8 +106,8 @@ struct Connection: public boost::noncopyable {
 	void disconnect() {
 		if (fd != -1) {
-			this_thread::disable_interruption di;
-			this_thread::disable_syscall_interruption dsi;
+			boost::this_thread::disable_interruption di;
+			boost::this_thread::disable_syscall_interruption dsi;
 			safelyClose(fd);
 			P_LOG_FILE_DESCRIPTOR_CLOSE(fd);
 			fd = -1;

data/src/agent/Core/UnionStation/Context.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/UnionStation/StopwatchLog.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2016 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/UnionStation/Transaction.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Shared/ApiServerUtils.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2015 Phusion Holding B.V.
+ *  Copyright (c) 2015-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Shared/ApplicationPoolApiKey.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2015 Phusion Holding B.V.
+ *  Copyright (c) 2015-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Shared/Base.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Shared/Base.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/SpawnPreparer/SpawnPreparerMain.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2012-2016 Phusion Holding B.V.
+ *  Copyright (c) 2012-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/SystemMetrics/SystemMetricsMain.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014 Phusion Holding B.V.
+ *  Copyright (c) 2014-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/TempDirToucher/TempDirToucherMain.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013-2014 Phusion Holding B.V.
+ *  Copyright (c) 2013-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/UstRouter/ApiServer.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013-2015 Phusion Holding B.V.
+ *  Copyright (c) 2013-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/UstRouter/Client.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/UstRouter/Controller.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2016 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/UstRouter/FileSink.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/UstRouter/LogSink.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2016 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/UstRouter/OptionParser.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2016 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/UstRouter/RemoteSender.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/UstRouter/RemoteSink.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/UstRouter/Transaction.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2016 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/UstRouter/UstRouterMain.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2016 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -456,7 +456,7 @@ apiServerShutdownFinished(UstRouter::ApiServer *server) {
  */
 static void
 waitForExitEvent() {
-	this_thread::disable_syscall_interruption dsi;
+	boost::this_thread::disable_syscall_interruption dsi;
 	WorkingObjects *wo = workingObjects;
 	fd_set fds;
 	int largestFd = -1;

data/src/agent/Watchdog/AgentWatcher.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -37,7 +37,7 @@ private:
 			pid_t pid, ret;
 			int status, e;
-			while (!this_thread::interruption_requested()) {
+			while (!boost::this_thread::interruption_requested()) {
 				{
 					boost::lock_guard<boost::mutex> l(lock);
 					pid = this->pid;
@@ -70,8 +70,8 @@ private:
 					this->pid = 0;
 				}
-				this_thread::disable_interruption di;
-				this_thread::disable_syscall_interruption dsi;
+				boost::this_thread::disable_interruption di;
+				boost::this_thread::disable_syscall_interruption dsi;
 				if (ret == -1) {
 					P_WARN(name() << " (pid=" << pid << ") crashed or killed for "
 						"an unknown reason (errno = " <<
@@ -178,8 +178,8 @@ protected:
 	 * Does not wait until it has quit.
 	 */
 	static void killAndDontWait(pid_t pid) {
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
+		boost::this_thread::disable_interruption di;
+		boost::this_thread::disable_syscall_interruption dsi;
 		syscalls::kill(pid, SIGTERM);
 	}
@@ -188,8 +188,8 @@ protected:
 	 * Then wait until it has quit.
 	 */
 	static void killProcessGroupAndWait(pid_t pid) {
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
+		boost::this_thread::disable_interruption di;
+		boost::this_thread::disable_syscall_interruption dsi;
 		// If the process is a process group leader then killing the
 		// group will likely kill all its child processes too.
 		if (syscalls::killpg(pid, SIGKILL) == -1) {
@@ -255,8 +255,8 @@ public:
 	 * Starts the agent process. May throw arbitrary exceptions.
 	 */
 	virtual pid_t start() {
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
+		boost::this_thread::disable_interruption di;
+		boost::this_thread::disable_syscall_interruption dsi;
 		string exeFilename = getExeFilename();
 		SocketPair fds;
 		int e, ret;
@@ -337,8 +337,8 @@ public:
 			vector<string> args;
 			fds[1].close();
-			this_thread::restore_interruption ri(di);
-			this_thread::restore_syscall_interruption rsi(dsi);
+			boost::this_thread::restore_interruption ri(di);
+			boost::this_thread::restore_syscall_interruption rsi(dsi);
 			ScopeGuard failGuard(boost::bind(killProcessGroupAndWait, pid));
 			/* Send startup arguments. Ignore EPIPE and ECONNRESET here
@@ -368,8 +368,8 @@ public:
 				}
 			}
 			if (!ret) {
-				this_thread::disable_interruption di2;
-				this_thread::disable_syscall_interruption dsi2;
+				boost::this_thread::disable_interruption di2;
+				boost::this_thread::disable_syscall_interruption dsi2;
 				int status;
 				/* The feedback fd was prematurely closed for an unknown reason.

data/src/agent/Watchdog/ApiServer.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2015 Phusion Holding B.V.
+ *  Copyright (c) 2014-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Watchdog/CoreWatcher.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Watchdog/InstanceDirToucher.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -36,13 +36,13 @@ private:
 	void
 	threadMain() {
-		while (!this_thread::interruption_requested()) {
+		while (!boost::this_thread::interruption_requested()) {
 			syscalls::sleep(60 * 60);
 			begin_touch:
-			this_thread::disable_interruption di;
-			this_thread::disable_syscall_interruption dsi;
+			boost::this_thread::disable_interruption di;
+			boost::this_thread::disable_syscall_interruption dsi;
 			// Fork a process which touches everything in the server instance dir.
 			pid_t pid = syscalls::fork();
 			if (pid == 0) {
@@ -90,8 +90,8 @@ private:
 				// Error
 				P_WARN("Could not touch the server instance directory because "
 					"fork() failed. Retrying in 2 minutes...");
-				this_thread::restore_interruption si(di);
-				this_thread::restore_syscall_interruption rsi(dsi);
+				boost::this_thread::restore_interruption si(di);
+				boost::this_thread::restore_syscall_interruption rsi(dsi);
 				syscalls::sleep(60 * 2);
 				goto begin_touch;
 			} else {

data/src/agent/Watchdog/UstRouterWatcher.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Watchdog/WatchdogMain.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -387,8 +387,8 @@ deletePidFile(const WorkingObjectsPtr &wo) {
 static void
 cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watchers, char *argv[]) {
-	this_thread::disable_interruption di;
-	this_thread::disable_syscall_interruption dsi;
+	boost::this_thread::disable_interruption di;
+	boost::this_thread::disable_syscall_interruption dsi;
 	pid_t pid;
 	int e;
@@ -1330,8 +1330,8 @@ watchdogMain(int argc, char *argv[]) {
 		runHookScriptAndThrowOnError("after_watchdog_initialization");
 		UPDATE_TRACE_POINT();
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
+		boost::this_thread::disable_interruption di;
+		boost::this_thread::disable_syscall_interruption dsi;
 		bool shouldExitGracefully = waitForStarterProcessOrWatchers(wo, watchers);
 		if (shouldExitGracefully) {
 			/* Fork a child process which cleans up all the agent processes in

data/src/apache2_module/Bucket.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/apache2_module/Bucket.h CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/apache2_module/Configuration.cpp CHANGED

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2016 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.