passenger 5.1.4 → 5.1.5

data/src/cxx_supportlib/ServerKit/HttpServer.h

@@ -60,6 +60,30 @@ extern const char DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE[];
 extern const unsigned int DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE_SIZE;
 
 
+class HttpServerSchema: public BaseServerSchema {
+private:
+	void initialize() {
+		using namespace ConfigKit;
+
+		add("request_freelist_limit", UINT_TYPE, OPTIONAL, 1024);
+	}
+
+public:
+	HttpServerSchema()
+		: BaseServerSchema(true)
+	{
+		initialize();
+		finalize();
+	}
+
+	HttpServerSchema(bool _subclassing)
+		: BaseServerSchema(true)
+	{
+		initialize();
+	}
+};
+
+
 template< typename DerivedServer, typename Client = HttpClient<HttpRequest> >
 class HttpServer: public BaseServer<DerivedServer, Client> {
 public:
@@ -917,6 +941,13 @@ protected:
 		req->bodyChannel.deinitialize();
 	}
 
+	virtual void onConfigChange(const ConfigKit::Store *oldConfig) {
+		ParentClass::onConfigChange(oldConfig);
+		const ConfigKit::Store &config = this->config;
+
+		requestFreelistLimit = config["request_freelist_limit"].asUInt();
+	}
+
 
 	/***** Misc *****/
 
@@ -926,8 +957,9 @@ protected:
 	}
 
 public:
-	HttpServer(Context *context)
-		: ParentClass(context),
+	HttpServer(Context *context, const HttpServerSchema &schema,
+		const Json::Value &initialConfig = Json::Value())
+		: ParentClass(context, schema, initialConfig),
 		  freeRequestCount(0),
 		  requestFreelistLimit(1024),
 		  totalRequestsBegun(0),
@@ -966,7 +998,7 @@ public:
 
 	/***** Request manipulation *****/
 
-		/** Increase request reference count. */
+	/** Increase request reference count. */
 	void refRequest(Request *req, const char *file, unsigned int line) {
 		int oldRefcount = req->refcount.fetch_add(1, boost::memory_order_relaxed);
 		SKC_TRACE_WITH_POS(static_cast<Client *>(req->client), 3, file, line,
@@ -1178,19 +1210,6 @@ public:
 
 	/***** Configuration and introspection *****/
 
-	virtual void configure(const Json::Value &doc) {
-		ParentClass::configure(doc);
-		if (doc.isMember("request_freelist_limit")) {
-			requestFreelistLimit = doc["request_freelist_limit"].asUInt();
-		}
-	}
-
-	virtual Json::Value getConfigAsJson() const {
-		Json::Value doc = ParentClass::getConfigAsJson();
-		doc["request_freelist_limit"] = requestFreelistLimit;
-		return doc;
-	}
-
 	virtual Json::Value inspectStateAsJson() const {
 		Json::Value doc = ParentClass::inspectStateAsJson();
 		doc["free_request_count"] = freeRequestCount;

data/src/cxx_supportlib/ServerKit/Server.h

@@ -56,6 +56,7 @@
 #include <ServerKit/Hooks.h>
 #include <ServerKit/Client.h>
 #include <ServerKit/ClientRef.h>
+#include <ConfigKit/ConfigKit.h>
 #include <Algorithms/MovingAverage.h>
 #include <Utils.h>
 #include <Utils/ScopeGuard.h>
@@ -139,6 +140,30 @@ using namespace oxt;
 	TRACE_POINT_WITH_DATA_FUNCTION(klass::_getClientNameFromTracePoint, client); \
 	SKC_TRACE_FROM_STATIC(server, client, 3, "Event: " eventName)
 
+
+class BaseServerSchema: public ConfigKit::Schema {
+private:
+	void initialize() {
+		using namespace ConfigKit;
+
+		add("accept_burst_count", UINT_TYPE, OPTIONAL, 32);
+		add("start_reading_after_accept", BOOL_TYPE, OPTIONAL, true);
+		add("min_spare_clients", UINT_TYPE, OPTIONAL, 0);
+		add("client_freelist_limit", UINT_TYPE, OPTIONAL, 0);
+	}
+
+public:
+	BaseServerSchema() {
+		initialize();
+		finalize();
+	}
+
+	BaseServerSchema(bool _subclassing) {
+		initialize();
+	}
+};
+
+
 /**
  * A highly optimized generic base class for evented socket servers, implementing basic,
  * low-level connection management.
@@ -203,6 +228,7 @@ public:
 	typedef void (*Callback)(DerivedServer *server);
 
 	/***** Configuration *****/
+	ConfigKit::Store config;
 	unsigned int acceptBurstCount: 7;
 	bool startReadingAfterAccept: 1;
 	unsigned int minSpareClients: 12;
@@ -632,11 +658,20 @@ protected:
 		// Do nothing.
 	}
 
+	virtual void onConfigChange(const ConfigKit::Store *oldConfig) {
+		acceptBurstCount = config["accept_burst_count"].asUInt();
+		startReadingAfterAccept = config["start_reading_after_accept"].asBool();
+		minSpareClients = config["min_spare_clients"].asUInt();
+		clientFreelistLimit = config["client_freelist_limit"].asUInt();
+	}
+
 public:
 	/***** Public methods *****/
 
-	BaseServer(Context *context)
-		: acceptBurstCount(32),
+	BaseServer(Context *context, const BaseServerSchema &schema,
+		const Json::Value &initialConfig = Json::Value())
+		: config(schema),
+		  acceptBurstCount(0),
 		  startReadingAfterAccept(true),
 		  minSpareClients(0),
 		  clientFreelistLimit(0),
@@ -657,6 +692,12 @@ public:
 		  nEndpoints(0),
 		  accept4Available(true)
 	{
+		vector<ConfigKit::Error> errors;
+		if (!config.update(initialConfig, errors)) {
+			throw ArgumentException("Invalid initial configuration: " +
+				toString(errors));
+		}
+
 		STAILQ_INIT(&freeClients);
 		TAILQ_INIT(&activeClients);
 		TAILQ_INIT(&disconnectedClients);
@@ -670,8 +711,6 @@ public:
 		statisticsUpdateWatcher.set<
 			BaseServer<DerivedServer, Client>,
 			&BaseServer<DerivedServer, Client>::onStatisticsUpdateTimeout>(this);
-		statisticsUpdateWatcher.set(5, 5);
-		statisticsUpdateWatcher.start();
 	}
 
 	virtual ~BaseServer() {
@@ -681,6 +720,12 @@ public:
 
 	/***** Initialization, listening and shutdown *****/
 
+	virtual void initialize() {
+		onConfigChange(NULL);
+		statisticsUpdateWatcher.set(5, 5);
+		statisticsUpdateWatcher.start();
+	}
+
 	// Pre-create multiple client objects so that they get allocated
 	// near each other in memory. Hopefully increases CPU cache locality.
 	void createSpareClients() {
@@ -1017,28 +1062,22 @@ public:
 		return P_STATIC_STRING("Server");
 	}
 
-	virtual void configure(const Json::Value &doc) {
-		if (doc.isMember("accept_burst_count")) {
-			acceptBurstCount = doc["accept_burst_count"].asUInt();
-		}
-		if (doc.isMember("start_reading_after_accept")) {
-			startReadingAfterAccept = doc["start_reading_after_accept"].asBool();
-		}
-		if (doc.isMember("min_spare_clients")) {
-			minSpareClients = doc["min_spare_clients"].asUInt();
-		}
-		if (doc.isMember("client_freelist_limit")) {
-			clientFreelistLimit = doc["client_freelist_limit"].asUInt();
+	virtual Json::Value previewConfigUpdate(const Json::Value &updates,
+		vector<ConfigKit::Error> &errors)
+	{
+		return config.previewUpdate(updates, errors);
+	}
+
+	virtual bool configure(const Json::Value &updates, vector<ConfigKit::Error> &errors) {
+		ConfigKit::Store oldConfig = config;
+		if (config.update(updates, errors)) {
+			onConfigChange(&oldConfig);
 		}
+		return errors.empty();
 	}
 
-	virtual Json::Value getConfigAsJson() const {
-		Json::Value doc;
-		doc["accept_burst_count"] = acceptBurstCount;
-		doc["start_reading_after_accept"] = startReadingAfterAccept;
-		doc["min_spare_clients"] = minSpareClients;
-		doc["client_freelist_limit"] = clientFreelistLimit;
-		return doc;
+	virtual Json::Value inspectConfig() const {
+		return config.inspect();
 	}
 
 	virtual Json::Value inspectStateAsJson() const {
@@ -1161,8 +1200,9 @@ public:
 template <typename Client = Client>
 class Server: public BaseServer<Server<Client>, Client> {
 public:
-	Server(Context *context)
-		: BaseServer<Server, Client>(context)
+	Server(Context *context, const BaseServerSchema &schema,
+		const Json::Value &initialConfig = Json::Value())
+		: BaseServer<Server, Client>(context, schema, initialConfig)
 		{ }
 };
 

data/src/cxx_supportlib/oxt/macros.hpp

@@ -54,6 +54,8 @@
 	 */
 	#define OXT_FORCE_INLINE __attribute__((always_inline))
 
+	#define OXT_PURE __attribute__((pure))
+
 	#if __GNUC__ >= 4
 		#define OXT_RESTRICT __restrict__
 	#else
@@ -77,6 +79,7 @@
 	#define OXT_LIKELY(expr) expr
 	#define OXT_UNLIKELY(expr) expr
 	#define OXT_FORCE_INLINE
+	#define OXT_PURE
 	#define restrict
 	#define restrict_ref
 #endif

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

@@ -401,7 +401,6 @@ namespace boost {
             \param Search A substring to be searched for 
             \param Format A substitute string
             \param Loc A locale used for case insensitive comparison
-            \return A reference to the modified input
         */
         template<typename SequenceT, typename Range1T, typename Range2T>
         inline void ireplace_last( 
@@ -643,7 +642,6 @@ namespace boost {
             \param Input An input string
             \param Search A substring to be searched for 
             \param Format A substitute string
-            \return A reference to the modified input
         */
         template<typename SequenceT, typename Range1T, typename Range2T>
         inline void replace_all( 

data/src/cxx_supportlib/vendor-modified/boost/array.hpp

@@ -13,6 +13,7 @@
  * accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
  *
+ *  9 Jan 2013 - (mtc) Added constexpr
  * 14 Apr 2012 - (mtc) Added support for boost::hash
  * 28 Dec 2010 - (mtc) Added cbegin and cend (and crbegin and crend) for C++Ox compatibility.
  * 10 Mar 2010 - (mtc) fill method added, matching resolution of the standard library working group.
@@ -42,12 +43,12 @@
 #include <cstddef>
 #include <stdexcept>
 #include <boost/assert.hpp>
+#include <boost/static_assert.hpp>
 #include <boost/swap.hpp>
 
 // Handles broken standard libraries better than <iterator>
 #include <boost/detail/iterator.hpp>
 #include <boost/throw_exception.hpp>
-#include <boost/functional/hash_fwd.hpp>
 #include <algorithm>
 
 // FIXES for broken compilers
@@ -81,15 +82,9 @@ namespace boost {
         const_iterator cend() const { return elems+N; }
 
         // reverse iterator support
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_MSVC_STD_ITERATOR) && !defined(BOOST_NO_STD_ITERATOR_TRAITS)
+#if !defined(BOOST_MSVC_STD_ITERATOR) && !defined(BOOST_NO_STD_ITERATOR_TRAITS)
         typedef std::reverse_iterator<iterator> reverse_iterator;
         typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-#elif defined(_MSC_VER) && (_MSC_VER == 1300) && defined(BOOST_DINKUMWARE_STDLIB) && (BOOST_DINKUMWARE_STDLIB == 310)
-        // workaround for broken reverse_iterator in VC7
-        typedef std::reverse_iterator<std::_Ptrit<value_type, difference_type, iterator,
-                                      reference, iterator, reference> > reverse_iterator;
-        typedef std::reverse_iterator<std::_Ptrit<value_type, difference_type, const_iterator,
-                                      const_reference, iterator, reference> > const_reverse_iterator;
 #elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC) 
         typedef std::reverse_iterator<iterator, std::random_access_iterator_tag, 
               value_type, reference, iterator, difference_type> reverse_iterator; 
@@ -120,19 +115,17 @@ namespace boost {
         // operator[]
         reference operator[](size_type i) 
         { 
-            BOOST_ASSERT_MSG( i < N, "out of range" );
-            return elems[i];
+            return BOOST_ASSERT_MSG( i < N, "out of range" ), elems[i]; 
         }
         
-        const_reference operator[](size_type i) const 
+        /*BOOST_CONSTEXPR*/ const_reference operator[](size_type i) const 
         {     
-            BOOST_ASSERT_MSG( i < N, "out of range" );
-            return elems[i]; 
+            return BOOST_ASSERT_MSG( i < N, "out of range" ), elems[i]; 
         }
 
         // at() with range check
-        reference at(size_type i) { rangecheck(i); return elems[i]; }
-        const_reference at(size_type i) const { rangecheck(i); return elems[i]; }
+        reference                           at(size_type i)       { return rangecheck(i), elems[i]; }
+        /*BOOST_CONSTEXPR*/ const_reference at(size_type i) const { return rangecheck(i), elems[i]; }
     
         // front() and back()
         reference front() 
@@ -140,7 +133,7 @@ namespace boost {
             return elems[0]; 
         }
         
-        const_reference front() const 
+        BOOST_CONSTEXPR const_reference front() const 
         {
             return elems[0];
         }
@@ -150,15 +143,15 @@ namespace boost {
             return elems[N-1]; 
         }
         
-        const_reference back() const 
+        BOOST_CONSTEXPR const_reference back() const 
         { 
             return elems[N-1]; 
         }
 
         // size is constant
-        static size_type size() { return N; }
-        static bool empty() { return false; }
-        static size_type max_size() { return N; }
+        static BOOST_CONSTEXPR size_type size() { return N; }
+        static BOOST_CONSTEXPR bool empty() { return false; }
+        static BOOST_CONSTEXPR size_type max_size() { return N; }
         enum { static_size = N };
 
         // swap (note: linear complexity)
@@ -189,16 +182,12 @@ namespace boost {
         }
 
         // check range (may be private because it is static)
-        static void rangecheck (size_type i) {
-            if (i >= size()) {
-                std::out_of_range e("array<>: index out of range");
-                boost::throw_exception(e);
-            }
+        static BOOST_CONSTEXPR bool rangecheck (size_type i) {
+            return i > size() ? boost::throw_exception(std::out_of_range ("array<>: index out of range")), true : true;
         }
 
     };
 
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
     template< class T >
     class array< T, 0 > {
 
@@ -222,15 +211,9 @@ namespace boost {
         const_iterator cend() const { return cbegin(); }
 
         // reverse iterator support
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_MSVC_STD_ITERATOR) && !defined(BOOST_NO_STD_ITERATOR_TRAITS)
+#if !defined(BOOST_MSVC_STD_ITERATOR) && !defined(BOOST_NO_STD_ITERATOR_TRAITS)
         typedef std::reverse_iterator<iterator> reverse_iterator;
         typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-#elif defined(_MSC_VER) && (_MSC_VER == 1300) && defined(BOOST_DINKUMWARE_STDLIB) && (BOOST_DINKUMWARE_STDLIB == 310)
-        // workaround for broken reverse_iterator in VC7
-        typedef std::reverse_iterator<std::_Ptrit<value_type, difference_type, iterator,
-                                      reference, iterator, reference> > reverse_iterator;
-        typedef std::reverse_iterator<std::_Ptrit<value_type, difference_type, const_iterator,
-                                      const_reference, iterator, reference> > const_reverse_iterator;
 #elif defined(_RWSTD_NO_CLASS_PARTIAL_SPEC) 
         typedef std::reverse_iterator<iterator, std::random_access_iterator_tag, 
               value_type, reference, iterator, difference_type> reverse_iterator; 
@@ -264,14 +247,14 @@ namespace boost {
             return failed_rangecheck();
         }
 
-        const_reference operator[](size_type /*i*/) const
+        /*BOOST_CONSTEXPR*/ const_reference operator[](size_type /*i*/) const
         {
             return failed_rangecheck();
         }
 
         // at() with range check
         reference at(size_type /*i*/)               {   return failed_rangecheck(); }
-        const_reference at(size_type /*i*/) const   {   return failed_rangecheck(); }
+        /*BOOST_CONSTEXPR*/ const_reference at(size_type /*i*/) const   { return failed_rangecheck(); }
 
         // front() and back()
         reference front()
@@ -279,7 +262,7 @@ namespace boost {
             return failed_rangecheck();
         }
 
-        const_reference front() const
+        BOOST_CONSTEXPR const_reference front() const
         {
             return failed_rangecheck();
         }
@@ -289,15 +272,15 @@ namespace boost {
             return failed_rangecheck();
         }
 
-        const_reference back() const
+        BOOST_CONSTEXPR const_reference back() const
         {
             return failed_rangecheck();
         }
 
         // size is constant
-        static size_type size() { return 0; }
-        static bool empty() { return true; }
-        static size_type max_size() { return 0; }
+        static BOOST_CONSTEXPR size_type size() { return 0; }
+        static BOOST_CONSTEXPR bool empty() { return true; }
+        static BOOST_CONSTEXPR size_type max_size() { return 0; }
         enum { static_size = 0 };
 
         void swap (array<T,0>& /*y*/) {
@@ -335,7 +318,6 @@ namespace boost {
 #endif
             }
     };
-#endif
 
     // comparisons
     template<class T, std::size_t N>
@@ -391,7 +373,7 @@ namespace boost {
 
    // Specific for boost::array: simply returns its elems data member.
    template <typename T, std::size_t N>
-   typename const detail::c_array<T,N>::type& get_c_array(const boost::array<T,N>& arg)
+   typename detail::c_array<T,N>::type const& get_c_array(const boost::array<T,N>& arg)
    {
        return arg.elems;
    }
@@ -429,6 +411,7 @@ namespace boost {
     }
 #endif
 
+    template <class It> std::size_t hash_range(It, It);
 
     template<class T, std::size_t N>
     std::size_t hash_value(const array<T,N>& arr)
@@ -436,8 +419,36 @@ namespace boost {
         return boost::hash_range(arr.begin(), arr.end());
     }
 
+   template <size_t Idx, typename T, size_t N>
+   T &get(boost::array<T,N> &arr) BOOST_NOEXCEPT {
+       BOOST_STATIC_ASSERT_MSG ( Idx < N, "boost::get<>(boost::array &) index out of range" );
+       return arr[Idx];
+       }
+    
+   template <size_t Idx, typename T, size_t N>
+   const T &get(const boost::array<T,N> &arr) BOOST_NOEXCEPT {
+       BOOST_STATIC_ASSERT_MSG ( Idx < N, "boost::get<>(const boost::array &) index out of range" );
+       return arr[Idx];
+       }
+
 } /* namespace boost */
 
+#ifndef BOOST_NO_CXX11_HDR_ARRAY
+//  If we don't have std::array, I'm assuming that we don't have std::get
+namespace std {
+   template <size_t Idx, typename T, size_t N>
+   T &get(boost::array<T,N> &arr) BOOST_NOEXCEPT {
+       BOOST_STATIC_ASSERT_MSG ( Idx < N, "std::get<>(boost::array &) index out of range" );
+       return arr[Idx];
+       }
+    
+   template <size_t Idx, typename T, size_t N>
+   const T &get(const boost::array<T,N> &arr) BOOST_NOEXCEPT {
+       BOOST_STATIC_ASSERT_MSG ( Idx < N, "std::get<>(const boost::array &) index out of range" );
+       return arr[Idx];
+       }
+}
+#endif
 
 #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)  
 # pragma warning(pop)