passenger 6.0.8 → 6.0.12

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -86,7 +86,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_anonymous_telemetry_proxy,
 		NULL,
 		RSRC_CONF,
-		"Use specified HTTP/SOCKS proxy for Phusion Passenger anonymous telemetry collection."),
+		"Use specified HTTP/SOCKS proxy for Phusion Passenger(R) anonymous telemetry collection."),
 	AP_INIT_TAKE1("PassengerAppEnv",
 		(Take1Func) cmd_passenger_app_env,
 		NULL,
@@ -141,17 +141,17 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take2Func) cmd_passenger_ctl,
 		NULL,
 		RSRC_CONF,
-		"Set advanced Phusion Passenger options."),
+		"Set advanced Phusion Passenger(R) options."),
 	AP_INIT_TAKE1("PassengerDataBufferDir",
 		(Take1Func) cmd_passenger_data_buffer_dir,
 		NULL,
 		RSRC_CONF,
-		"The directory that Phusion Passenger data buffers should be stored into."),
+		"The directory that Phusion Passenger(R) data buffers should be stored into."),
 	AP_INIT_TAKE1("PassengerDebugLogFile",
 		(Take1Func) cmd_passenger_log_file,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger log file."),
+		"The Phusion Passenger(R) log file."),
 	AP_INIT_FLAG("PassengerDebugger",
 		(FlagFunc) cmd_passenger_enterprise_only,
 		NULL,
@@ -161,17 +161,17 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_default_group,
 		NULL,
 		RSRC_CONF,
-		"The group that Phusion Passenger applications must run as when user switching fails or is disabled."),
+		"The group that Phusion Passenger(R) applications must run as when user switching fails or is disabled."),
 	AP_INIT_TAKE1("PassengerDefaultRuby",
 		(Take1Func) cmd_passenger_default_ruby,
 		NULL,
 		RSRC_CONF,
-		"Phusion Passenger's default Ruby interpreter to use."),
+		"Phusion Passenger(R)'s default Ruby interpreter to use."),
 	AP_INIT_TAKE1("PassengerDefaultUser",
 		(Take1Func) cmd_passenger_default_user,
 		NULL,
 		RSRC_CONF,
-		"The user that Phusion Passenger applications must run as when user switching fails or is disabled."),
+		"The user that Phusion Passenger(R) applications must run as when user switching fails or is disabled."),
 	AP_INIT_TAKE1("PassengerDirectInstanceRequestAddress",
 		(Take1Func) cmd_passenger_direct_instance_request_address,
 		NULL,
@@ -181,7 +181,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_disable_anonymous_telemetry,
 		NULL,
 		RSRC_CONF,
-		"Whether to disable Phusion Passenger anonymous telemetry."),
+		"Whether to disable Phusion Passenger(R) anonymous telemetry."),
 	AP_INIT_FLAG("PassengerDisableLogPrefix",
 		(FlagFunc) cmd_passenger_disable_log_prefix,
 		NULL,
@@ -191,7 +191,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_disable_security_update_check,
 		NULL,
 		RSRC_CONF,
-		"Whether to disable the Phusion Passenger security update check & notification."),
+		"Whether to disable the Phusion Passenger(R) security update check & notification."),
 	AP_INIT_TAKE1("PassengerDumpConfigManifest",
 		(Take1Func) cmd_passenger_dump_config_manifest,
 		NULL,
@@ -201,7 +201,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_enabled,
 		NULL,
 		RSRC_CONF | ACCESS_CONF | OR_ALL,
-		"Enable or disable Phusion Passenger."),
+		"Enable or disable Phusion Passenger(R)."),
 	AP_INIT_FLAG("PassengerErrorOverride",
 		(FlagFunc) cmd_passenger_error_override,
 		NULL,
@@ -211,7 +211,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_file_descriptor_log_file,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger file descriptor log file."),
+		"The Phusion Passenger(R) file descriptor log file."),
 	AP_INIT_TAKE1("PassengerFlyWith",
 		(Take1Func) cmd_passenger_enterprise_only,
 		NULL,
@@ -241,7 +241,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_instance_registry_dir,
 		NULL,
 		RSRC_CONF,
-		"The directory to register the Phusion Passenger instance to."),
+		"The directory to register the Phusion Passenger(R) instance to."),
 	AP_INIT_FLAG("PassengerLoadShellEnvvars",
 		(FlagFunc) cmd_passenger_load_shell_envvars,
 		NULL,
@@ -251,12 +251,12 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_log_file,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger log file."),
+		"The Phusion Passenger(R) log file."),
 	AP_INIT_TAKE1("PassengerLogLevel",
 		(Take1Func) cmd_passenger_log_level,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger log verbosity."),
+		"The Phusion Passenger(R) log verbosity."),
 	AP_INIT_TAKE1("PassengerLveMinUid",
 		(Take1Func) cmd_passenger_lve_min_uid,
 		NULL,
@@ -266,7 +266,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_enterprise_only,
 		NULL,
 		RSRC_CONF | ACCESS_CONF,
-		"The maximum number of instances for the current application that Phusion Passenger may spawn."),
+		"The maximum number of instances for the current application that Phusion Passenger(R) may spawn."),
 	AP_INIT_TAKE1("PassengerMaxInstancesPerApp",
 		(Take1Func) cmd_passenger_max_instances_per_app,
 		NULL,
@@ -351,12 +351,12 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_response_buffer_high_watermark,
 		NULL,
 		RSRC_CONF,
-		"The maximum size of the Phusion Passenger response buffer."),
+		"The maximum size of the Phusion Passenger(R) response buffer."),
 	AP_INIT_TAKE1("PassengerRestartDir",
 		(Take1Func) cmd_passenger_restart_dir,
 		NULL,
 		RSRC_CONF | ACCESS_CONF,
-		"The directory in which Phusion Passenger should look for restart.txt."),
+		"The directory in which Phusion Passenger(R) should look for restart.txt."),
 	AP_INIT_FLAG("PassengerRollingRestarts",
 		(FlagFunc) cmd_passenger_enterprise_only,
 		NULL,
@@ -366,7 +366,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_root,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger root folder."),
+		"The Phusion Passenger(R) root folder."),
 	AP_INIT_TAKE1("PassengerRuby",
 		(Take1Func) cmd_passenger_ruby,
 		NULL,
@@ -376,22 +376,22 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_security_update_check_proxy,
 		NULL,
 		RSRC_CONF,
-		"Use specified HTTP/SOCKS proxy for the Phusion Passenger security update check."),
+		"Use specified HTTP/SOCKS proxy for the Phusion Passenger(R) security update check."),
 	AP_INIT_FLAG("PassengerShowVersionInHeader",
 		(FlagFunc) cmd_passenger_show_version_in_header,
 		NULL,
 		RSRC_CONF,
-		"Whether to show the Phusion Passenger version number in the X-Powered-By header."),
+		"Whether to show the Phusion Passenger(R) version number in the X-Powered-By header."),
 	AP_INIT_TAKE1("PassengerSocketBacklog",
 		(Take1Func) cmd_passenger_socket_backlog,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger socket backlog."),
+		"The Phusion Passenger(R) socket backlog."),
 	AP_INIT_TAKE1("PassengerSpawnDir",
 		(Take1Func) cmd_passenger_spawn_dir,
 		NULL,
 		RSRC_CONF,
-		"The directory for Phusion Passenger used during child spawning."),
+		"The directory for Phusion Passenger(R) used during child spawning."),
 	AP_INIT_TAKE1("PassengerSpawnMethod",
 		(Take1Func) cmd_passenger_spawn_method,
 		NULL,
@@ -431,12 +431,12 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_enterprise_only,
 		NULL,
 		RSRC_CONF | ACCESS_CONF,
-		"The number of threads that Phusion Passenger should spawn per application."),
+		"The number of threads that Phusion Passenger(R) should spawn per application."),
 	AP_INIT_FLAG("PassengerTurbocaching",
 		(FlagFunc) cmd_passenger_turbocaching,
 		NULL,
 		RSRC_CONF,
-		"Whether to enable turbocaching in Phusion Passenger."),
+		"Whether to enable turbocaching in Phusion Passenger(R)."),
 	AP_INIT_FLAG("PassengerUseGlobalQueue",
 		(FlagFunc) cmd_passenger_use_global_queue,
 		NULL,
@@ -451,7 +451,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_user_switching,
 		NULL,
 		RSRC_CONF,
-		"Whether to enable user switching support in Phusion Passenger."),
+		"Whether to enable user switching support in Phusion Passenger(R)."),
 	AP_INIT_TAKE1("RackBaseURI",
 		(Take1Func) cmd_passenger_base_uri,
 		NULL,
@@ -481,7 +481,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_default_user,
 		NULL,
 		RSRC_CONF,
-		"The user that Phusion Passenger applications must run as when user switching fails or is disabled."),
+		"The user that Phusion Passenger(R) applications must run as when user switching fails or is disabled."),
 	AP_INIT_TAKE1("RailsEnv",
 		(Take1Func) cmd_passenger_app_env,
 		NULL,
@@ -526,7 +526,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_user_switching,
 		NULL,
 		RSRC_CONF,
-		"Whether to enable user switching support in Phusion Passenger."),
+		"Whether to enable user switching support in Phusion Passenger(R)."),
 	AP_INIT_TAKE1("UnionStationFilter",
 		(Take1Func) cmd_union_station_filter,
 		NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -992,7 +992,7 @@ cmd_passenger_user_switching(cmd_parms *cmd, void *pcfg, const char *arg) {
 
 static const char *
 cmd_rails_allow_mod_rewrite(cmd_parms *cmd, void *pcfg, const char *arg) {
-	fprintf(stderr, "WARNING: The 'RailsAllowModRewrite' option is obsolete: Phusion Passenger now fully supports mod_rewrite. Please remove this option from your configuration file.\n");
+	fprintf(stderr, "WARNING: The 'RailsAllowModRewrite' option is obsolete: Phusion Passenger(R) now fully supports mod_rewrite. Please remove this option from your configuration file.\n");
 	fflush(stderr);
 	return NULL;
 }

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -72,7 +72,7 @@ struct AutoGeneratedDirConfig {
 	Threeway mBufferUpload;
 
 	/*
-	 * Enable or disable Phusion Passenger.
+	 * Enable or disable Phusion Passenger(R).
 	 */
 	Threeway mEnabled;
 
@@ -192,7 +192,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mPython;
 
 	/*
-	 * The directory in which Phusion Passenger should look for restart.txt.
+	 * The directory in which Phusion Passenger(R) should look for restart.txt.
 	 */
 	StaticString mRestartDir;
 

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -58,7 +58,7 @@ namespace Apache2Module {
 struct AutoGeneratedServerConfig {
 
 	/*
-	 * Whether to disable Phusion Passenger anonymous telemetry.
+	 * Whether to disable Phusion Passenger(R) anonymous telemetry.
 	 */
 	bool disableAnonymousTelemetry;
 
@@ -68,27 +68,27 @@ struct AutoGeneratedServerConfig {
 	bool disableLogPrefix;
 
 	/*
-	 * Whether to disable the Phusion Passenger security update check & notification.
+	 * Whether to disable the Phusion Passenger(R) security update check & notification.
 	 */
 	bool disableSecurityUpdateCheck;
 
 	/*
-	 * Whether to show the Phusion Passenger version number in the X-Powered-By header.
+	 * Whether to show the Phusion Passenger(R) version number in the X-Powered-By header.
 	 */
 	bool showVersionInHeader;
 
 	/*
-	 * Whether to enable turbocaching in Phusion Passenger.
+	 * Whether to enable turbocaching in Phusion Passenger(R).
 	 */
 	bool turbocaching;
 
 	/*
-	 * Whether to enable user switching support in Phusion Passenger.
+	 * Whether to enable user switching support in Phusion Passenger(R).
 	 */
 	bool userSwitching;
 
 	/*
-	 * The Phusion Passenger log verbosity.
+	 * The Phusion Passenger(R) log verbosity.
 	 */
 	int logLevel;
 
@@ -108,12 +108,12 @@ struct AutoGeneratedServerConfig {
 	int poolIdleTime;
 
 	/*
-	 * The maximum size of the Phusion Passenger response buffer.
+	 * The maximum size of the Phusion Passenger(R) response buffer.
 	 */
 	int responseBufferHighWatermark;
 
 	/*
-	 * The Phusion Passenger socket backlog.
+	 * The Phusion Passenger(R) socket backlog.
 	 */
 	int socketBacklog;
 
@@ -143,27 +143,27 @@ struct AutoGeneratedServerConfig {
 	StaticString adminPanelUsername;
 
 	/*
-	 * Use specified HTTP/SOCKS proxy for Phusion Passenger anonymous telemetry collection.
+	 * Use specified HTTP/SOCKS proxy for Phusion Passenger(R) anonymous telemetry collection.
 	 */
 	StaticString anonymousTelemetryProxy;
 
 	/*
-	 * The directory that Phusion Passenger data buffers should be stored into.
+	 * The directory that Phusion Passenger(R) data buffers should be stored into.
 	 */
 	StaticString dataBufferDir;
 
 	/*
-	 * The group that Phusion Passenger applications must run as when user switching fails or is disabled.
+	 * The group that Phusion Passenger(R) applications must run as when user switching fails or is disabled.
 	 */
 	StaticString defaultGroup;
 
 	/*
-	 * Phusion Passenger's default Ruby interpreter to use.
+	 * Phusion Passenger(R)'s default Ruby interpreter to use.
 	 */
 	StaticString defaultRuby;
 
 	/*
-	 * The user that Phusion Passenger applications must run as when user switching fails or is disabled.
+	 * The user that Phusion Passenger(R) applications must run as when user switching fails or is disabled.
 	 */
 	StaticString defaultUser;
 
@@ -173,32 +173,32 @@ struct AutoGeneratedServerConfig {
 	StaticString dumpConfigManifest;
 
 	/*
-	 * The Phusion Passenger file descriptor log file.
+	 * The Phusion Passenger(R) file descriptor log file.
 	 */
 	StaticString fileDescriptorLogFile;
 
 	/*
-	 * The directory to register the Phusion Passenger instance to.
+	 * The directory to register the Phusion Passenger(R) instance to.
 	 */
 	StaticString instanceRegistryDir;
 
 	/*
-	 * The Phusion Passenger log file.
+	 * The Phusion Passenger(R) log file.
 	 */
 	StaticString logFile;
 
 	/*
-	 * The Phusion Passenger root folder.
+	 * The Phusion Passenger(R) root folder.
 	 */
 	StaticString root;
 
 	/*
-	 * Use specified HTTP/SOCKS proxy for the Phusion Passenger security update check.
+	 * Use specified HTTP/SOCKS proxy for the Phusion Passenger(R) security update check.
 	 */
 	StaticString securityUpdateCheckProxy;
 
 	/*
-	 * The directory for Phusion Passenger used during child spawning.
+	 * The directory for Phusion Passenger(R) used during child spawning.
 	 */
 	StaticString spawnDir;
 

data/src/cxx_supportlib/Constants.h

@@ -83,7 +83,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.8"
+#define PASSENGER_VERSION "6.0.12"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/DataStructures/HashedStaticString.h

@@ -53,6 +53,8 @@ public:
 		rehash();
 	}
 
+	HashedStaticString& operator=(const HashedStaticString &other) = default;
+
 	HashedStaticString(const HashedStaticString &b)
 		: StaticString(b),
 		  m_hash(b.m_hash)

data/src/cxx_supportlib/FileDescriptor.h

@@ -121,6 +121,14 @@ public:
 	 */
 	FileDescriptor() { }
 
+	/**
+	 * Creates a new FileDescriptor instance that is equal
+	 * to the passed file descriptor.
+	 *
+	 * @post *this == *other
+	 */
+	FileDescriptor(const FileDescriptor &other) = default;
+
 	/**
 	 * Creates a new FileDescriptor instance with the given fd as a handle.
 	 *

data/src/cxx_supportlib/IOTools/IOUtils.cpp

@@ -1183,7 +1183,7 @@ readFileDescriptor(int fd, unsigned long long *timeout) {
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		// File descriptor passing macros (CMSG_*) seem to be broken
 		// on 64-bit MacOS X. This structure works around the problem.
 		struct {
@@ -1226,7 +1226,7 @@ readFileDescriptor(int fd, unsigned long long *timeout) {
 		throw IOException("No valid file descriptor received.");
 	}
 
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		return control_data.fd;
 	#else
 		return *((int *) CMSG_DATA(control_header));
@@ -1242,7 +1242,7 @@ writeFileDescriptor(int fd, int fdToSend, unsigned long long *timeout) {
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		struct {
 			struct cmsghdr header;
 			int fd;
@@ -1273,7 +1273,7 @@ writeFileDescriptor(int fd, int fdToSend, unsigned long long *timeout) {
 	control_header = CMSG_FIRSTHDR(&msg);
 	control_header->cmsg_level = SOL_SOCKET;
 	control_header->cmsg_type  = SCM_RIGHTS;
-	#if defined(__APPLE__) || defined(__SOLARIS__) || defined(__arm__)
+	#if defined(__APPLE__) || defined(__SOLARIS__)
 		control_header->cmsg_len = sizeof(control_data);
 		control_data.fd = fdToSend;
 	#else

data/src/cxx_supportlib/StaticString.h

@@ -135,6 +135,8 @@ public:
 		  len(b.len)
 		{ }
 
+	StaticString &operator=(const StaticString &other) = default;
+
 	StaticString(const string &s) {
 		content = s.data();
 		len = s.size();

data/src/cxx_supportlib/Utils/HttpConstants.h

@@ -114,7 +114,7 @@ getStatusCodeAndReasonPhrase(int statusCode) {
 	case 417:
 		return "417 Expectation Failed";
 	case 418:
-		return "418 Not A Funny April Fools Joke";
+		return "418 I'm A Teapot";
 	case 420:
 		// https://dev.twitter.com/docs/error-codes-responses
 		return "420 Enhance Your Calm";

data/src/cxx_supportlib/vendor-modified/boost/algorithm/string/detail/case_conv.hpp

@@ -15,6 +15,9 @@
 #include <locale>
 #include <functional>
 
+#include <boost/iterator/transform_iterator.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
 #include <boost/type_traits/make_unsigned.hpp>
 
 namespace boost {

data/src/cxx_supportlib/vendor-modified/boost/algorithm/string/detail/classification.hpp

@@ -13,10 +13,12 @@
 
 #include <boost/algorithm/string/config.hpp>
 #include <algorithm>
+#include <cstring>
 #include <functional>
 #include <locale>
 
 #include <boost/range/begin.hpp>
+#include <boost/range/distance.hpp>
 #include <boost/range/end.hpp>
 
 #include <boost/algorithm/string/predicate_facade.hpp>

data/src/cxx_supportlib/vendor-modified/boost/algorithm/string/detail/find_format_all.hpp

@@ -18,6 +18,8 @@
 #include <boost/algorithm/string/detail/find_format_store.hpp>
 #include <boost/algorithm/string/detail/replace_storage.hpp>
 
+#include <deque>
+
 namespace boost {
     namespace algorithm {
         namespace detail {

data/src/cxx_supportlib/vendor-modified/boost/align/aligned_alloc.hpp

@@ -0,0 +1,47 @@
+/*
+Copyright 2014-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_ALIGNED_ALLOC_HPP
+#define BOOST_ALIGN_ALIGNED_ALLOC_HPP
+
+#include <boost/config.hpp>
+
+#if defined(BOOST_HAS_UNISTD_H)
+#include <unistd.h>
+#endif
+
+#if defined(__APPLE__) || defined(__APPLE_CC__) || defined(macintosh)
+#include <AvailabilityMacros.h>
+#endif
+
+#if defined(BOOST_ALIGN_USE_ALIGN)
+#include <boost/align/detail/aligned_alloc.hpp>
+#elif defined(BOOST_ALIGN_USE_NEW)
+#include <boost/align/detail/aligned_alloc_new.hpp>
+#elif defined(_MSC_VER) && !defined(UNDER_CE)
+#include <boost/align/detail/aligned_alloc_msvc.hpp>
+#elif defined(__MINGW32__) && (__MSVCRT_VERSION__ >= 0x0700)
+#include <boost/align/detail/aligned_alloc_msvc.hpp>
+#elif defined(__MINGW32__)
+#include <boost/align/detail/aligned_alloc_mingw.hpp>
+#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#include <boost/align/detail/aligned_alloc_posix.hpp>
+#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#include <boost/align/detail/aligned_alloc_macos.hpp>
+#elif defined(__ANDROID__)
+#include <boost/align/detail/aligned_alloc_android.hpp>
+#elif defined(__SunOS_5_11) || defined(__SunOS_5_12)
+#include <boost/align/detail/aligned_alloc_posix.hpp>
+#elif defined(sun) || defined(__sun)
+#include <boost/align/detail/aligned_alloc_sunos.hpp>
+#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+#include <boost/align/detail/aligned_alloc_posix.hpp>
+#else
+#include <boost/align/detail/aligned_alloc.hpp>
+#endif
+
+#endif

data/src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc_posix.hpp

@@ -0,0 +1,41 @@
+/*
+Copyright 2014 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_POSIX_HPP
+#define BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_POSIX_HPP
+
+#include <boost/align/detail/is_alignment.hpp>
+#include <boost/assert.hpp>
+#include <stdlib.h>
+
+namespace boost {
+namespace alignment {
+
+inline void*
+aligned_alloc(std::size_t alignment, std::size_t size) BOOST_NOEXCEPT
+{
+    BOOST_ASSERT(detail::is_alignment(alignment));
+    if (alignment < sizeof(void*)) {
+        alignment = sizeof(void*);
+    }
+    void* p;
+    if (::posix_memalign(&p, alignment, size) != 0) {
+        p = 0;
+    }
+    return p;
+}
+
+inline void
+aligned_free(void* ptr) BOOST_NOEXCEPT
+{
+    ::free(ptr);
+}
+
+} /* alignment */
+} /* boost */
+
+#endif

data/src/cxx_supportlib/vendor-modified/boost/align/detail/is_alignment.hpp

@@ -0,0 +1,28 @@
+/*
+Copyright 2014 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_ALIGN_DETAIL_IS_ALIGNMENT_HPP
+#define BOOST_ALIGN_DETAIL_IS_ALIGNMENT_HPP
+
+#include <boost/config.hpp>
+#include <cstddef>
+
+namespace boost {
+namespace alignment {
+namespace detail {
+
+BOOST_CONSTEXPR inline bool
+is_alignment(std::size_t value) BOOST_NOEXCEPT
+{
+    return (value > 0) && ((value & (value - 1)) == 0);
+}
+
+} /* detail */
+} /* alignment */
+} /* boost */
+
+#endif