passenger 5.3.4 → 6.0.1

data/src/cxx_supportlib/{Utils → StrIntTools}/Template.h

@@ -1,12 +1,37 @@
-#ifndef _PASSENGER_TEMPLATE_H_
-#define _PASSENGER_TEMPLATE_H_
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2013-2018 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in 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:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  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
+ *  AUTHORS 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 IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_STR_INT_TOOLS_TEMPLATE_H_
+#define _PASSENGER_STR_INT_TOOLS_TEMPLATE_H_
 
 #include <string>
 #include <cstring>
 #include <cstdio>
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/StringMap.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <DataStructures/StringMap.h>
 
 namespace Passenger {
 
@@ -209,4 +234,4 @@ public:
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_TEMPLATE_H_ */
+#endif /* _PASSENGER_STR_INT_TOOLS_TEMPLATE_H_ */

data/src/cxx_supportlib/SystemTools/ContainerHelpers.h

@@ -0,0 +1,88 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2018 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  See LICENSE file for license information.
+ */
+#ifndef _PASSENGER_SYSTEM_TOOLS_CONTAINER_HELPERS_H_
+#define _PASSENGER_SYSTEM_TOOLS_CONTAINER_HELPERS_H_
+
+#include <unistd.h>
+#include <boost/predef.h>
+#include <FileTools/FileManip.h>
+#include <StrIntTools/StrIntUtils.h>
+
+namespace Passenger {
+
+using namespace std;
+
+
+// adapted from https://github.com/systemd/systemd/blob/042ca/src/basic/virt.c
+// separate function to keep as similar to source as possible for easier updates
+inline bool
+_linuxAutoDetectInContainer() {
+	// https://github.com/moby/moby/issues/26102#issuecomment-253621560
+	if (fileExists("/.dockerenv")) {
+		return true;
+	}
+
+	if (fileExists("/proc/vz") && !fileExists("/proc/bc")) {
+		return true;
+	}
+
+	const char *env = getenv("container");
+	if (env != NULL) {
+		return (*env != '\0');
+	}
+
+	if (fileExists("/run/systemd/container")) {
+		string file = unsafeReadFile("/run/systemd/container");
+		return (file.length() > 0);
+	}
+
+	if (fileExists("/proc/1/environ")) {
+		string file = unsafeReadFile("/proc/1/environ");
+		if (file.size() > 0) {
+			vector<string> v;
+			split(file,'\0', v);
+			for(vector<string>::iterator it = v.begin(); it != v.end(); ++it) {
+				if (startsWith(*it, "container=")) {
+					return true;
+				}
+			}
+		}
+	}
+
+	if (fileExists("/proc/1/sched")) {
+		string file = unsafeReadFile("/proc/1/sched");
+		if (file.length() >= 0) {
+			const char t = file[0];
+			if (t == '\0') {
+				return false;
+			}
+
+			if (!startsWith(file, "(1,")) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+inline bool
+autoDetectInContainer() {
+	#if BOOST_OS_LINUX
+		return _linuxAutoDetectInContainer();
+	#else
+		return false;
+	#endif
+}
+
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_SYSTEM_TOOLS_CONTAINER_HELPERS_H_ */

data/src/cxx_supportlib/{Utils → SystemTools}/ProcessMetricsCollector.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.
@@ -23,8 +23,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_PROCESS_METRICS_COLLECTOR_H_
-#define _PASSENGER_PROCESS_METRICS_COLLECTOR_H_
+#ifndef _PASSENGER_SYSTEM_TOOLS_PROCESS_METRICS_COLLECTOR_H_
+#define _PASSENGER_SYSTEM_TOOLS_PROCESS_METRICS_COLLECTOR_H_
 
 #include <boost/cstdint.hpp>
 #include <boost/thread.hpp>
@@ -63,8 +63,8 @@
 #include <ProcessManagement/Spawn.h>
 #include <FileTools/FileManip.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/IOUtils.h>
-#include <Utils/StringScanning.h>
+#include <IOTools/IOUtils.h>
+#include <StrIntTools/StringScanning.h>
 
 namespace Passenger {
 
@@ -321,18 +321,21 @@ public:
 			NULL
 		};
 
-		string psOutput = this->psOutput;
-		if (psOutput.empty()) {
+		SubprocessOutput psOutput;
+		psOutput.data = this->psOutput;
+		if (psOutput.data.empty()) {
 			SubprocessInfo info;
-			runCommandAndCaptureOutput(command, info, psOutput, true, afterFork);
-			if (psOutput.empty()) {
+			runCommandAndCaptureOutput(command, info, psOutput,
+				1024 * 1024, true, afterFork);
+			if (psOutput.data.empty()) {
 				throw RuntimeException("The 'ps' command failed");
 			}
 		}
 		pidsArg.resize(0);
 		fmtArg.resize(0);
-		ProcessMetricMap result = parsePsOutput<Collection, ConstIterator>(psOutput, pids);
-		psOutput.resize(0);
+		ProcessMetricMap result = parsePsOutput<Collection, ConstIterator>(
+			psOutput.data, pids);
+		psOutput.data.resize(0);
 		if (canMeasureRealMemory) {
 			ProcessMetricMap::iterator it;
 			for (it = result.begin(); it != result.end(); it++) {
@@ -502,4 +505,4 @@ public:
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_PROCESS_METRICS_COLLECTOR_H_ */
+#endif /* _PASSENGER_SYSTEM_TOOLS_PROCESS_METRICS_COLLECTOR_H_ */

data/src/cxx_supportlib/{Utils → SystemTools}/SystemMetricsCollector.h

@@ -46,7 +46,7 @@
 	#include <sys/sysinfo.h>
 	#include <Exceptions.h>
 	#include <FileTools/FileManip.h>
-	#include <Utils/StringScanning.h>
+	#include <StrIntTools/StringScanning.h>
 #endif
 #ifdef __APPLE__
 	#include <mach/mach.h>
@@ -65,8 +65,8 @@
 #include <Constants.h>
 #include <StaticString.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
 #include <Utils/AnsiColorConstants.h>
 #include <Utils/SpeedMeter.h>
 

data/src/cxx_supportlib/{Utils → SystemTools}/SystemTime.cpp

@@ -24,7 +24,7 @@
  *  THE SOFTWARE.
  */
 
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 	namespace SystemTimeData {

data/src/cxx_supportlib/SystemTools/UserDatabase.h

@@ -50,7 +50,7 @@
 #include <boost/core/noncopyable.hpp>
 
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 
 namespace Passenger {

data/src/cxx_supportlib/Utils/CachedFileStat.hpp

@@ -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.
@@ -39,8 +39,8 @@
 #include <oxt/system_calls.hpp>
 
 #include <StaticString.h>
-#include <Utils/SystemTime.h>
-#include <Utils/StringMap.h>
+#include <SystemTools/SystemTime.h>
+#include <DataStructures/StringMap.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils/Curl.h

@@ -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.
@@ -61,7 +61,7 @@
 #include <Exceptions.h>
 #include <FileTools/FileManip.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils/FileChangeChecker.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.
@@ -30,7 +30,7 @@
 #include <cerrno>
 
 #include <Utils/CachedFileStat.hpp>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils/MessagePassing.h

@@ -36,7 +36,7 @@
 #include <oxt/macros.hpp>
 #include <jsoncpp/json.h>
 #include <Exceptions.h>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 #include <list>
 

data/src/cxx_supportlib/Utils/SpeedMeter.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -30,7 +30,7 @@
 #include <cstdlib>
 #include <cassert>
 #include <limits>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils/Timer.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.
@@ -28,7 +28,7 @@
 
 #include <boost/thread.hpp>
 #include <oxt/system_calls.hpp>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils/VariantMap.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.
@@ -36,8 +36,8 @@
 #include <jsoncpp/json.h>
 #include <modp_b64.h>
 #include <Exceptions.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/MessageIO.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/MessageIO.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils.cpp

@@ -57,8 +57,8 @@
 #include <ProcessManagement/Spawn.h>
 #include <ProcessManagement/Utils.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/IOUtils.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/IOUtils.h>
 
 #ifndef HOST_NAME_MAX
 	#if defined(_POSIX_HOST_NAME_MAX)

data/src/cxx_supportlib/WatchdogLauncher.h

@@ -86,8 +86,8 @@ void        psg_watchdog_launcher_free(PsgWatchdogLauncher *launcher);
 #include <LoggingKit/Context.h>
 #include <ProcessManagement/Utils.h>
 #include <Utils.h>
-#include <Utils/IOUtils.h>
-#include <Utils/MessageIO.h>
+#include <IOTools/IOUtils.h>
+#include <IOTools/MessageIO.h>
 #include <Utils/Timer.h>
 #include <Utils/ScopeGuard.h>
 #include <Utils/ClassUtils.h>
@@ -370,7 +370,7 @@ public:
 				afterFork();
 			}
 
-			closeAllFileDescriptors(FEEDBACK_FD, true);
+			closeAllFileDescriptors(FEEDBACK_FD);
 
 			execl(agentFilename.c_str(), AGENT_EXE, "watchdog",
 				// Some extra space to allow the child process to change its process title.

data/src/cxx_supportlib/WebSocketCommandReverseServer.h

@@ -49,7 +49,7 @@
 #include <FileTools/PathManip.h>
 #include <FileTools/FileManip.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/WrapperRegistry/CBindings.cpp

@@ -0,0 +1,85 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2018 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in 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:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  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
+ *  AUTHORS 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 IN
+ *  THE SOFTWARE.
+ */
+
+#include <new>
+#include <exception>
+
+#include <WrapperRegistry/CBindings.h>
+#include <WrapperRegistry/Entry.h>
+#include <WrapperRegistry/Registry.h>
+
+using namespace Passenger;
+using namespace Passenger::WrapperRegistry;
+
+
+int
+psg_wrapper_registry_entry_is_null(const PsgWrapperRegistryEntry *entry) {
+	const Entry *cxxEntry = static_cast<const Entry *>(entry);
+	return (int) cxxEntry->isNull();
+}
+
+const char *
+psg_wrapper_registry_entry_get_language(const PsgWrapperRegistryEntry *entry, size_t *len) {
+	const Entry *cxxEntry = static_cast<const Entry *>(entry);
+	if (len != NULL) {
+		*len = cxxEntry->language.size();
+	}
+	return cxxEntry->language.data();
+}
+
+
+PsgWrapperRegistry *
+psg_wrapper_registry_new() {
+	try {
+		return static_cast<PsgWrapperRegistry *>(new Registry());
+	} catch (const std::bad_alloc &) {
+		return NULL;
+	}
+}
+
+void
+psg_wrapper_registry_free(PsgWrapperRegistry *registry) {
+	Registry *cxxRegistry = static_cast<Registry *>(registry);
+	delete cxxRegistry;
+}
+
+void
+psg_wrapper_registry_finalize(PsgWrapperRegistry *registry) {
+	Registry *cxxRegistry = static_cast<Registry *>(registry);
+	cxxRegistry->finalize();
+}
+
+const PsgWrapperRegistryEntry *
+psg_wrapper_registry_lookup(PsgWrapperRegistry *registry,
+	const char *name, size_t size)
+{
+	const Registry *cxxRegistry = static_cast<const Registry *>(registry);
+	if (size == (size_t) -1) {
+		size = strlen(name);
+	}
+	return static_cast<const PsgWrapperRegistryEntry *>(
+		&cxxRegistry->lookup(StaticString(name, size)));
+}

data/src/cxx_supportlib/{Utils/MemoryBarrier.h → WrapperRegistry/CBindings.h}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,31 +23,34 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_MEMORY_BARRIER_H_
-#define _PASSENGER_MEMORY_BARRIER_H_
-
-// Memory barrier macros. Also act as compiler barriers.
-
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-	#if defined(__i386__)
-		#if defined(HAS_SSE2) || (defined(HAS_LFENCE) && defined(HAS_SFENCE))
-			#define P_READ_BARRIER() \
-				do { __asm__ __volatile__ ("lfence" ::: "memory"); } while (false)
-			#define P_WRITE_BARRIER() \
-				do { __asm__ __volatile__ ("sfence" ::: "memory"); } while (false)
-		#else
-			#define P_READ_BARRIER() \
-				do { __asm__ __volatile__ ("" ::: "memory"); } while (false)
-			#define P_WRITE_BARRIER() \
-				do { __asm__ __volatile__ ("lock; addl $0,0(%%esp)" ::: "memory"); } while (false)
-		#endif
-
-	#elif defined(__x86_64__)
-		#define P_READ_BARRIER() \
-			do { __asm__ __volatile__ ("lfence" ::: "memory"); } while (false)
-		#define P_WRITE_BARRIER() \
-			do { __asm__ __volatile__ ("sfence" ::: "memory"); } while (false)
-	#endif
+#ifndef _PASSENGER_WRAPPER_REGISTRY_CBINDINGS_H_
+#define _PASSENGER_WRAPPER_REGISTRY_CBINDINGS_H_
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
+
+typedef void PsgWrapperRegistryEntry;
+
+int psg_wrapper_registry_entry_is_null(const PsgWrapperRegistryEntry *entry);
+const char *psg_wrapper_registry_entry_get_language(const PsgWrapperRegistryEntry *entry, size_t *len);
+
+
+typedef void PsgWrapperRegistry;
+
+PsgWrapperRegistry *psg_wrapper_registry_new();
+void psg_wrapper_registry_free(PsgWrapperRegistry *registry);
+
+void psg_wrapper_registry_finalize(PsgWrapperRegistry *registry);
+const PsgWrapperRegistryEntry *psg_wrapper_registry_lookup(PsgWrapperRegistry *registry,
+	const char *name, size_t size);
+
+
+#ifdef __cplusplus
+	} // extern "C"
 #endif
 
-#endif /* _PASSENGER_MEMORY_BARRIER_H_ */
+#endif /* _PASSENGER_WRAPPER_REGISTRY_CBINDINGS_H_ */

data/src/cxx_supportlib/WrapperRegistry/Entry.h

@@ -0,0 +1,112 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2018 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in 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:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  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
+ *  AUTHORS 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 IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_WRAPPER_REGISTRY_WRAPPER_H_
+#define _PASSENGER_WRAPPER_REGISTRY_WRAPPER_H_
+
+#include <boost/container/small_vector.hpp>
+#include <StaticString.h>
+
+namespace Passenger {
+namespace WrapperRegistry {
+
+using namespace std;
+
+
+struct Entry {
+	/**
+	 * A identifier-like name for this language. All-lowercase, no spaces.
+	 * Related to passenger_app_type.
+	 * Example: "ruby"
+	 */
+	StaticString language;
+
+	/**
+	 * A human-readable name for this language.
+	 * Example: "Ruby"
+	 */
+	StaticString languageDisplayName;
+
+	/**
+	 * Path to the wrapper to use. If `suppliedByThirdParty` is false, then
+	 * the path is considered relative to helperScriptsDir.
+	 */
+	StaticString path;
+
+	/**
+	 * The title that spawned processes for this language should assume.
+	 * Example: "Passenger RubyApp"
+	 */
+	StaticString processTitle;
+
+	/**
+	 * A default command for the interpreter of this language.
+	 * Will be looked up in $PATH.
+	 * Example: "ruby"
+	 */
+	StaticString defaultInterpreter;
+
+	/**
+	 * A list of startup file names that we should look for
+	 * in order to autodetect whether an app belongs to this
+	 * language. Any of these files are also considered to be
+	 * the entrypoint to the app.
+	 * Example: "config.ru", "index.js", "app.js"
+	 */
+	boost::container::small_vector<StaticString, 2> defaultStartupFiles;
+
+	bool suppliedByThirdParty;
+
+	Entry()
+		: suppliedByThirdParty(false)
+		{ }
+
+	// In C++98, `boost::container::small_vector` causes our default
+	// assignment operator to become `operator=(Entry &)`, which is
+	// incompatible with the Registry's usage of StringKeyTable.
+	// We fix this by writing out own assignment operator.
+	Entry &operator=(const Entry &other) {
+		if (this != &other) {
+			language = other.language;
+			languageDisplayName = other.languageDisplayName;
+			path = other.path;
+			processTitle = other.processTitle;
+			defaultInterpreter = other.defaultInterpreter;
+			defaultStartupFiles = other.defaultStartupFiles;
+			suppliedByThirdParty = other.suppliedByThirdParty;
+		}
+		return *this;
+	}
+
+	bool isNull() const {
+		return language.empty();
+	}
+};
+
+
+} // namespace WrapperRegistry
+} // namespace Passenger
+
+#endif /* _PASSENGER_WRAPPER_REGISTRY_WRAPPER_H_ */