passenger 5.0.4 → 5.0.5

data/doc/users_guide_snippets/installation.txt

@@ -157,11 +157,11 @@ ifdef::apache[]
 sudo apt-get install libapache2-mod-passenger
 --------------------------------------------------------------
 +
-3. Enable the Phusion Passenger Apache module and restart Apache:
+3. Enable the Phusion Passenger Apache module and stop/start Apache (reload or restart is not enough when upgrading):
 +
 --------------------------------------------------------------
 sudo a2enmod passenger
-sudo service apache2 restart
+sudo apache2ctl stop; sudo apache2ctl start
 --------------------------------------------------------------
 endif::[]
 ifdef::standalone[]
@@ -197,11 +197,11 @@ ifdef::apache[]
 sudo apt-get install libapache2-mod-passenger-enterprise
 --------------------------------------------------------------
 +
-4. Enable the Phusion Passenger Apache module and restart Apache:
+4. Enable the Phusion Passenger Apache module and stop/start Apache (reload or restart is not enough when upgrading):
 +
 --------------------------------------------------------------
 sudo a2enmod passenger
-sudo service apache2 restart
+sudo apache2ctl stop; sudo apache2ctl start
 --------------------------------------------------------------
 endif::[]
 ifdef::standalone[]

data/ext/apache2/Configuration.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.
  *
@@ -235,7 +235,8 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_root, root)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_default_ruby, defaultRuby)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_log_level, logLevel, unsigned int, 0)
-DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_debug_log_file, debugLogFile)
+DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_log_file, logFile)
+DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_file_descriptor_log_file, fileDescriptorLogFile)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_max_pool_size, maxPoolSize, unsigned int, 1)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_pool_idle_time, poolIdleTime, unsigned int, 0)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_response_buffer_high_watermark, responseBufferHighWatermark, unsigned int, 0)
@@ -396,11 +397,16 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Passenger log verbosity."),
-	AP_INIT_TAKE1("PassengerDebugLogFile",
-		(Take1Func) cmd_passenger_debug_log_file,
+	AP_INIT_TAKE1("PassengerLogFile",
+		(Take1Func) cmd_passenger_log_file,
+		NULL,
+		RSRC_CONF,
+		"Passenger log file."),
+	AP_INIT_TAKE1("PassengerFileDescriptorLogFile",
+		(Take1Func) cmd_passenger_file_descriptor_log_file,
 		NULL,
 		RSRC_CONF,
-		"Passenger debug log file."),
+		"Passenger file descriptor log file."),
 	AP_INIT_TAKE1("PassengerMaxPoolSize",
 		(Take1Func) cmd_passenger_max_pool_size,
 		NULL,
@@ -578,6 +584,11 @@ const command_rec passenger_commands[] = {
 		"The number of threads that Phusion Passenger should spawn per application."),
 
 	// Backwards compatibility options.
+	AP_INIT_TAKE1("PassengerDebugLogFile",
+		(Take1Func) cmd_passenger_log_file,
+		NULL,
+		RSRC_CONF,
+		"Passenger log file."),
 	AP_INIT_TAKE1("RailsRuby",
 		(Take1Func) cmd_passenger_ruby,
 		NULL,

data/ext/apache2/Configuration.hpp

@@ -177,7 +177,8 @@ struct ServerConfig {
 	int logLevel;
 
 	/** A file to print debug messages to, or NULL to just use STDERR. */
-	const char *debugLogFile;
+	const char *logFile;
+	const char *fileDescriptorLogFile;
 
 	/** The maximum number of simultaneously alive application
 	 * instances. */
@@ -219,7 +220,8 @@ struct ServerConfig {
 		root               = NULL;
 		defaultRuby        = DEFAULT_RUBY;
 		logLevel           = DEFAULT_LOG_LEVEL;
-		debugLogFile       = NULL;
+		logFile            = NULL;
+		fileDescriptorLogFile = NULL;
 		maxPoolSize        = DEFAULT_MAX_POOL_SIZE;
 		poolIdleTime       = DEFAULT_POOL_IDLE_TIME;
 		responseBufferHighWatermark = DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK;

data/ext/apache2/Hooks.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.
  *
@@ -52,15 +52,16 @@
 #include "Hooks.h"
 #include "Bucket.h"
 #include "Configuration.hpp"
-#include "Utils.h"
-#include "Utils/IOUtils.h"
-#include "Utils/Timer.h"
-#include "Utils/HttpConstants.h"
-#include "Utils/modp_b64.h"
-#include "Logging.h"
-#include "AgentsStarter.h"
 #include "DirectoryMapper.h"
-#include "Constants.h"
+#include <Utils.h>
+#include <Utils/IOUtils.h>
+#include <Utils/StrIntUtils.h>
+#include <Utils/Timer.h>
+#include <Utils/HttpConstants.h>
+#include <Utils/modp_b64.h>
+#include <Logging.h>
+#include <AgentsStarter.h>
+#include <Constants.h>
 
 /* The Apache/APR headers *must* come after the Boost headers, otherwise
  * compilation will fail on OpenBSD.
@@ -245,7 +246,7 @@ private:
 		FileDescriptor conn;
 
 		try {
-			conn = connectToServer(getServerAddress());
+			conn.assign(connectToServer(getServerAddress(), __FILE__, __LINE__), NULL, 0);
 		} catch (const SystemException &e) {
 			if (e.code() == EPIPE || e.code() == ECONNREFUSED || e.code() == ENOENT) {
 				UPDATE_TRACE_POINT();
@@ -259,7 +260,7 @@ private:
 				time_t deadline = time(NULL) + 5;
 				while (!connected && time(NULL) < deadline) {
 					try {
-						conn = connectToServer(getServerAddress());
+						conn.assign(connectToServer(getServerAddress(), __FILE__, __LINE__), NULL, 0);
 						connected = true;
 					} catch (const SystemException &e) {
 						if (e.code() == EPIPE || e.code() == ECONNREFUSED || e.code() == ENOENT) {
@@ -741,6 +742,27 @@ private:
 		return lookupInTable(r->subprocess_env, name);
 	}
 
+	bool connectionUpgradeFlagSet(const char *header) const {
+		size_t headerSize = strlen(header);
+		if (headerSize < 1024) {
+			char buffer[headerSize + 1];
+			return connectionUpgradeFlagSet(header, headerSize, buffer, headerSize + 1);
+		} else {
+			DynamicBuffer buffer(headerSize + 1);
+			return connectionUpgradeFlagSet(header, headerSize, buffer.data, headerSize + 1);
+		}
+	}
+
+	bool connectionUpgradeFlagSet(const char *header, size_t headerSize,
+		char *buffer, size_t bufsize) const
+	{
+		assert(bufsize > headerSize);
+		memcpy(buffer, header, headerSize);
+		convertLowerCase((unsigned char *) buffer, headerSize);
+		buffer[headerSize] = '\0';
+		return strstr(buffer, "upgrade");
+	}
+
 	void addHeader(string &headers, const StaticString &name, const char *value) {
 		if (value != NULL) {
 			headers.append(name.data(), name.size());
@@ -851,12 +873,10 @@ private:
 			}
 		}
 
-		if (connectionHeader == NULL || strcasecmp(connectionHeader->val, "keep-alive") == 0) {
-			result.append("Connection: close\r\n", sizeof("Connection: close\r\n") - 1);
+		if (connectionHeader != NULL && connectionUpgradeFlagSet(connectionHeader->val)) {
+			result.append("Connection: upgrade\r\n", sizeof("Connection: upgrade\r\n") - 1);
 		} else {
-			result.append("Connection: ", sizeof("Connection: ") - 1);
-			result.append(connectionHeader->val);
-			result.append("\r\n", 2);
+			result.append("Connection: close\r\n", sizeof("Connection: close\r\n") - 1);
 		}
 
 		if (transferEncodingHeader != NULL) {
@@ -1185,8 +1205,11 @@ public:
 	{
 		serverConfig.finalize();
 		Passenger::setLogLevel(serverConfig.logLevel);
-		if (serverConfig.debugLogFile != NULL) {
-			Passenger::setLogFile(serverConfig.debugLogFile);
+		if (serverConfig.logFile != NULL) {
+			Passenger::setLogFile(serverConfig.logFile);
+		}
+		if (serverConfig.fileDescriptorLogFile != NULL) {
+			Passenger::setFileDescriptorLogFile(serverConfig.fileDescriptorLogFile);
 		}
 		m_hasModRewrite = UNKNOWN;
 		m_hasModDir = UNKNOWN;
@@ -1215,7 +1238,9 @@ public:
 			.set    ("server_software", webServerDesc)
 			.setBool("multi_app", true)
 			.setBool("load_shell_envvars", true)
-			.set    ("debug_log_file", (serverConfig.debugLogFile == NULL) ? "" : serverConfig.debugLogFile)
+			.set    ("log_file", (serverConfig.logFile == NULL) ? "" : serverConfig.logFile)
+			.set    ("file_descriptor_log_file", (serverConfig.fileDescriptorLogFile == NULL)
+				? "" : serverConfig.fileDescriptorLogFile)
 			.set    ("data_buffer_dir", serverConfig.dataBufferDir)
 			.set    ("instance_registry_dir", serverConfig.instanceRegistryDir)
 			.setBool("user_switching", serverConfig.userSwitching)

data/ext/boost/libs/thread/src/pthread/once.cpp

@@ -3,6 +3,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#define IN_ONCE_CPP
+
 #include <boost/thread/detail/config.hpp>
 #ifdef BOOST_THREAD_ONCE_ATOMIC
 #include "./once_atomic.cpp"

data/ext/boost/libs/thread/src/pthread/once_atomic.cpp

@@ -4,6 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+// Our build system will compile once_atomic.o, but the symbols in this file are already included in once.o.
+// This guard here prevents once_atomic.o from containing a duplicate of those symbols.
+#ifdef IN_ONCE_CPP
+
 //#define __STDC_CONSTANT_MACROS
 #include <boost/thread/detail/config.hpp>
 #include <boost/thread/once.hpp>
@@ -88,3 +92,5 @@ namespace boost
   } // namespace thread_detail
 
 } // namespace boost
+
+#endif /* IN_ONCE_CPP */

data/ext/common/AgentsStarter.h

@@ -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.
  *
@@ -326,7 +326,7 @@ public:
 			.setInt ("log_level",       getLogLevel());
 		extraParams.addTo(params);
 
-		fds = createUnixSocketPair();
+		fds = createUnixSocketPair(__FILE__, __LINE__);
 		pid = syscalls::fork();
 		if (pid == 0) {
 			// Child
@@ -388,6 +388,7 @@ public:
 
 			ScopeGuard guard(boost::bind(&AgentsStarter::killProcessGroupAndWait, &pid, 0));
 			fds[1].close();
+			P_LOG_FILE_DESCRIPTOR_PURPOSE(feedbackFd, "AgentsStarter: feedback FD");
 
 
 			/****** Send arguments to watchdog through the feedback channel ******/

data/ext/common/ApplicationPool2/DirectSpawner.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2014 Phusion
+ *  Copyright (c) 2011-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -160,8 +160,8 @@ public:
 		shared_array<const char *> args;
 		SpawnPreparationInfo preparation = prepareSpawn(options);
 		vector<string> command = createCommand(options, preparation, args);
-		SocketPair adminSocket = createUnixSocketPair();
-		Pipe errorPipe = createPipe();
+		SocketPair adminSocket = createUnixSocketPair(__FILE__, __LINE__);
+		Pipe errorPipe = createPipe(__FILE__, __LINE__);
 		DebugDirPtr debugDir = boost::make_shared<DebugDir>(preparation.uid, preparation.gid);
 		pid_t pid;
 
@@ -199,6 +199,16 @@ public:
 			throw SystemException("Cannot fork a new process", e);
 
 		} else {
+			UPDATE_TRACE_POINT();
+			P_LOG_FILE_DESCRIPTOR_PURPOSE(adminSocket.first,
+				"App " << pid << " (" << options.appRoot << ") adminSocket[0]");
+			P_LOG_FILE_DESCRIPTOR_PURPOSE(adminSocket.second,
+				"App " << pid << " (" << options.appRoot << ") adminSocket[1]");
+			P_LOG_FILE_DESCRIPTOR_PURPOSE(errorPipe.first,
+				"App " << pid << " (" << options.appRoot << ") errorPipe[0]");
+			P_LOG_FILE_DESCRIPTOR_PURPOSE(errorPipe.second,
+				"App " << pid << " (" << options.appRoot << ") errorPipe[1]");
+
 			UPDATE_TRACE_POINT();
 			ScopeGuard guard(boost::bind(nonInterruptableKillAndWaitpid, pid));
 			P_DEBUG("Process forked for appRoot=" << options.appRoot << ": PID " << pid);
@@ -208,7 +218,7 @@ public:
 			NegotiationDetails details;
 			details.preparation = &preparation;
 			details.stderrCapturer =
-				make_shared<BackgroundIOCapturer>(
+				boost::make_shared<BackgroundIOCapturer>(
 					errorPipe.first,
 					pid,
 					// The cast works around a compilation problem in Clang.

data/ext/common/ApplicationPool2/DummySpawner.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2014 Phusion
+ *  Copyright (c) 2011-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -54,17 +54,22 @@ public:
 		TRACE_POINT();
 		possiblyRaiseInternalError(options);
 
-		SocketPair adminSocket = createUnixSocketPair();
+		pid_t pid;
+		{
+			boost::lock_guard<boost::mutex> l(lock);
+			count++;
+			pid = count;
+		}
+
+		SocketPair adminSocket = createUnixSocketPair(__FILE__, __LINE__);
 		SocketList sockets;
-		sockets.add("main", "tcp://127.0.0.1:1234", "session", config->concurrency);
+		sockets.add(pid, "main", "tcp://127.0.0.1:1234", "session", config->concurrency);
 		syscalls::usleep(config->spawnTime);
 
-		boost::lock_guard<boost::mutex> l(lock);
-		count++;
 		SpawnObject object;
-		string gupid = "gupid-" + toString(count);
+		string gupid = "gupid-" + toString(pid);
 		object.process = boost::make_shared<Process>(
-			(pid_t) count, gupid,
+			pid, gupid,
 			adminSocket.second, FileDescriptor(), sockets,
 			SystemTime::getUsec(), SystemTime::getUsec());
 		object.process->dummy = true;

data/ext/common/ApplicationPool2/Implementation.cpp

@@ -198,7 +198,7 @@ void processAndLogNewSpawnException(SpawnException &e, const Options &options,
 				getSystemTempDir());
 			fd = mkstemp(filename);
 		#endif
-		FdGuard guard(fd, true);
+		FdGuard guard(fd, NULL, 0, true);
 		if (fd == -1) {
 			int e = errno;
 			throw SystemException("Cannot generate a temporary filename",

data/ext/common/ApplicationPool2/Process.h

@@ -484,12 +484,13 @@ public:
 
 		P_TRACE(2, "Cleaning up process " << inspect());
 		if (!dummy) {
-			SocketList::const_iterator it, end = sockets.end();
+			SocketList::iterator it, end = sockets.end();
 			for (it = sockets.begin(); it != end; it++) {
 				if (getSocketAddressType(it->address) == SAT_UNIX) {
 					string filename = parseUnixSocketAddress(it->address);
 					syscalls::unlink(filename.c_str());
 				}
+				it->closeAllConnections();
 			}
 		}
 

data/ext/common/ApplicationPool2/Session.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2014 Phusion
+ *  Copyright (c) 2011-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -72,9 +72,9 @@ private:
 	mutable boost::atomic<int> refcount;
 	bool closed;
 
-	void deinitiate(bool success, bool persistent) {
+	void deinitiate(bool success, bool wantKeepAlive) {
 		connection.fail = !success;
-		connection.persistent = persistent;
+		connection.wantKeepAlive = wantKeepAlive;
 		socket->checkinConnection(connection);
 		connection.fd = -1;
 	}
@@ -150,7 +150,7 @@ public:
 		Connection connection = socket->checkoutConnection();
 		connection.fail = true;
 		if (connection.blocking && !blocking) {
-			FdGuard g2(connection.fd);
+			FdGuard g2(connection.fd, NULL, 0);
 			setNonBlocking(connection.fd);
 			g2.clear();
 			connection.blocking = false;
@@ -172,9 +172,9 @@ public:
 	/**
 	 * This Session object becomes fully unsable after closing.
 	 */
-	void close(bool success, bool persistent = false) {
+	void close(bool success, bool wantKeepAlive = false) {
 		if (OXT_LIKELY(initiated())) {
-			deinitiate(success, persistent);
+			deinitiate(success, wantKeepAlive);
 		}
 		if (OXT_LIKELY(!closed)) {
 			callOnClose();

data/ext/common/ApplicationPool2/SmartSpawner.h

@@ -212,8 +212,8 @@ private:
 		shared_array<const char *> args;
 		preparation = prepareSpawn(options);
 		vector<string> command = createRealPreloaderCommand(options, args);
-		SocketPair adminSocket = createUnixSocketPair();
-		Pipe errorPipe = createPipe();
+		SocketPair adminSocket = createUnixSocketPair(__FILE__, __LINE__);
+		Pipe errorPipe = createPipe(__FILE__, __LINE__);
 		DebugDirPtr debugDir = boost::make_shared<DebugDir>(preparation.uid, preparation.gid);
 		pid_t pid;
 
@@ -251,6 +251,17 @@ private:
 			throw SystemException("Cannot fork a new process", e);
 
 		} else {
+			UPDATE_TRACE_POINT();
+			P_LOG_FILE_DESCRIPTOR_PURPOSE(adminSocket.first,
+				"Preloader " << pid << " (" << options.appRoot << ") adminSocket[0]");
+			P_LOG_FILE_DESCRIPTOR_PURPOSE(adminSocket.second,
+				"Preloader " << pid << " (" << options.appRoot << ") adminSocket[1]");
+			P_LOG_FILE_DESCRIPTOR_PURPOSE(errorPipe.first,
+				"Preloader " << pid << " (" << options.appRoot << ") errorPipe[0]");
+			P_LOG_FILE_DESCRIPTOR_PURPOSE(errorPipe.second,
+				"Preloader " << pid << " (" << options.appRoot << ") errorPipe[1]");
+
+			UPDATE_TRACE_POINT();
 			ScopeGuard guard(boost::bind(nonInterruptableKillAndWaitpid, pid));
 			P_DEBUG("Preloader process forked for appRoot=" << options.appRoot << ": PID " << pid);
 			adminSocket.first.close();
@@ -261,7 +272,7 @@ private:
 			details.adminSocket = adminSocket.second;
 			details.io = BufferedIO(adminSocket.second);
 			details.stderrCapturer =
-				make_shared<BackgroundIOCapturer>(
+				boost::make_shared<BackgroundIOCapturer>(
 					errorPipe.first,
 					pid,
 					// The cast works around a compilation problem in Clang.
@@ -610,7 +621,7 @@ private:
 		TRACE_POINT();
 		FileDescriptor fd;
 		try {
-			fd = connectToServer(socketAddress);
+			fd.assign(connectToServer(socketAddress, __FILE__, __LINE__), NULL, 0);
 		} catch (const SystemException &e) {
 			BackgroundIOCapturerPtr stderrCapturer;
 			throwPreloaderSpawnException("An error occurred while starting "
@@ -621,6 +632,8 @@ private:
 				options,
 				DebugDirPtr());
 		}
+		P_LOG_FILE_DESCRIPTOR_PURPOSE(fd, "Preloader " << pid
+			<< " (" << options.appRoot << ") connection");
 
 		UPDATE_TRACE_POINT();
 		BufferedIO io(fd);
@@ -671,6 +684,8 @@ private:
 			}
 
 			SpawnResult result;
+			P_LOG_FILE_DESCRIPTOR_PURPOSE(fd, "App " << spawnedPid
+				<< " (" << options.appRoot << ") adminSocket[1]");
 			result.pid = spawnedPid;
 			result.adminSocket = fd;
 			result.io = io;