passenger 6.0.25 → 6.0.27

data/src/cxx_supportlib/ServerKit/HttpHeaderParser.h

@@ -119,33 +119,30 @@ private:
 	}
 
 	static size_t http_parser_execute_and_handle_pause(llhttp_t *parser,
-		const char *data, size_t len, bool &paused)
+		const char *data, size_t len)
 	{
 		llhttp_errno_t rc = llhttp_get_errno(parser);
 		switch (rc) {
 		case HPE_PAUSED_UPGRADE:
 			llhttp_resume_after_upgrade(parser);
+			rc = llhttp_get_errno(parser);
 			goto happy_path;
 		case HPE_PAUSED:
 			llhttp_resume(parser);
+			rc = llhttp_get_errno(parser);
 			goto happy_path;
 		case HPE_OK:
-		happy_path:
-			switch (llhttp_execute(parser, data, len)) {
-			case HPE_PAUSED_H2_UPGRADE:
-			case HPE_PAUSED_UPGRADE:
-			case HPE_PAUSED:
-				paused = true;
-				return (llhttp_get_error_pos(parser) - data);
-			case HPE_OK:
-				return len;
-			default:
-				goto error_path;
-			}
-        default:
-		error_path:
+			rc = llhttp_execute(parser, data, len);
+			goto happy_path;
+		default:
 			return (llhttp_get_error_pos(parser) - data);
 		}
+
+		happy_path:
+		if (rc == HPE_OK) {
+			return len;
+		}
+		return (llhttp_get_error_pos(parser) - data);
 	}
 
 	static int _onURL(llhttp_t *parser, const char *data, size_t len) {
@@ -488,20 +485,22 @@ public:
 		TRACE_POINT();
 		P_ASSERT_EQ(message->httpState, Message::PARSING_HEADERS);
 
-		size_t ret;
-		bool paused;
-
 		state->parser.data = this;
 		currentBuffer = &buffer;
-		ret = http_parser_execute_and_handle_pause(&state->parser,
-			buffer.start, buffer.size(), paused);
+		size_t ret = http_parser_execute_and_handle_pause(&state->parser,
+			buffer.start, buffer.size());
 		currentBuffer = NULL;
 
-		if (!llhttp_get_upgrade(&state->parser) && ret != buffer.size() && !paused || !paused && llhttp_get_errno(&state->parser) != HPE_OK) {
+		llhttp_errno_t llerrno = llhttp_get_errno(&state->parser);
+
+		bool paused = (llerrno == HPE_PAUSED_H2_UPGRADE || llerrno == HPE_PAUSED_UPGRADE || llerrno == HPE_PAUSED);
+
+		if ( (!llhttp_get_upgrade(&state->parser) && ret != buffer.size() && !paused) ||
+		 (llerrno != HPE_OK && !paused) ) {
 			UPDATE_TRACE_POINT();
 			message->httpState = Message::ERROR;
-			switch (llhttp_get_errno(&state->parser)) {
-			case HPE_CB_HEADER_FIELD_COMPLETE://?? does this match was HPE_CB_header_field in old one
+			switch (llerrno) {
+			case HPE_CB_HEADER_FIELD_COMPLETE:// does this match? was HPE_CB_header_field in old impl
 			case HPE_CB_HEADERS_COMPLETE:
 				switch (state->state) {
 				case HttpHeaderParserState::ERROR_SECURITY_PASSWORD_MISMATCH:
@@ -526,9 +525,10 @@ public:
 				break;
 			default:
 				default_error:
-				message->aux.parseError = HTTP_PARSER_ERRNO_BEGIN - llhttp_get_errno(&state->parser);
+				message->aux.parseError = HTTP_PARSER_ERRNO_BEGIN - llerrno;
 				break;
 			}
+			llhttp_finish(&state->parser);
 		} else if (messageHttpStateIndicatesCompletion(MessageType())) {
 			UPDATE_TRACE_POINT();
 			message->httpMajor = llhttp_get_http_major(&state->parser);

data/src/cxx_supportlib/StrIntTools/StrIntUtils.h

@@ -45,8 +45,8 @@ using namespace std;
 
 
 /**
- * A RAII construct for memory buffers that are dynamically allocated with malloc().
- * Upon destruction of a DynamicBuffer, the memory buffer is freed.
+ * RAII construct for memory buffers that are dynamically allocated with malloc().
+ * Upon destruction, the memory buffer is freed. Does not guarantee null terminator.
  */
 struct DynamicBuffer {
 private:

data/src/cxx_supportlib/SystemTools/SystemMetricsCollector.h

@@ -31,14 +31,12 @@
 #include <boost/typeof/typeof.hpp>
 #include <ostream>
 #include <iomanip>
-#include <algorithm>
 #include <limits>
 #include <vector>
 #include <string>
 #include <cstdio>
 #include <cstdlib>
 #include <climits>
-#include <cmath>
 #include <ctime>
 #include <sys/types.h>
 #include <sys/utsname.h>

data/src/cxx_supportlib/Utils/FastStringStream.h

@@ -27,7 +27,6 @@
 #define _PASSENGER_FAST_STRING_STREAM_H_
 
 #include <ostream>
-#include <sstream>
 #include <string>
 #include <new>
 #include <cstdlib>
@@ -158,6 +157,12 @@ public:
 	}
 };
 
+#ifndef _PASSENGER_FAST_STRING_STREAM_FORWARD_DECLARED_
+	#define _PASSENGER_FAST_STRING_STREAM_FORWARD_DECLARED_
+	template<size_t staticCapacity = 1024>
+	class FastStringStream;
+#endif
+
 /**
  * An std::ostream-compatible output stream. It's similar to std::stringstream,
  * with a few optimizations:
@@ -169,12 +174,7 @@ public:
  *
  * This class is implemented using FastStdStringBuf.
  */
-#ifndef _PASSENGER_FAST_STRING_STREAM_FORWARD_DECLARED_
-	#define _PASSENGER_FAST_STRING_STREAM_FORWARD_DECLARED_
-	template<size_t staticCapacity = 1024>
-#else
-	template<size_t staticCapacity>
-#endif
+template<size_t staticCapacity>
 class FastStringStream: public FastStdStringBuf<staticCapacity>, public ostream {
 public:
 	FastStringStream(unsigned int initialCapacity = 0)

data/src/cxx_supportlib/Utils/IniFile.h

@@ -33,7 +33,6 @@
 #include <iostream>
 #include <cstdio>
 #include <cstring>
-#include <cassert>
 #include <cctype>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
@@ -68,7 +67,7 @@ public:
 			return string();
 		}
 	}
-	
+
 	string operator[](const string &keyName) const {
 		return get(keyName);
 	}
@@ -120,15 +119,15 @@ public:
 				"<T_TEXT>",
 				"<T_EOF>"
 			};
-			
+
 			return KIND_IDENTITY_TABLE[kind];
 		}
 
 		Token(const Kind kind, const string &value, const int line, const int column)
 			: kind(kind), value(value), line(line), column(column) {
-			
+
 		}
-		
+
 		class ExpectanceException : public std::exception {
 		private:
 			char message[255];
@@ -168,7 +167,7 @@ public:
 
 	typedef boost::shared_ptr<IniFileLexer::Token> TokenPtr;
 
-	
+
 
 protected:
 	ifstream iniFileStream;
@@ -184,7 +183,7 @@ protected:
 
 	void expect(char ch) {
 		int upcomingChar = iniFileStream.peek();
-	
+
 		if (ch != upcomingChar) {
 			switch(upcomingChar) {
 				case EOF:
@@ -202,11 +201,11 @@ protected:
 
 	void accept() {
 		if (upcomingChar == EOF) return;
-	
+
 		lastAcceptedChar = (char)iniFileStream.get();
 		upcomingChar     = iniFileStream.peek();
 		currentColumn++;
-	
+
 		if (lastAcceptedChar == '\n') {
 			currentLine++;
 			currentColumn = 1;
@@ -215,10 +214,10 @@ protected:
 
 	void ignore() {
 		if (upcomingChar == EOF) return;
-	
+
 		upcomingChar = iniFileStream.peek();
 		currentColumn++;
-	
+
 		if ((char)iniFileStream.get() == '\n') {
 			currentLine++;
 			currentColumn = 1;
@@ -246,12 +245,12 @@ protected:
 		int line   = currentLine;
 		int column = currentColumn;
 		string result;
-	
+
 		while (isalnum(upcomingChar) || upcomingChar == '_' || upcomingChar == '-') {
 			result.append(1, upcomingChar);
 			accept();
 		}
-			
+
 		return Token(Token::IDENTIFIER, result, line, column);
 	}
 
@@ -266,13 +265,13 @@ protected:
 		int line   = currentLine;
 		int column = currentColumn;
 		string result;
-	
+
 		//while (upcomingChar != ']' && upcomingChar != '[' && upcomingChar != '\n' && upcomingChar != EOF) {
 		while (isalnum(upcomingChar) || upcomingChar == '_' || upcomingChar == '-') {
 			result.append(1, upcomingChar);
 			accept();
 		}
-	
+
 		return Token(Token::SECTION_NAME, result, line, column);
 	}
 
@@ -285,12 +284,12 @@ protected:
 		int line   = currentLine;
 		int column = currentColumn;
 		string result;
-	
+
 		while (upcomingChar != '\n' && upcomingChar != EOF) {
 			result.append(1, upcomingChar);
 			accept();
 		}
-	
+
 		return Token(Token::TEXT, result, line, column);
 	}
 
@@ -306,12 +305,12 @@ protected:
 		int line   = currentLine;
 		int column = currentColumn;
 		string result;
-	
+
 		while (upcomingChar != EOF) {
 			result.append(1, upcomingChar);
 			accept();
 		}
-	
+
 		return Token(Token::UNKNOWN, result, line, column);
 	}
 
@@ -346,7 +345,7 @@ public:
 			upcomingTokenPtr = boost::make_shared<Token>(upcomingToken);
 			upcomingTokenPtrIsStale = false;
 		}
-	
+
 		return upcomingTokenPtr;
 	}
 
@@ -355,7 +354,7 @@ public:
 			upcomingTokenPtrIsStale = true;
 			return *upcomingTokenPtr;
 		}
-	
+
 		while (iniFileStream.good()) {
 			upcomingChar = iniFileStream.peek();
 			switch(upcomingChar) {
@@ -392,7 +391,7 @@ public:
 					}
 			}
 		}
-	
+
 		return Token(Token::END_OF_FILE, "<END_OF_FILE>", currentLine, currentColumn);
 	}
 };
@@ -405,7 +404,7 @@ protected:
 	typedef map<string, IniFileSectionPtr> SectionMap;
 	string name;
 	SectionMap sections;
-	
+
 	class IniFileParser {
 	typedef IniFileLexer::Token Token;
 
@@ -414,7 +413,7 @@ protected:
 		IniFile *iniFile;
 
 		// The Start Symbol.
-		void parseSections() {		
+		void parseSections() {
 			while ((lexer.peekToken())->kind == Token::SECTION_NAME) {
 				parseSection();
 			}
@@ -476,7 +475,7 @@ protected:
 			parseSections();
 		}
 	};
-	
+
 public:
 	IniFile(const string &iniFileName)
 		: name(iniFileName)

data/src/cxx_supportlib/Utils.h

@@ -33,13 +33,6 @@
 #include <sys/stat.h>
 #include <string>
 #include <vector>
-#include <utility>
-#include <sstream>
-#include <cstdio>
-#include <climits>
-#include <cstdlib>
-#include <cstring>
-#include <errno.h>
 #include <unistd.h>
 #include <StaticString.h>
 #include <Exceptions.h>
@@ -54,29 +47,6 @@ using namespace boost;
 
 class ResourceLocator;
 
-/**
- * Convenience shortcut for creating a <tt>shared_ptr</tt>.
- * Instead of:
- * @code
- *    boost::shared_ptr<Foo> foo;
- *    ...
- *    foo = boost::shared_ptr<Foo>(new Foo());
- * @endcode
- * one can write:
- * @code
- *    boost::shared_ptr<Foo> foo;
- *    ...
- *    foo = ptr(new Foo());
- * @endcode
- *
- * @param pointer The item to put in the boost::shared_ptr object.
- * @ingroup Support
- */
-template<typename T> boost::shared_ptr<T>
-ptr(T *pointer) {
-	return boost::shared_ptr<T>(pointer);
-}
-
 /**
  * Escape the given raw string into an XML value.
  *

data/src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp

@@ -53,6 +53,10 @@ public:
 		// Do nothing.
 	}
 
+	tracable_exception &operator=(const tracable_exception &other) {
+		return *this; // Do nothing.
+	}
+
 	virtual std::string backtrace() const throw() {
 		return "     (backtrace support disabled during compile time)\n";
 	}

data/src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp

@@ -42,6 +42,7 @@ public:
 	tracable_exception();
 	tracable_exception(const tracable_exception &other);
 	tracable_exception(const no_backtrace &tag);
+	tracable_exception &operator=(const tracable_exception &other);
 	virtual ~tracable_exception() throw();
 	virtual std::string backtrace() const throw();
 	virtual const char *what() const throw();

data/src/cxx_supportlib/oxt/implementation.cpp

@@ -34,8 +34,10 @@
 #include "thread.hpp"
 #include "spin_lock.hpp"
 #include "detail/context.hpp"
-#ifdef __linux__
+#if defined(__linux__)
 	#include <sys/syscall.h>
+#elif defined(__FreeBSD__)
+	#include <pthread_np.h> // for pthread_set_name_np()
 #endif
 
 #ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
@@ -266,6 +268,41 @@ tracable_exception::tracable_exception(const no_backtrace &tag)
 	// Do nothing.
 }
 
+tracable_exception &
+tracable_exception::operator=(const tracable_exception &other) {
+	if (this != &other) {
+		// Clean up existing backtrace points
+		for (auto p: backtrace_copy) {
+			delete p;
+		}
+		backtrace_copy.clear();
+
+		// Copy backtrace points from other
+		backtrace_copy.reserve(other.backtrace_copy.size());
+		for (const auto p2: other.backtrace_copy) {
+			trace_point *p;
+			if (p2->m_hasDataFunc) {
+				p = new trace_point(
+					p2->function,
+					p2->source,
+					p2->line,
+					p2->u.dataFunc.func,
+					p2->u.dataFunc.userData,
+					true);
+			} else {
+				p = new trace_point(
+					p2->function,
+					p2->source,
+					p2->line,
+					p2->u.data,
+					trace_point::detached());
+			}
+			backtrace_copy.push_back(p);
+		}
+	}
+	return *this;
+}
+
 tracable_exception::~tracable_exception() throw() {
 	vector<trace_point *>::iterator it, end = backtrace_copy.end();
 	for (it = backtrace_copy.begin(); it != end; it++) {
@@ -399,8 +436,10 @@ static void
 set_native_thread_name(const string &name) {
 	#if defined(__linux__)
 		pthread_setname_np(pthread_self(), name.c_str());
-	#elif defined(__APPLE__) || defined(__FreeBSD__)
+	#elif defined(__APPLE__)
 		pthread_setname_np(name.c_str());
+	#elif defined(__FreeBSD__)
+		pthread_set_name_np(pthread_self(), name.c_str());
 	#endif
 }
 

data/src/cxx_supportlib/oxt/system_calls.cpp

@@ -26,6 +26,7 @@
 #include "detail/context.hpp"
 #include <boost/thread.hpp>
 #include <cerrno>
+#include <signal.h>
 
 using namespace boost;
 using namespace oxt;

data/src/cxx_supportlib/oxt/system_calls.hpp

@@ -35,11 +35,10 @@
 #include <pthread.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <poll.h>
+#include <signal.h> // IWYU pragma: keep; for SIGUSR1
 #include <cstdio>
 #include <ctime>
-#include <cassert>
 #include "macros.hpp"
 
 /**
@@ -113,8 +112,8 @@
 // This is one of the things that Java is good at and C++ sucks at. Sigh...
 
 namespace oxt {
-	static const int INTERRUPTION_SIGNAL = SIGUSR1; // SIGUSR2 is reserved by Valgrind...
-	#define OXT_MAX_ERROR_CHANCES 16
+	static constexpr int INTERRUPTION_SIGNAL = SIGUSR1; // SIGUSR2 is reserved by Valgrind...
+	static constexpr unsigned int OXT_MAX_ERROR_CHANCES = 16;
 
 	struct ErrorChance {
 		double chance;

data/src/cxx_supportlib/vendor-modified/boost/container/allocator.hpp

@@ -336,8 +336,8 @@ class allocator
       BOOST_CONTAINER_STATIC_ASSERT(( Version > 1 ));
       dlmalloc_memchain ch;
       void *beg(&*chain.begin()), *last(&*chain.last());
-      size_t size(chain.size());
-      BOOST_CONTAINER_MEMCHAIN_INIT_FROM(&ch, beg, last, size);
+      size_t sz(chain.size());
+      BOOST_CONTAINER_MEMCHAIN_INIT_FROM(&ch, beg, last, sz);
       dlmalloc_multidealloc(&ch);
       //dlmalloc_multidealloc(move_detail::force_ptr<dlmalloc_memchain *>(&chain));
    }

data/src/cxx_supportlib/vendor-modified/boost/container/deque.hpp

@@ -1026,6 +1026,11 @@ class deque : protected deque_base<typename real_allocator<T, Allocator>::type,
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
    private:                      // Internal typedefs
+
+   //`allocator_type::value_type` must match container's `value type`. If this
+   //assertion fails, please review your allocator definition. 
+   BOOST_CONTAINER_STATIC_ASSERT((dtl::is_same<value_type, typename allocator_traits<ValAllocator>::value_type>::value));
+
    BOOST_COPYABLE_AND_MOVABLE(deque)
    typedef typename Base::ptr_alloc_ptr index_pointer;
    typedef allocator_traits<ValAllocator>                  allocator_traits_type;

data/src/cxx_supportlib/vendor-modified/boost/container/detail/config_begin.hpp

@@ -41,6 +41,7 @@
    #pragma warning (disable : 4671) //  the copy constructor is inaccessible
    #pragma warning (disable : 4673) //  throwing '' the following types will not be considered at the catch site
    #pragma warning (disable : 4675) // "method" should be declared "static" and have exactly one parameter
+   #pragma warning (disable : 4702) // unreachable code
    #pragma warning (disable : 4706) // assignment within conditional expression
    #pragma warning (disable : 4710) // function not inlined
    #pragma warning (disable : 4714) // "function": marked as __forceinline not inlined

data/src/cxx_supportlib/vendor-modified/boost/container/detail/container_or_allocator_rebind.hpp

@@ -38,8 +38,7 @@ struct container_or_allocator_rebind_impl<AllocatorOrContainer, ToType, false>
 
 template<class ToType>
 struct container_or_allocator_rebind_impl<void, ToType, false>
-   : real_allocator<ToType, void>
-{};
+{  typedef void type;  };
 
 template<class AllocatorOrContainer, class ToType>
 struct container_or_allocator_rebind

data/src/cxx_supportlib/vendor-modified/boost/container/detail/container_rebind.hpp

@@ -26,6 +26,16 @@ namespace boost {
 namespace container {
 namespace dtl {
 
+   template<class V, class A, class U>
+   struct void_or_portable_rebind_alloc
+   {
+      typedef typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type type;
+   };
+
+   template<class V, class U>
+   struct void_or_portable_rebind_alloc<V, void, U>
+   {  typedef void type;  };
+
    template <class Cont, class U>
    struct container_rebind;
 
@@ -34,14 +44,14 @@ namespace dtl {
    template <template <class, class, class...> class Cont, typename V, typename A, class... An, class U>
    struct container_rebind<Cont<V, A, An...>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, An...> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, An...> type;
    };
 
    //Needed for non-conforming compilers like GCC 4.3
    template <template <class, class> class Cont, typename V, typename A, class U>
    struct container_rebind<Cont<V, A>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type> type;
    };
 
    template <template <class> class Cont, typename V, class U>
@@ -65,7 +75,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type> type;
    };
 
    template <template <class, class, class> class Cont  //1arg
@@ -73,7 +83,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0> type;
    };
 
    template <template <class, class, class, class> class Cont  //2arg
@@ -81,7 +91,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1> type;
    };
 
    template <template <class, class, class, class, class> class Cont  //3arg
@@ -89,7 +99,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2> type;
    };
 
    template <template <class, class, class, class, class, class> class Cont  //4arg
@@ -97,7 +107,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3> type;
    };
 
    template <template <class, class, class, class, class, class, class> class Cont  //5arg
@@ -105,7 +115,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3, P4>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3, P4> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3, P4> type;
    };
 
    template <template <class, class, class, class, class, class, class, class> class Cont  //6arg
@@ -113,7 +123,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3, P4, P5>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3, P4, P5> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3, P4, P5> type;
    };
 
    template <template <class, class, class, class, class, class, class, class, class> class Cont  //7arg
@@ -121,7 +131,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3, P4, P5, P6>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3, P4, P5, P6> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3, P4, P5, P6> type;
    };
 
    template <template <class, class, class, class, class, class, class, class, class, class> class Cont  //8arg
@@ -129,7 +139,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3, P4, P5, P6, P7>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3, P4, P5, P6, P7> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3, P4, P5, P6, P7> type;
    };
 
    template <template <class, class, class, class, class, class, class, class, class, class, class> class Cont  //9arg
@@ -137,7 +147,7 @@ namespace dtl {
       , class U>
       struct container_rebind<Cont<V, A, P0, P1, P2, P3, P4, P5, P6, P7, P8>, U>
    {
-      typedef Cont<U, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, P0, P1, P2, P3, P4, P5, P6, P7, P8> type;
+      typedef Cont<U, typename void_or_portable_rebind_alloc<V, A, U>::type, P0, P1, P2, P3, P4, P5, P6, P7, P8> type;
    };
 
 #endif   //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
@@ -147,7 +157,7 @@ namespace dtl {
    template <typename V, std::size_t N, typename A, typename O, class U>
    struct container_rebind<small_vector<V, N, A, O>, U>
    {
-      typedef small_vector<U, N, typename allocator_traits<typename real_allocator<V, A>::type>::template portable_rebind_alloc<U>::type, O> type;
+      typedef small_vector<U, N, typename void_or_portable_rebind_alloc<V, A, U>::type, O> type;
    };
 
    template <typename V, std::size_t N, typename O, class U>