passenger 5.3.6 → 5.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27fdb440901c77aa2135aa5f07cf188a7338189e
-  data.tar.gz: cb72c15e734fbb8c51c4c7a916d9aabf5d1478c2
+  metadata.gz: 857ea86d5ea2297a7491238a392c0a7d9e348542
+  data.tar.gz: a89b76d3df1a388920eb760a87b1a99346141f89
 SHA512:
-  metadata.gz: f153a84806f88abfe377142fb235c18fad93719b8b5c4d9840f04acf20f80eafff000190c67fc3905e2677fdad27053e3f997c853fdebbfc306a3812fc88f585
-  data.tar.gz: dfe5d428044f9b6a423db9fd5baa17882e199fa17f18118ed746becdd37562854fe201470f562eabfbf36a39a4e1e91d106d65cab2cefcd940e6bfdbfe1ca91f
+  metadata.gz: 33bcfb347239ec371251917e7321b26459ebadc7d4d06fcfbbcb692e65a1554d8fb4ba3bae6f4857121d0ecc98a806597ac89fc4fc2b22bafc5fdebabb504a99
+  data.tar.gz: 15106f30ef5d620c369362a8e1763cd6d4a7a9af1d449ec24441b3406aaf07788e390a83a62e93a98cf17cb437d70b1ad7a52ad5eef1c77d99408bc63e0dd9bc

data/CHANGELOG

@@ -1,3 +1,13 @@
+Release 5.3.7
+-------------
+
+ * Fixes package installation issues on Ubuntu 18.04. These issues were caused by an update released by Ubuntu on the nginx-common package. Closes GH-2122, GH-2140.
+ * Fixes compilation problems and warnings with GCC 8.2. Tested on Alpine Linux edge 2018-11-05. Closes GH-2139.
+ * Fixes compatibility with libcurl 7.62.0. Contributed by Po-Chuan Hsieh (@sunpoet).
+ * Changes minimum supported macOS version to 10.11 El Capitan.
+ * Removes packages for Ubuntu 17.10 Artful.
+
+
 Release 5.3.6
 -------------
 

data/CONTRIBUTORS

@@ -79,6 +79,7 @@ Pepijn Looije
 Perry Smith
 Philip M. Gollucci
 PikachuEXE
+Po-Chuan Hsieh
 Radagaisus
 Redmar Kerkhoff
 remi

data/build/support/cxx_dependency_map.rb

@@ -7752,6 +7752,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/StrIntTools/DateParsing.h",
    "src/cxx_supportlib/StrIntTools/StrIntUtils.h",
    "src/cxx_supportlib/StrIntTools/StringScanning.h",
+   "src/cxx_supportlib/SystemTools/ContainerHelpers.h",
    "src/cxx_supportlib/SystemTools/ProcessMetricsCollector.h",
    "src/cxx_supportlib/SystemTools/SystemMetricsCollector.h",
    "src/cxx_supportlib/SystemTools/SystemTime.h",
@@ -9940,6 +9941,10 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/StrIntTools/StrIntUtils.h",
    "src/cxx_supportlib/oxt/macros.hpp"],
+ "src/cxx_supportlib/SystemTools/ContainerHelpers.h"=>
+  ["src/cxx_supportlib/FileTools/FileManip.h",
+   "src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/oxt/macros.hpp"],
  "src/cxx_supportlib/SystemTools/ProcessMetricsCollector.h"=>
   ["src/cxx_supportlib/Algorithms/Hasher.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",

data/src/agent/Core/AdminPanelConnector.h

@@ -433,7 +433,7 @@ private:
 			pair<uid_t, gid_t> ids;
 			try {
 				ids = appPool->getGroupRunUidAndGids(key);
-			} catch (RuntimeException e) {
+			} catch (const RuntimeException &) {
 				files = Json::nullValue;
 			}
 			if (!files.isNull()) {

data/src/agent/Core/ApplicationPool/Group.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -36,6 +36,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/container/vector.hpp>
+#include <boost/container/small_vector.hpp>
 #include <boost/atomic.hpp>
 #include <oxt/macros.hpp>
 #include <oxt/thread.hpp>
@@ -44,7 +45,6 @@
 #include <sys/stat.h>
 #include <cstdlib>
 #include <cassert>
-#include <SmallVector.h>
 #include <MemoryKit/palloc.h>
 #include <WrapperRegistry/Registry.h>
 #include <Hooks.h>

data/src/agent/Core/ApplicationPool/Group/InternalUtils.cpp

@@ -295,7 +295,7 @@ Group::assignSessionsToGetWaitersQuickly(Lock &lock) {
 		return;
 	}
 
-	SmallVector<GetAction, 8> actions;
+	boost::container::small_vector<GetAction, 8> actions;
 	unsigned int i = 0;
 	bool done = false;
 
@@ -320,7 +320,7 @@ Group::assignSessionsToGetWaitersQuickly(Lock &lock) {
 
 	verifyInvariants();
 	lock.unlock();
-	SmallVector<GetAction, 50>::const_iterator it, end = actions.end();
+	boost::container::small_vector<GetAction, 50>::const_iterator it, end = actions.end();
 	for (it = actions.begin(); it != end; it++) {
 		it->callback(it->session, ExceptionPtr());
 	}

data/src/agent/Core/ApplicationPool/Group/OutOfBandWork.cpp

@@ -228,7 +228,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 		// This is copied from Core::Controller when it is sending data using the
 		// "session" protocol.
 		char sizeField[sizeof(boost::uint32_t)];
-		SmallVector<StaticString, 10> data;
+		boost::container::small_vector<StaticString, 10> data;
 
 		data.push_back(StaticString(sizeField, sizeof(boost::uint32_t)));
 		data.push_back(P_STATIC_STRING_WITH_NULL("REQUEST_METHOD"));

data/src/agent/Core/ApplicationPool/Socket.h

@@ -31,9 +31,9 @@
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/container/small_vector.hpp>
 #include <climits>
 #include <cassert>
-#include <SmallVector.h>
 #include <LoggingKit/LoggingKit.h>
 #include <StaticString.h>
 #include <MemoryKit/palloc.h>
@@ -263,7 +263,7 @@ public:
 	}
 };
 
-class SocketList: public SmallVector<Socket, 1> {
+class SocketList: public boost::container::small_vector<Socket, 1> {
 public:
 	void add(pid_t pid, const StaticString &address, const StaticString &protocol,
 		const StaticString &description, int concurrency, bool acceptHttpRequests)

data/src/agent/Core/Config.h

@@ -157,7 +157,7 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/5.3.6")
+ *   server_software                                                 string             -          default("Phusion_Passenger/5.3.7")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_type                                        string             -          read_only

data/src/agent/Core/Controller/Config.h

@@ -113,7 +113,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/5.3.6")
+ *   server_software                                     string             -          default("Phusion_Passenger/5.3.7")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

data/src/agent/Core/Controller/ForwardResponse.cpp

@@ -278,6 +278,7 @@ Controller::onAppSourceData(Client *client, Request *req, const MemoryKit::mbuf
 			endRequestWithAppSocketReadError(&client, &req, errcode);
 			return Channel::Result(0, true);
 		}
+		break; // Never reached, shut up compiler warning.
 
 	case AppResponse::PARSING_BODY_UNTIL_EOF:
 	case AppResponse::UPGRADED:
@@ -305,11 +306,14 @@ Controller::onAppSourceData(Client *client, Request *req, const MemoryKit::mbuf
 			endRequestWithAppSocketReadError(&client, &req, errcode);
 			return Channel::Result(0, false);
 		}
+		break; // Never reached, shut up compiler warning.
 
 	default:
 		P_BUG("Invalid request HTTP state " << (int) resp->httpState);
 		return Channel::Result(0, false);
 	}
+
+	return Channel::Result(0, false); // Never reached, shut up compiler warning.
 }
 
 void

data/src/agent/Core/Controller/SendRequest.cpp

@@ -305,13 +305,13 @@ httpHeaderToScgiUpperCase(unsigned char *data, unsigned int size) {
 
 	i = imax * 8;
 	switch (leftover) {
-	case 7: *data++ = (unsigned char) toUpperMap[buf[i++]];
-	case 6: *data++ = (unsigned char) toUpperMap[buf[i++]];
-	case 5: *data++ = (unsigned char) toUpperMap[buf[i++]];
-	case 4: *data++ = (unsigned char) toUpperMap[buf[i++]];
-	case 3: *data++ = (unsigned char) toUpperMap[buf[i++]];
-	case 2: *data++ = (unsigned char) toUpperMap[buf[i++]];
-	case 1: *data++ = (unsigned char) toUpperMap[buf[i]];
+	case 7: *data++ = (unsigned char) toUpperMap[buf[i++]]; /* Falls through. */
+	case 6: *data++ = (unsigned char) toUpperMap[buf[i++]]; /* Falls through. */
+	case 5: *data++ = (unsigned char) toUpperMap[buf[i++]]; /* Falls through. */
+	case 4: *data++ = (unsigned char) toUpperMap[buf[i++]]; /* Falls through. */
+	case 3: *data++ = (unsigned char) toUpperMap[buf[i++]]; /* Falls through. */
+	case 2: *data++ = (unsigned char) toUpperMap[buf[i++]]; /* Falls through. */
+	case 1: *data++ = (unsigned char) toUpperMap[buf[i]]; /* Falls through. */
 	case 0: break;
 	}
 }

data/src/agent/Core/SecurityUpdateChecker.h

@@ -256,9 +256,11 @@ private:
 				error.append(" for proxy address " + sessionState.config["proxy_url"].asString());
 				break;
 
+#if LIBCURL_VERSION_NUM < 0x073e00
 			case CURLE_SSL_CACERT:
 				// Peer certificate cannot be authenticated with given / known CA certificates. This would happen
 				// for MITM but could also be a truststore issue.
+#endif
 			case CURLE_PEER_FAILED_VERIFICATION:
 				// The remote server's SSL certificate or SSH md5 fingerprint was deemed not OK.
 				error.append(" while connecting to " + sessionState.configRlz.url

data/src/agent/Core/SpawningKit/DirectSpawner.h

@@ -171,7 +171,7 @@ private:
 				"spawn-env-setupper",
 				session.workDir->getPath().c_str(),
 				"--before",
-				NULL);
+				(char *) 0);
 
 			char *pos = buf;
 			e = errno;

data/src/agent/Core/SpawningKit/Exceptions.h

@@ -122,6 +122,7 @@ private:
 				message = "A timeout occurred while spawning an application process";
 				break;
 			}
+			break;
 		default:
 			string categoryPhraseWithIndefiniteArticle =
 				getErrorCategoryPhraseWithIndefiniteArticle(
@@ -138,6 +139,7 @@ private:
 						+ " occurred while starting a preloader process";
 					break;
 				}
+				break;
 			default:
 				switch (journey.getFirstFailedStep()) {
 				case SPAWNING_KIT_PREPARATION:
@@ -173,7 +175,9 @@ private:
 						+ " occurred while spawning an application process";
 					break;
 				}
+				break;
 			}
+			break;
 		}
 
 		if (advancedProblemDetails.empty()) {

data/src/agent/Core/SpawningKit/SmartSpawner.h

@@ -381,7 +381,7 @@ private:
 				"spawn-env-setupper",
 				session.workDir->getPath().c_str(),
 				"--before",
-				NULL);
+				(char *) 0);
 
 			char *pos = buf;
 			e = errno;

data/src/agent/Shared/Fundamentals/AbortHandler.cpp

@@ -357,9 +357,9 @@ dumpUlimits(AbortHandlerWorkingState &state) {
 			dup2(fd, STDERR_FILENO);
 		}
 		closeAllFileDescriptors(2, true);
-		execlp("ulimit", "ulimit", "-a", (const char * const) 0);
+		execlp("ulimit", "ulimit", "-a", (char *) 0);
 		// On Linux 'ulimit' is a shell builtin, not a command.
-		execlp("/bin/sh", "/bin/sh", "-c", "ulimit -a", (const char * const) 0);
+		execlp("/bin/sh", "/bin/sh", "-c", "ulimit -a", (char *) 0);
 		_exit(1);
 	} else if (pid == -1) {
 		ASSU::printError("ERROR: Could not fork a process to dump the ulimit!\n");
@@ -393,7 +393,7 @@ dumpFileDescriptorInfoWithLsof(AbortHandlerWorkingState &state, void *userData)
 
 	closeAllFileDescriptors(2, true);
 
-	execlp("lsof", "lsof", "-p", state.messageBuf, "-nP", (const char * const) 0);
+	execlp("lsof", "lsof", "-p", state.messageBuf, "-nP", (char *) 0);
 
 	const char *command[] = { "lsof", NULL };
 	printExecError2(command, errno, state.messageBuf, sizeof(state.messageBuf));
@@ -432,7 +432,7 @@ dumpFileDescriptorInfoWithLs(AbortHandlerWorkingState &state, const char *path)
 
 		closeAllFileDescriptors(2, true);
 		// The '-v' is for natural sorting on Linux. On BSD -v means something else but it's harmless.
-		execlp("ls", "ls", "-lv", path, (const char * const) 0);
+		execlp("ls", "ls", "-lv", path, (char *) 0);
 
 		const char *command[] = { "ls", NULL };
 		printExecError2(command, errno, state.messageBuf, sizeof(state.messageBuf));
@@ -520,7 +520,7 @@ dumpWithCrashWatch(AbortHandlerWorkingState &state) {
 		execlp(ctx->config->ruby, ctx->config->ruby, ctx->crashWatchCommand,
 			ctx->rubyLibDir, ctx->installSpec, "--dump",
 			state.messageBuf, // PID string
-			(char * const) 0);
+			(char *) 0);
 
 		const char *command[] = { "crash-watch", NULL };
 		printExecError2(command, errno, state.messageBuf, sizeof(state.messageBuf));
@@ -598,16 +598,16 @@ dumpWithCrashWatch(AbortHandlerWorkingState &state) {
 				}
 				*pos = '\0';
 				pos++;
-				execlp("/bin/sh", "/bin/sh", "-c", command, (const char * const) 0);
+				execlp("/bin/sh", "/bin/sh", "-c", command, (char *) 0);
 
 				pos = state.messageBuf;
 				pos = ASSU::appendData(pos, end, "ERROR: cannot execute '");
 				pos = ASSU::appendData(pos, end, ctx->backtraceSanitizerCommand);
 				pos = ASSU::appendData(pos, end, "' for sanitizing the backtrace, trying 'cat'...\n");
 				write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
-				execlp("cat", "cat", (const char * const) 0);
-				execlp("/bin/cat", "cat", (const char * const) 0);
-				execlp("/usr/bin/cat", "cat", (const char * const) 0);
+				execlp("cat", "cat", (char *) 0);
+				execlp("/bin/cat", "cat", (char *) 0);
+				execlp("/usr/bin/cat", "cat", (char *) 0);
 
 				const char *commandArray[] = { "cat", NULL };
 				printExecError2(commandArray, errno, state.messageBuf, sizeof(state.messageBuf));
@@ -686,7 +686,7 @@ dumpDiagnostics(AbortHandlerWorkingState &state) {
 	pid = asyncFork();
 	if (pid == 0) {
 		closeAllFileDescriptors(2, true);
-		execlp("date", "date", (const char * const) 0);
+		execlp("date", "date", (char *) 0);
 		_exit(1);
 	} else if (pid == -1) {
 		ASSU::printError("ERROR: Could not fork a process to dump the time!\n");
@@ -698,7 +698,7 @@ dumpDiagnostics(AbortHandlerWorkingState &state) {
 	pid = asyncFork();
 	if (pid == 0) {
 		closeAllFileDescriptors(2, true);
-		execlp("uname", "uname", "-mprsv", (const char * const) 0);
+		execlp("uname", "uname", "-mprsv", (char *) 0);
 		_exit(1);
 	} else if (pid == -1) {
 		ASSU::printError("ERROR: Could not fork a process to dump the uname!\n");
@@ -891,11 +891,11 @@ forkAndRedirectToTeeAndMainLogFile(const char *crashLogDir) {
 	if (pid == 0) {
 		close(p[1]);
 		dup2(p[0], STDIN_FILENO);
-		execlp("tee", "tee", filename, (const char * const) 0);
-		execlp("/usr/bin/tee", "tee", filename, (const char * const) 0);
-		execlp("cat", "cat", (const char * const) 0);
-		execlp("/bin/cat", "cat", (const char * const) 0);
-		execlp("/usr/bin/cat", "cat", (const char * const) 0);
+		execlp("tee", "tee", filename, (char *) 0);
+		execlp("/usr/bin/tee", "tee", filename, (char *) 0);
+		execlp("cat", "cat", (char *) 0);
+		execlp("/bin/cat", "cat", (char *) 0);
+		execlp("/usr/bin/cat", "cat", (char *) 0);
 		ASSU::printError("ERROR: cannot execute 'tee' or 'cat'; crash log will be lost!\n");
 		_exit(1);
 		return false;
@@ -1031,11 +1031,11 @@ abortHandler(int signo, siginfo_t *info, void *_unused) {
 			closeAllFileDescriptors(2, true);
 			#ifdef __APPLE__
 				const char *command[] = { "osascript", NULL };
-				execlp("osascript", "osascript", "-e", "beep 2", (const char * const) 0);
+				execlp("osascript", "osascript", "-e", "beep 2", (char *) 0);
 				printExecError2(command, errno, state.messageBuf, sizeof(state.messageBuf));
 			#else
 				const char *command[] = { "beep", NULL };
-				execlp("beep", "beep", (const char * const) 0);
+				execlp("beep", "beep", (char *) 0);
 				printExecError2(command, errno, state.messageBuf, sizeof(state.messageBuf));
 			#endif
 			_exit(1);

data/src/agent/Shared/Fundamentals/AbortHandler.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -26,6 +26,8 @@
 #ifndef _PASSENGER_AGENT_FUNDAMENTALS_ABORT_HANDLER_H_
 #define _PASSENGER_AGENT_FUNDAMENTALS_ABORT_HANDLER_H_
 
+#include <cstddef>
+
 namespace Passenger {
 	class ResourceLocator;
 }
@@ -62,6 +64,16 @@ struct AbortHandlerConfig {
 	bool stopProcess;
 	ResourceLocator *resourceLocator;
 	DiagnosticsDumper diagnosticsDumpers[MAX_DIAGNOSTICS_DUMPERS];
+
+	AbortHandlerConfig()
+		: ruby(NULL),
+		  origArgv(NULL),
+		  randomSeed(0),
+		  dumpWithCrashWatch(false),
+		  beep(false),
+		  stopProcess(false),
+		  resourceLocator(NULL)
+		{ }
 };
 
 void installAbortHandler(const AbortHandlerConfig *config);

data/src/agent/Shared/Fundamentals/Initialization.cpp

@@ -559,7 +559,6 @@ initializeAgent(int argc, char **argv[], const char *processName,
 	const char *seedStr;
 
 	context = new Context();
-	memset(context, 0, sizeof(Context));
 
 	seedStr = getEnvString("PASSENGER_RANDOM_SEED");
 	if (seedStr == NULL) {

data/src/agent/Shared/Fundamentals/Initialization.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -47,6 +47,14 @@ struct Context {
 	char **origArgv;
 	bool feedbackFdAvailable;
 	AbortHandlerConfig abortHandlerConfig;
+
+	Context()
+		: resourceLocator(NULL),
+		  randomSeed(0),
+		  origArgc(0),
+		  origArgv(NULL),
+		  feedbackFdAvailable(false)
+		{ }
 };
 
 typedef void (*OptionParserFunc)(int argc, const char **argv, ConfigKit::Store &config);

data/src/agent/TempDirToucher/TempDirToucherMain.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013-2017 Phusion Holding B.V.
+ *  Copyright (c) 2013-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -361,7 +361,7 @@ touchDir(const char *dir) {
 		}
 		execlp("/bin/sh", "/bin/sh", "-c",
 			"find \"$1\" | xargs touch", "/bin/sh", ".",
-			(const char * const) 0);
+			(char *) 0);
 		e = errno;
 		fprintf(stderr, ERROR_PREFIX ": cannot execute /bin/sh: %s (errno %d)\n",
 			strerror(e), e);
@@ -432,7 +432,7 @@ performCleanup(const char *dir) {
 		close(terminationPipe[1]);
 		execlp("/bin/sh", "/bin/sh", "-c",
 			"rm -rf \"$1\"", "/bin/sh", dir,
-			(const char * const) 0);
+			(char *) 0);
 		e = errno;
 		fprintf(stderr, ERROR_PREFIX ": cannot execute /bin/sh: %s (errno %d)\n",
 			strerror(e), e);

data/src/agent/Watchdog/Config.h

@@ -146,7 +146,7 @@ using namespace std;
  *   security_update_checker_interval                                         unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                                        string             -          -
  *   security_update_checker_url                                              string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                          string             -          default("Phusion_Passenger/5.3.6")
+ *   server_software                                                          string             -          default("Phusion_Passenger/5.3.7")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/cxx_supportlib/Constants.h

@@ -81,7 +81,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "5.3.6"
+#define PASSENGER_VERSION "5.3.7"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/ServerKit/Server.h

@@ -54,7 +54,6 @@
 #include <pthread.h>
 #include <cstdio>
 #include <jsoncpp/json.h>
-#include <SmallVector.h>
 
 #include <LoggingKit/LoggingKit.h>
 #include <SafeLibev.h>

data/src/cxx_supportlib/StrIntTools/StrIntUtilsNoStrictAliasing.cpp

@@ -135,13 +135,13 @@ convertLowerCase(const unsigned char * restrict data,
 		i = imax * 8;
 		output = (unsigned char *) d;
 		switch (leftover) {
-		case 7: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 6: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 5: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 4: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 3: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 2: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 1: *output++ = (unsigned char) gsToLowerMap[ustr[i]];
+		case 7: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 6: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 5: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 4: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 3: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 2: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 1: *output++ = (unsigned char) gsToLowerMap[ustr[i]]; /* Falls through. */
 		case 0: break;
 		}
 	#elif defined(__x86__)
@@ -167,9 +167,9 @@ convertLowerCase(const unsigned char * restrict data,
 		i = imax * 4;
 		output = (unsigned char *) d;
 		switch (leftover) {
-		case 3: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 2: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 1: *output++ = (unsigned char) gsToLowerMap[ustr[i]];
+		case 3: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 2: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 1: *output++ = (unsigned char) gsToLowerMap[ustr[i]]; /* Falls through. */
 		case 0: break;
 		}
 	#else

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '5.3.6'
+  VERSION_STRING = '5.3.7'
 
   PREFERRED_NGINX_VERSION = '1.14.0'
   NGINX_SHA256_CHECKSUM = '5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.3.6
+  version: 5.3.7
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -715,7 +715,6 @@ files:
 - src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/utf8_validator.hpp
 - src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/utilities.hpp
 - src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/version.hpp
-- src/cxx_supportlib/vendor-modified/SmallVector.h
 - src/cxx_supportlib/vendor-modified/boost/algorithm/string/case_conv.hpp
 - src/cxx_supportlib/vendor-modified/boost/algorithm/string/classification.hpp
 - src/cxx_supportlib/vendor-modified/boost/algorithm/string/compare.hpp

data/src/cxx_supportlib/vendor-modified/SmallVector.h

@@ -1,653 +0,0 @@
-//===- llvm/ADT/SmallVector.h - 'Normally small' vectors --------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License.
-// ==============================================================================
-// LLVM Release License
-// ==============================================================================
-// University of Illinois/NCSA
-// Open Source License
-//
-// Copyright (c) 2003-2009 University of Illinois at Urbana-Champaign.
-// All rights reserved.
-//
-// Developed by:
-//
-//     LLVM Team
-//
-//     University of Illinois at Urbana-Champaign
-//
-//     http://llvm.org
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal with
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
-//
-//     * Redistributions of source code must retain the above copyright notice,
-//       this list of conditions and the following disclaimers.
-//
-//     * Redistributions in binary form must reproduce the above copyright notice,
-//       this list of conditions and the following disclaimers in the
-//       documentation and/or other materials provided with the distribution.
-//
-//     * Neither the names of the LLVM Team, University of Illinois at
-//       Urbana-Champaign, nor the names of its contributors may be used to
-//       endorse or promote products derived from this Software without specific
-//       prior written permission.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-// CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-// SOFTWARE.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the SmallVector class. Slightly modified for use in
-// Phusion Passenger.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_ADT_SMALLVECTOR_H
-#define LLVM_ADT_SMALLVECTOR_H
-
-#include <iterator>
-#include <boost/type_traits/is_class.hpp>
-#include <algorithm>
-#include <cassert>
-#include <cstring>
-#include <memory>
-
-#ifdef _MSC_VER
-namespace std {
-#if _MSC_VER <= 1310
-  // Work around flawed VC++ implementation of std::uninitialized_copy.  Define
-  // additional overloads so that elements with pointer types are recognized as
-  // scalars and not objects, causing bizarre type conversion errors.
-  template<class T1, class T2>
-  inline _Scalar_ptr_iterator_tag _Ptr_cat(T1 **, T2 **) {
-    _Scalar_ptr_iterator_tag _Cat;
-    return _Cat;
-  }
-
-  template<class T1, class T2>
-  inline _Scalar_ptr_iterator_tag _Ptr_cat(T1* const *, T2 **) {
-    _Scalar_ptr_iterator_tag _Cat;
-    return _Cat;
-  }
-#else
-// FIXME: It is not clear if the problem is fixed in VS 2005.  What is clear
-// is that the above hack won't work if it wasn't fixed.
-#endif
-}
-#endif
-
-namespace Passenger {
-
-/// SmallVectorImpl - This class consists of common code factored out of the
-/// SmallVector class to reduce code duplication based on the SmallVector 'N'
-/// template parameter.
-template <typename T>
-class SmallVectorImpl {
-protected:
-  T *Begin, *End, *Capacity;
-
-  // Allocate raw space for N elements of type T.  If T has a ctor or dtor, we
-  // don't want it to be automatically run, so we need to represent the space as
-  // something else.  An array of char would work great, but might not be
-  // aligned sufficiently.  Instead, we either use GCC extensions, or some
-  // number of union instances for the space, which guarantee maximal alignment.
-protected:
-#ifdef __GNUC__
-  typedef char U;
-  U FirstEl __attribute__((aligned));
-#else
-  union U {
-    double D;
-    long double LD;
-    long long L;
-    void *P;
-  } FirstEl;
-#endif
-  // Space after 'FirstEl' is clobbered, do not add any instance vars after it.
-public:
-  // Default ctor - Initialize to empty.
-  explicit SmallVectorImpl(unsigned N)
-    : Begin(reinterpret_cast<T*>(&FirstEl)),
-      End(reinterpret_cast<T*>(&FirstEl)),
-      Capacity(reinterpret_cast<T*>(&FirstEl)+N) {
-  }
-
-  ~SmallVectorImpl() {
-    // Destroy the constructed elements in the vector.
-    destroy_range(Begin, End);
-
-    // If this wasn't grown from the inline copy, deallocate the old space.
-    if (!isSmall())
-      operator delete(Begin);
-  }
-
-  typedef size_t size_type;
-  typedef ptrdiff_t difference_type;
-  typedef T value_type;
-  typedef T* iterator;
-  typedef const T* const_iterator;
-
-  typedef std::reverse_iterator<const_iterator>  const_reverse_iterator;
-  typedef std::reverse_iterator<iterator>  reverse_iterator;
-
-  typedef T& reference;
-  typedef const T& const_reference;
-  typedef T* pointer;
-  typedef const T* const_pointer;
-
-  bool empty() const { return Begin == End; }
-  size_type size() const { return End-Begin; }
-  size_type max_size() const { return size_type(-1) / sizeof(T); }
-
-  // forward iterator creation methods.
-  iterator begin() { return Begin; }
-  const_iterator begin() const { return Begin; }
-  iterator end() { return End; }
-  const_iterator end() const { return End; }
-
-  // reverse iterator creation methods.
-  reverse_iterator rbegin()            { return reverse_iterator(end()); }
-  const_reverse_iterator rbegin() const{ return const_reverse_iterator(end()); }
-  reverse_iterator rend()              { return reverse_iterator(begin()); }
-  const_reverse_iterator rend() const { return const_reverse_iterator(begin());}
-
-
-  /* These asserts could be "Begin + idx < End", but there are lots of places
-     in llvm where we use &v[v.size()] instead of v.end(). */
-  reference operator[](unsigned idx) {
-    assert (Begin + idx <= End);
-    return Begin[idx];
-  }
-  const_reference operator[](unsigned idx) const {
-    assert (Begin + idx <= End);
-    return Begin[idx];
-  }
-
-  reference front() {
-    return begin()[0];
-  }
-  const_reference front() const {
-    return begin()[0];
-  }
-
-  reference back() {
-    return end()[-1];
-  }
-  const_reference back() const {
-    return end()[-1];
-  }
-
-  void push_back(const_reference Elt) {
-    if (End < Capacity) {
-  Retry:
-      new (End) T(Elt);
-      ++End;
-      return;
-    }
-    grow();
-    goto Retry;
-  }
-
-  void pop_back() {
-    --End;
-    End->~T();
-  }
-
-  T pop_back_val() {
-    T Result = back();
-    pop_back();
-    return Result;
-  }
-
-  void clear() {
-    destroy_range(Begin, End);
-    End = Begin;
-  }
-
-  void resize(unsigned N) {
-    if (N < size()) {
-      destroy_range(Begin+N, End);
-      End = Begin+N;
-    } else if (N > size()) {
-      if (unsigned(Capacity-Begin) < N)
-        grow(N);
-      construct_range(End, Begin+N, T());
-      End = Begin+N;
-    }
-  }
-
-  void resize(unsigned N, const T &NV) {
-    if (N < size()) {
-      destroy_range(Begin+N, End);
-      End = Begin+N;
-    } else if (N > size()) {
-      if (unsigned(Capacity-Begin) < N)
-        grow(N);
-      construct_range(End, Begin+N, NV);
-      End = Begin+N;
-    }
-  }
-
-  void reserve(unsigned N) {
-    if (unsigned(Capacity-Begin) < N)
-      grow(N);
-  }
-
-  void swap(SmallVectorImpl &RHS);
-
-  /// append - Add the specified range to the end of the SmallVector.
-  ///
-  template<typename in_iter>
-  void append(in_iter in_start, in_iter in_end) {
-    size_type NumInputs = std::distance(in_start, in_end);
-    // Grow allocated space if needed.
-    if (NumInputs > size_type(Capacity-End))
-      grow(size()+NumInputs);
-
-    // Copy the new elements over.
-    std::uninitialized_copy(in_start, in_end, End);
-    End += NumInputs;
-  }
-
-  /// append - Add the specified range to the end of the SmallVector.
-  ///
-  void append(size_type NumInputs, const T &Elt) {
-    // Grow allocated space if needed.
-    if (NumInputs > size_type(Capacity-End))
-      grow(size()+NumInputs);
-
-    // Copy the new elements over.
-    std::uninitialized_fill_n(End, NumInputs, Elt);
-    End += NumInputs;
-  }
-
-  void assign(unsigned NumElts, const T &Elt) {
-    clear();
-    if (unsigned(Capacity-Begin) < NumElts)
-      grow(NumElts);
-    End = Begin+NumElts;
-    construct_range(Begin, End, Elt);
-  }
-
-  iterator erase(iterator I) {
-    iterator N = I;
-    // Shift all elts down one.
-    std::copy(I+1, End, I);
-    // Drop the last elt.
-    pop_back();
-    return(N);
-  }
-
-  iterator erase(iterator S, iterator E) {
-    iterator N = S;
-    // Shift all elts down.
-    iterator I = std::copy(E, End, S);
-    // Drop the last elts.
-    destroy_range(I, End);
-    End = I;
-    return(N);
-  }
-
-  iterator insert(iterator I, const T &Elt) {
-    if (I == End) {  // Important special case for empty vector.
-      push_back(Elt);
-      return end()-1;
-    }
-
-    if (End < Capacity) {
-  Retry:
-      new (End) T(back());
-      ++End;
-      // Push everything else over.
-      std::copy_backward(I, End-1, End);
-      *I = Elt;
-      return I;
-    }
-    size_t EltNo = I-Begin;
-    grow();
-    I = Begin+EltNo;
-    goto Retry;
-  }
-
-  iterator insert(iterator I, size_type NumToInsert, const T &Elt) {
-    if (I == End) {  // Important special case for empty vector.
-      append(NumToInsert, Elt);
-      return end()-1;
-    }
-
-    // Convert iterator to elt# to avoid invalidating iterator when we reserve()
-    size_t InsertElt = I-begin();
-
-    // Ensure there is enough space.
-    reserve(static_cast<unsigned>(size() + NumToInsert));
-
-    // Uninvalidate the iterator.
-    I = begin()+InsertElt;
-
-    // If there are more elements between the insertion point and the end of the
-    // range than there are being inserted, we can use a simple approach to
-    // insertion.  Since we already reserved space, we know that this won't
-    // reallocate the vector.
-    if (size_t(end()-I) >= NumToInsert) {
-      T *OldEnd = End;
-      append(End-NumToInsert, End);
-
-      // Copy the existing elements that get replaced.
-      std::copy_backward(I, OldEnd-NumToInsert, OldEnd);
-
-      std::fill_n(I, NumToInsert, Elt);
-      return I;
-    }
-
-    // Otherwise, we're inserting more elements than exist already, and we're
-    // not inserting at the end.
-
-    // Copy over the elements that we're about to overwrite.
-    T *OldEnd = End;
-    End += NumToInsert;
-    size_t NumOverwritten = OldEnd-I;
-    std::uninitialized_copy(I, OldEnd, End-NumOverwritten);
-
-    // Replace the overwritten part.
-    std::fill_n(I, NumOverwritten, Elt);
-
-    // Insert the non-overwritten middle part.
-    std::uninitialized_fill_n(OldEnd, NumToInsert-NumOverwritten, Elt);
-    return I;
-  }
-
-  template<typename ItTy>
-  iterator insert(iterator I, ItTy From, ItTy To) {
-    if (I == End) {  // Important special case for empty vector.
-      append(From, To);
-      return end()-1;
-    }
-
-    size_t NumToInsert = std::distance(From, To);
-    // Convert iterator to elt# to avoid invalidating iterator when we reserve()
-    size_t InsertElt = I-begin();
-
-    // Ensure there is enough space.
-    reserve(static_cast<unsigned>(size() + NumToInsert));
-
-    // Uninvalidate the iterator.
-    I = begin()+InsertElt;
-
-    // If there are more elements between the insertion point and the end of the
-    // range than there are being inserted, we can use a simple approach to
-    // insertion.  Since we already reserved space, we know that this won't
-    // reallocate the vector.
-    if (size_t(end()-I) >= NumToInsert) {
-      T *OldEnd = End;
-      append(End-NumToInsert, End);
-
-      // Copy the existing elements that get replaced.
-      std::copy_backward(I, OldEnd-NumToInsert, OldEnd);
-
-      std::copy(From, To, I);
-      return I;
-    }
-
-    // Otherwise, we're inserting more elements than exist already, and we're
-    // not inserting at the end.
-
-    // Copy over the elements that we're about to overwrite.
-    T *OldEnd = End;
-    End += NumToInsert;
-    size_t NumOverwritten = OldEnd-I;
-    std::uninitialized_copy(I, OldEnd, End-NumOverwritten);
-
-    // Replace the overwritten part.
-    std::copy(From, From+NumOverwritten, I);
-
-    // Insert the non-overwritten middle part.
-    std::uninitialized_copy(From+NumOverwritten, To, OldEnd);
-    return I;
-  }
-
-  const SmallVectorImpl &operator=(const SmallVectorImpl &RHS);
-
-  bool operator==(const SmallVectorImpl &RHS) const {
-    if (size() != RHS.size()) return false;
-    for (T *This = Begin, *That = RHS.Begin, *E = Begin+size();
-         This != E; ++This, ++That)
-      if (*This != *That)
-        return false;
-    return true;
-  }
-  bool operator!=(const SmallVectorImpl &RHS) const { return !(*this == RHS); }
-
-  bool operator<(const SmallVectorImpl &RHS) const {
-    return std::lexicographical_compare(begin(), end(),
-                                        RHS.begin(), RHS.end());
-  }
-
-private:
-  /// isSmall - Return true if this is a smallvector which has not had dynamic
-  /// memory allocated for it.
-  bool isSmall() const {
-    return static_cast<const void*>(Begin) ==
-           static_cast<const void*>(&FirstEl);
-  }
-
-  /// grow - double the size of the allocated memory, guaranteeing space for at
-  /// least one more element or MinSize if specified.
-  void grow(size_type MinSize = 0);
-
-  void construct_range(T *S, T *E, const T &Elt) {
-    for (; S != E; ++S)
-      new (S) T(Elt);
-  }
-
-  void destroy_range(T *S, T *E) {
-    while (S != E) {
-      --E;
-      E->~T();
-    }
-  }
-};
-
-// Define this out-of-line to dissuade the C++ compiler from inlining it.
-template <typename T>
-void SmallVectorImpl<T>::grow(size_t MinSize) {
-  size_t CurCapacity = Capacity-Begin;
-  size_t CurSize = size();
-  size_t NewCapacity = 2*CurCapacity;
-  if (NewCapacity < MinSize)
-    NewCapacity = MinSize;
-  T *NewElts = static_cast<T*>(operator new(NewCapacity*sizeof(T)));
-
-  // Copy the elements over.
-  if (boost::is_class<T>::value)
-    std::uninitialized_copy(Begin, End, NewElts);
-  else
-    // Use memcpy for PODs (std::uninitialized_copy optimizes to memmove).
-    memcpy(NewElts, Begin, CurSize * sizeof(T));
-
-  // Destroy the original elements.
-  destroy_range(Begin, End);
-
-  // If this wasn't grown from the inline copy, deallocate the old space.
-  if (!isSmall())
-    operator delete(Begin);
-
-  Begin = NewElts;
-  End = NewElts+CurSize;
-  Capacity = Begin+NewCapacity;
-}
-
-template <typename T>
-void SmallVectorImpl<T>::swap(SmallVectorImpl<T> &RHS) {
-  if (this == &RHS) return;
-
-  // We can only avoid copying elements if neither vector is small.
-  if (!isSmall() && !RHS.isSmall()) {
-    std::swap(Begin, RHS.Begin);
-    std::swap(End, RHS.End);
-    std::swap(Capacity, RHS.Capacity);
-    return;
-  }
-  if (RHS.size() > size_type(Capacity-Begin))
-    grow(RHS.size());
-  if (size() > size_type(RHS.Capacity-RHS.begin()))
-    RHS.grow(size());
-
-  // Swap the shared elements.
-  size_t NumShared = size();
-  if (NumShared > RHS.size()) NumShared = RHS.size();
-  for (unsigned i = 0; i != static_cast<unsigned>(NumShared); ++i)
-    std::swap(Begin[i], RHS[i]);
-
-  // Copy over the extra elts.
-  if (size() > RHS.size()) {
-    size_t EltDiff = size() - RHS.size();
-    std::uninitialized_copy(Begin+NumShared, End, RHS.End);
-    RHS.End += EltDiff;
-    destroy_range(Begin+NumShared, End);
-    End = Begin+NumShared;
-  } else if (RHS.size() > size()) {
-    size_t EltDiff = RHS.size() - size();
-    std::uninitialized_copy(RHS.Begin+NumShared, RHS.End, End);
-    End += EltDiff;
-    destroy_range(RHS.Begin+NumShared, RHS.End);
-    RHS.End = RHS.Begin+NumShared;
-  }
-}
-
-template <typename T>
-const SmallVectorImpl<T> &
-SmallVectorImpl<T>::operator=(const SmallVectorImpl<T> &RHS) {
-  // Avoid self-assignment.
-  if (this == &RHS) return *this;
-
-  // If we already have sufficient space, assign the common elements, then
-  // destroy any excess.
-  unsigned RHSSize = unsigned(RHS.size());
-  unsigned CurSize = unsigned(size());
-  if (CurSize >= RHSSize) {
-    // Assign common elements.
-    iterator NewEnd;
-    if (RHSSize)
-      NewEnd = std::copy(RHS.Begin, RHS.Begin+RHSSize, Begin);
-    else
-      NewEnd = Begin;
-
-    // Destroy excess elements.
-    destroy_range(NewEnd, End);
-
-    // Trim.
-    End = NewEnd;
-    return *this;
-  }
-
-  // If we have to grow to have enough elements, destroy the current elements.
-  // This allows us to avoid copying them during the grow.
-  if (unsigned(Capacity-Begin) < RHSSize) {
-    // Destroy current elements.
-    destroy_range(Begin, End);
-    End = Begin;
-    CurSize = 0;
-    grow(RHSSize);
-  } else if (CurSize) {
-    // Otherwise, use assignment for the already-constructed elements.
-    std::copy(RHS.Begin, RHS.Begin+CurSize, Begin);
-  }
-
-  // Copy construct the new elements in place.
-  std::uninitialized_copy(RHS.Begin+CurSize, RHS.End, Begin+CurSize);
-
-  // Set end.
-  End = Begin+RHSSize;
-  return *this;
-}
-
-/// SmallVector - This is a 'vector' (really, a variable-sized array), optimized
-/// for the case when the array is small.  It contains some number of elements
-/// in-place, which allows it to avoid heap allocation when the actual number of
-/// elements is below that threshold.  This allows normal "small" cases to be
-/// fast without losing generality for large inputs.
-///
-/// Note that this does not attempt to be exception safe.
-///
-template <typename T, unsigned N>
-class SmallVector : public SmallVectorImpl<T> {
-  /// InlineElts - These are 'N-1' elements that are stored inline in the body
-  /// of the vector.  The extra '1' element is stored in SmallVectorImpl.
-  typedef typename SmallVectorImpl<T>::U U;
-  enum {
-    // MinUs - The number of U's require to cover N T's.
-    MinUs = (static_cast<unsigned int>(sizeof(T))*N +
-             static_cast<unsigned int>(sizeof(U)) - 1) /
-            static_cast<unsigned int>(sizeof(U)),
-
-    // NumInlineEltsElts - The number of elements actually in this array.  There
-    // is already one in the parent class, and we have to round up to avoid
-    // having a zero-element array.
-    NumInlineEltsElts = MinUs > 1 ? (MinUs - 1) : 1,
-
-    // NumTsAvailable - The number of T's we actually have space for, which may
-    // be more than N due to rounding.
-    NumTsAvailable = (NumInlineEltsElts+1)*static_cast<unsigned int>(sizeof(U))/
-                     static_cast<unsigned int>(sizeof(T))
-  };
-  U InlineElts[NumInlineEltsElts];
-public:
-  SmallVector() : SmallVectorImpl<T>(NumTsAvailable) {
-  }
-
-  explicit SmallVector(unsigned Size, const T &Value = T())
-    : SmallVectorImpl<T>(NumTsAvailable) {
-    this->reserve(Size);
-    while (Size--)
-      this->push_back(Value);
-  }
-
-  template<typename ItTy>
-  SmallVector(ItTy S, ItTy E) : SmallVectorImpl<T>(NumTsAvailable) {
-    this->append(S, E);
-  }
-
-  SmallVector(const SmallVector &RHS) : SmallVectorImpl<T>(NumTsAvailable) {
-    if (!RHS.empty())
-      SmallVectorImpl<T>::operator=(RHS);
-  }
-
-  const SmallVector &operator=(const SmallVector &RHS) {
-    SmallVectorImpl<T>::operator=(RHS);
-    return *this;
-  }
-
-};
-
-} // End Passenger namespace
-
-namespace std {
-  /// Implement std::swap in terms of SmallVector swap.
-  template<typename T>
-  inline void
-  swap(Passenger::SmallVectorImpl<T> &LHS, Passenger::SmallVectorImpl<T> &RHS) {
-    LHS.swap(RHS);
-  }
-
-  /// Implement std::swap in terms of SmallVector swap.
-  template<typename T, unsigned N>
-  inline void
-  swap(Passenger::SmallVector<T, N> &LHS, Passenger::SmallVector<T, N> &RHS) {
-    LHS.swap(RHS);
-  }
-}
-
-#endif