Squashed 'src/beast/' changes from 43e6d34..0e7bac9

0e7bac9 Fix include path e5bb90f Fix constness of Proxy ac0142a Use template cast ef6e381 Add missing Url.h include 206e65c Fix constness of operator[] 695cc38 Use template instantiation for friend declaration 7b1e03a Add BaseFromMember 49bc04f Make List<>::Node not uncopyable d5954ff Add Journal to UnitTest 58da106 Temporarily disable ServiceQueue dtor precondition asserts fe58c1a Add missing #include 2c02580 Add PropertyStream for server state introspection 24c2315 Add ScopedWrapperContext a3845f5 Add RelativeTime::value_type typedef 7442932 Fix missing PropertyStream members ed5a98f More PropertyStream output for PeerFinder fcfa10d Add PropertyStream 3cf0729 Tidy up AbstractHandler usage in HTTPClient 55171f4 Remove obsolete source files 1311ca3 Increase arity of SharedFunction 67d807d Add IPEndpoint::key_equal ebf395e Add ErrorCode and boost library 2c3ead3 Add ServiceQueue::wrap 6c7f5d0 Move many Thread related classes 93e9d86 Measure CPU utilization in ServiceQueue ca47d72 Move ServiceQueue, ThreadLocalValue, SpinLock c864e4d Move WaitableEvent ff305e6 Add CPUMeter and ScopedTimeInterval 01fd05c Add RecursiveMutex, UnlockGuard, TryLockGuard 5831a53 Remove Journal from most Stoppable overrides b60a7f3 Add Request and Response HTTP parsers 44445ff Refactor net buffers classes ac37c38 Beast class refactor 8b7056b Fix eof on HTTP client get 228b664 Remove obsolete beast container classes 1dfd655 Use RelativeTime from startup in DeadlineTimer ae22d5d Add more methods to RelativeTime c67929e Remove unhandled exception catcher 2472a90 Add 64 bit output for MurmurHash f3d97c7 Add RelativeTime::fromStartup b0b8660 IPEndpoint better parsing ae551cd Add alternate form string parsing to IPEndpoint d0a0dbf Don't break on Throw 0e46762 Add hasher functors for IPEndpoint a1ec423 Add Thread::stopThreadAsync 4f7dca3 Add compiler, stdlib, and platform skeleton to beast/config 4394594 Tidy up some use of Error for throw e5e0f52 Journal console output improvements f07515e Add Stoppable prepare and start interfaces d37dd46 Move RelativeTime to chrono, add ostream support 3f6e7aa Add console feature to Journal ad0064a Journal option to write to Output window (MSVC) 0b7574b Add compilation test script cc05ce1 Add ServiceQueue e132aab Use boost for functional when the config is set 026b926 Fix is_continuation for boost version c807a4e Fix invoked_type type reference 2ff781b Remove LockFreeStack::size 3acb474 Add SharedData::ConstAccess 7e4c834 Add LockFreeStack::empty 9c61a6d Added AbstractHandler, WrapHandler. HTTPClient Fixes. 94e40dc Fix unittest, by removing recursive call. 38bf408 Fix nonstandard C++ extension in getNullSink 1ef044d Build fixes d5d3746 Fix missing <cmath> include for Gentoo 5f231d3 Update copyright notice and licenses 7b89bf6 Add FixedArray, IntrusiveArray, Crypto 5c5de57 Reorganize beast modules and files 9e18bb3 Merge commit '43deaaa5cf0d0178a4a6c3cb69c02a2a9a43ec7d' as 'src/beast/beast/http/impl/http-parser' 57703ac Fix BeforeBoost.h include fbc247b Add Stoppable to beast 56496d8 IPEndpoint comparisons 9d9c822 Migrate some headers and general tidying 1a3cddc Add SharedArg and AsyncObject 373ca9c Add HTTPRequest and improvements to HTTPMessage parsing 9534516 Add some thread classes and fix SharedData with a simple mutex adapter 755ab36 Make CallQueue unit test runManual c0ca037 Remove Beast version printing on startup 7efb6a3 Reorganize some MPL and Utility classes and files 69c26a1 Fix missing BeastConfig.h include in Net.cpp 40aa552 Disable Beast version printing in Ripple BeastConfig.h 7b1352d Add InterruptibleThread unit test 68cf759 ThreadWithCallQueue unit test adjustment 6501dea IPEndpoint parsing and tidying 72fc42b Move and add some template metaprogramming classes 2a164f0 Change filname capitalization (end) 6a14f25 Change filename capitalization 92fd417 Move integer types to beast/CStdInt.h ebbd9ff Move TargetPlatform.h to beast/Config.h 874b524 Add IPEndpoint 14b34fc Tidy up some zlib macro undefines 34fffca Rename beast sources for consistency 4e59ab2 Add CallQueue unit test 327d7a6 Fixes for consolidated beast unity includes d5ece4e Remove unused and broken classes 39f13be Remove unused ConcurrentObject 37624a7 Add ThreadWithCallQueue unit test e82ec68 Remove obsolete beast_Function 90551a6 Temporarily leave sqlite3 in whatever threading mode it was already in. 43ebbb1 Fix SharedSingleton to use memoryBarrier f343941 Tidy up SharedSingleton doc comments 001997e Fix leak on exit from Singleton dependency cycle 83b9d22 Rename to DeadlineTimer::cancel() 77874ee Use new instead of ::new for placement 2a04dcc Journal improvements 50965ca SharedFunction improvements 277e32b Add LockFreeStack iterators d94e4c2 Fix undefined behavior in UnsignedIntegerCalc (again) 2dc25ce Fix DeadlineTimer, callback while holding lock 207ffde Fix undefined behavior in UnsignedIntegerCalc 1ad8ff9 Fix UnsignedInteger::isZero 1dd2836 Add support for multiprecision integer arithmetic and binary data encoding a45fc47 Update .gitignore 962a95d Tidy up UnsignedInteger ca695fa Add Time::isNull() e96ce99 Better random number facilities in UnitTest 550b8e5 Fine tune UnsignedInteger declaration 8e7e3b7 Allow negative relative expirations in DeadlineTimer f3dc7ce Add generic Journal class for logging bfdda32 Make ChildProcess UnitTest manual since it malfunctions 02acf7d General refactoring of beast framework classes 84ef06e Fix ExitHook to derive from AtExitHook f0acc9c Reduce the max threads in the Workers unit test 55447b0 New SharedSingleton, resolves destruction of objects with static storage duration. 41eb8a1 Remove deprecated SharedPtr::getObject 9eda4bc Make SharedObject members const, the counter mutable 6eda777 Remove deprecated createOnDemandOnce SingletonLifetime option 8c522aa Fix off by one in pending i/o count on HTTPClient 057344e Add HTTPMessage::toString and family ee728e3 Add UniformResourceLocator::empty ae324fb Move ./modules to ./src git-subtree-dir: src/beast git-subtree-split: 0e7bac945f
2025-12-06 17:27:52 +00:00 · 2013-10-19 15:54:21 -07:00
parent 86ba8ffca6
commit 2ad98a025e
480 changed files with 19599 additions and 18109 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ contents.xcworkspacedata
 profile
 Builds/VisualStudio2012/Debug
 Builds/VisualStudio2012/Release
+
+modules/beast_cryptopp
--- a/Builds/VisualStudio2012/Beast.props
+++ b/Builds/VisualStudio2012/Beast.props
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros">
+    <RepoDir>..\..</RepoDir>
+  </PropertyGroup>
  <PropertyGroup />
  <ItemDefinitionGroup>
    <ClCompile>
      <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BEAST_COMPILING_STATIC_LIBARARY=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoDir)\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BuildMacro Include="RepoDir">
+      <Value>$(RepoDir)</Value>
+    </BuildMacro>
+  </ItemGroup>
 </Project>
--- a/Builds/VisualStudio2012/beast.vcxproj
+++ b/Builds/VisualStudio2012/beast.vcxproj
--- a/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Builds/VisualStudio2012/beast.vcxproj.filters
--- a/LICENSE_1_0.txt
+++ b/LICENSE_1_0.txt
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,10 +2,6 @@
 BEAST TODO
 --------------------------------------------------------------------------------

- Use new file naming convention
-
- Rename ReadWriteMutex to SharedMutex
-
 - Use SemanticVersion for beast version numbers to replace BEAST_VERSION

 - add support for a __PRETTY_FUNCTION__ equivalent for all environments
@@ -14,13 +10,6 @@ BEAST TODO

 - Import secp256k1 from sipa

- HashMap work:
-  - Add unit test
-  - Return size_t from hash function, take out upperLimit, move mod % to caller
-  - Make hash function a functor using operator()
-  - Implement HardenedHashFunctions
-  - Fix problem with assigning to the result of operator[] maybe use a proxy?
-
 - Set sqlite thread safety model to '2' in beast_sqlite

 - Document and rename all the sqdb files and classes
@@ -57,8 +46,6 @@ BEAST TODO

 - Rename malloc/calloc JUCE members that conflict with the debug CRT from MSVC

- Make beast::HashMap support assignment via operator[]
-
 - Reformat every Doxygen comment
 - Fix Doxygen metatags
 - update Beast Doxyfile
--- a/modules/beast_core/maths/beast_MathsFunctions.h
+++ b/modules/beast_core/maths/beast_MathsFunctions.h
@@ -21,104 +21,48 @@
 */
 //==============================================================================

-#ifndef BEAST_MATHSFUNCTIONS_H_INCLUDED
-#define BEAST_MATHSFUNCTIONS_H_INCLUDED
+#ifndef BEAST_ARITHMETIC_H_INCLUDED
+#define BEAST_ARITHMETIC_H_INCLUDED

-//==============================================================================
-/*
-    This file sets up some handy mathematical typdefs and functions.
-*/
+#include "Config.h"
+#include "CStdInt.h"

-//==============================================================================
-// Definitions for the int8, int16, int32, int64 and pointer_sized_int types.
+#include <cmath>
+#include <algorithm>

-/** A platform-independent 8-bit signed integer type. */
-typedef signed char                 int8;
-/** A platform-independent 8-bit unsigned integer type. */
-typedef unsigned char               uint8;
-/** A platform-independent 16-bit signed integer type. */
-typedef signed short                int16;
-/** A platform-independent 16-bit unsigned integer type. */
-typedef unsigned short              uint16;
-/** A platform-independent 32-bit signed integer type. */
-typedef signed int                  int32;
-/** A platform-independent 32-bit unsigned integer type. */
-typedef unsigned int                uint32;
+namespace beast {

-#if BEAST_MSVC
-  /** A platform-independent 64-bit integer type. */
-  typedef __int64                   int64;
-  /** A platform-independent 64-bit unsigned integer type. */
-  typedef unsigned __int64          uint64;
-  /** A platform-independent macro for writing 64-bit literals, needed because
-      different compilers have different syntaxes for this.
-
-      E.g. writing literal64bit (0x1000000000) will translate to 0x1000000000LL for
-      GCC, or 0x1000000000 for MSVC.
-  */
-  #define literal64bit(longLiteral)     ((__int64) longLiteral)
-#else
-  /** A platform-independent 64-bit integer type. */
-  typedef long long                 int64;
-  /** A platform-independent 64-bit unsigned integer type. */
-  typedef unsigned long long        uint64;
-  /** A platform-independent macro for writing 64-bit literals, needed because
-      different compilers have different syntaxes for this.
-
-      E.g. writing literal64bit (0x1000000000) will translate to 0x1000000000LL for
-      GCC, or 0x1000000000 for MSVC.
-  */
-  #define literal64bit(longLiteral)     (longLiteral##LL)
-#endif
-
-
-#if BEAST_64BIT
-  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef int64                     pointer_sized_int;
-  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef uint64                    pointer_sized_uint;
-#elif BEAST_MSVC
-  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef _W64 int                  pointer_sized_int;
-  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef _W64 unsigned int         pointer_sized_uint;
-#else
-  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef int                       pointer_sized_int;
-  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef unsigned int              pointer_sized_uint;
-#endif
-
-#if BEAST_MSVC
-  typedef pointer_sized_int ssize_t;
-#endif
-
-//==============================================================================
 // Some indispensible min/max functions

 /** Returns the larger of two values. */
 template <typename Type>
-inline Type bmax (const Type a, const Type b)                                               { return (a < b) ? b : a; }
+inline Type bmax (const Type a, const Type b)
+    { return (a < b) ? b : a; }

 /** Returns the larger of three values. */
 template <typename Type>
-inline Type bmax (const Type a, const Type b, const Type c)                                 { return (a < b) ? ((b < c) ? c : b) : ((a < c) ? c : a); }
+inline Type bmax (const Type a, const Type b, const Type c)
+    { return (a < b) ? ((b < c) ? c : b) : ((a < c) ? c : a); }

 /** Returns the larger of four values. */
 template <typename Type>
-inline Type bmax (const Type a, const Type b, const Type c, const Type d)                   { return bmax (a, bmax (b, c, d)); }
+inline Type bmax (const Type a, const Type b, const Type c, const Type d)
+    { return bmax (a, bmax (b, c, d)); }

 /** Returns the smaller of two values. */
 template <typename Type>
-inline Type bmin (const Type a, const Type b)                                               { return (b < a) ? b : a; }
+inline Type bmin (const Type a, const Type b)
+    { return (b < a) ? b : a; }

 /** Returns the smaller of three values. */
 template <typename Type>
-inline Type bmin (const Type a, const Type b, const Type c)                                 { return (b < a) ? ((c < b) ? c : b) : ((c < a) ? c : a); }
+inline Type bmin (const Type a, const Type b, const Type c)
+    { return (b < a) ? ((c < b) ? c : b) : ((c < a) ? c : a); }

 /** Returns the smaller of four values. */
 template <typename Type>
-inline Type bmin (const Type a, const Type b, const Type c, const Type d)                   { return bmin (a, bmin (b, c, d)); }
+inline Type bmin (const Type a, const Type b, const Type c, const Type d)
+    { return bmin (a, bmin (b, c, d)); }

 /** Scans an array of values, returning the minimum value that it contains. */
 template <typename Type>
@@ -183,7 +127,6 @@ void findMinAndMax (const Type* values, int numValues, Type& lowest, Type& highe
    }
 }

-
 //==============================================================================
 /** Constrains a value to keep it within a given range.

@@ -268,7 +211,7 @@ inline void swapVariables (Type& variable1, Type& variable2)
    @endcode
 */
 template <typename Type, int N>
-inline int numElementsInArray (Type (&array)[N])
+int numElementsInArray (Type (&array)[N])
 {
    (void) array; // (required to avoid a spurious warning in MS compilers)
    (void) sizeof (0[array]); // This line should cause an error if you pass an object with a user-defined subscript operator
@@ -509,7 +452,7 @@ namespace TypeHelpers
    template <>              struct SmallestFloatType <double>    { typedef double type; };
 }

+}

-//==============================================================================
+#endif

-#endif   // BEAST_MATHSFUNCTIONS_H_INCLUDED
--- a/modules/beast_core/memory/beast_Atomic.h
+++ b/modules/beast_core/memory/beast_Atomic.h
@@ -24,6 +24,11 @@
 #ifndef BEAST_ATOMIC_H_INCLUDED
 #define BEAST_ATOMIC_H_INCLUDED

+#include "Config.h"
+#include "CStdInt.h"
+#include "StaticAssert.h"
+
+namespace beast {

 //==============================================================================
 /**
@@ -65,13 +70,16 @@ public:
    Type get() const noexcept;

    /** Copies another value onto this one (atomically). */
-    inline Atomic& operator= (const Atomic& other) noexcept         { exchange (other.get()); return *this; }
+     Atomic& operator= (const Atomic& other) noexcept
+      { exchange (other.get()); return *this; }

    /** Copies another value onto this one (atomically). */
-    inline Atomic& operator= (const Type newValue) noexcept         { exchange (newValue); return *this; }
+     Atomic& operator= (const Type newValue) noexcept
+      { exchange (newValue); return *this; }

    /** Atomically sets the current value. */
-    void set (Type newValue) noexcept                               { exchange (newValue); }
+    void set (Type newValue) noexcept
+      { exchange (newValue); }

    /** Atomically sets the current value, returning the value that was replaced. */
    Type exchange (Type value) noexcept;
@@ -131,9 +139,6 @@ public:
    */
    Type compareAndSetValue (Type newValue, Type valueToCompare) noexcept;

-    /** Implements a memory read/write barrier. */
-    static void memoryBarrier() noexcept;
-
    //==============================================================================
   #if BEAST_64BIT
    BEAST_ALIGN (8)
@@ -373,8 +378,7 @@ inline Type Atomic<Type>::compareAndSetValue (const Type newValue, const Type va
  #endif
 }

-template <typename Type>
-inline void Atomic<Type>::memoryBarrier() noexcept
+inline void memoryBarrier() noexcept
 {
  #if BEAST_ATOMICS_MAC
    OSMemoryBarrier();
@@ -389,4 +393,6 @@ inline void Atomic<Type>::memoryBarrier() noexcept
  #pragma warning (pop)
 #endif

-#endif   // BEAST_ATOMIC_H_INCLUDED
+}
+
+#endif
--- a/beast/Boost.h
+++ b/beast/Boost.h
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_BOOST_H_INCLUDED
+#define BEAST_BOOST_H_INCLUDED
+
+// These classes require boost in order to be used.
+
+#include "boost/ErrorCode.h"
+
+#endif
--- a/modules/beast_core/memory/beast_ByteOrder.h
+++ b/modules/beast_core/memory/beast_ByteOrder.h
@@ -24,11 +24,17 @@
 #ifndef BEAST_BYTEORDER_H_INCLUDED
 #define BEAST_BYTEORDER_H_INCLUDED

+#include "Config.h"
+#include "CStdInt.h"
+#include "Uncopyable.h"
+
+namespace beast {
+
 //==============================================================================
 /** Contains static methods for converting the byte order between different
    endiannesses.
 */
-class BEAST_API ByteOrder : public Uncopyable
+class ByteOrder : public Uncopyable
 {
 public:
    //==============================================================================
@@ -182,5 +188,109 @@ inline int  ByteOrder::bigEndian24Bit (const char* const bytes)
 inline void ByteOrder::littleEndian24BitToChars (const int value, char* const destBytes)    { destBytes[0] = (char)(value & 0xff); destBytes[1] = (char)((value >> 8) & 0xff); destBytes[2] = (char)((value >> 16) & 0xff); }
 inline void ByteOrder::bigEndian24BitToChars (const int value, char* const destBytes)       { destBytes[0] = (char)((value >> 16) & 0xff); destBytes[1] = (char)((value >> 8) & 0xff); destBytes[2] = (char)(value & 0xff); }

-#endif
+namespace detail
+{

+/** Specialized helper class template for swapping bytes.
+    
+    Normally you won't use this directly, use the helper function
+    byteSwap instead. You can specialize this class for your
+    own user defined types, as was done for uint24.
+
+    @see swapBytes, uint24
+*/
+template <typename IntegralType>
+struct SwapBytes
+{
+    inline IntegralType operator() (IntegralType value) const noexcept 
+    {
+        return ByteOrder::swap (value);
+    }
+};
+
+// Specializations for signed integers
+
+template <>
+struct SwapBytes <int16>
+{
+    inline int16 operator() (int16 value) const noexcept 
+    {
+        return static_cast <int16> (ByteOrder::swap (static_cast <uint16> (value)));
+    }
+};
+
+template <>
+struct SwapBytes <int32>
+{
+    inline int32 operator() (int32 value) const noexcept 
+    {
+        return static_cast <int32> (ByteOrder::swap (static_cast <uint32> (value)));
+    }
+};
+
+template <>
+struct SwapBytes <int64>
+{
+    inline int64 operator() (int64 value) const noexcept 
+    {
+        return static_cast <int64> (ByteOrder::swap (static_cast <uint64> (value)));
+    }
+};
+
+}
+
+//------------------------------------------------------------------------------
+
+/** Returns a type with the bytes swapped.
+    Little endian becomes big endian and vice versa. The underlying
+    type must be an integral type or behave like one.
+*/
+template <class IntegralType>
+inline IntegralType swapBytes (IntegralType value) noexcept
+{
+    return detail::SwapBytes <IntegralType> () (value);
+}
+
+/** Returns the machine byte-order value to little-endian byte order. */
+template <typename IntegralType>
+inline IntegralType toLittleEndian (IntegralType value) noexcept
+{
+#if BEAST_LITTLE_ENDIAN
+    return value;
+#else
+    return swapBytes (value);
+#endif
+}
+
+/** Returns the machine byte-order value to big-endian byte order. */
+template <typename IntegralType>
+inline IntegralType toBigEndian (IntegralType value) noexcept
+{
+#if BEAST_LITTLE_ENDIAN
+    return swapBytes (value);
+#else
+    return value;
+#endif
+}
+
+/** Returns the machine byte-order value to network byte order. */
+template <typename IntegralType>
+inline IntegralType toNetworkByteOrder (IntegralType value) noexcept
+{
+    return toBigEndian (value);
+}
+
+/** Converts from network byte order to machine byte order. */
+template <typename IntegralType>
+inline IntegralType fromNetworkByteOrder (IntegralType value) noexcept
+{
+#if BEAST_LITTLE_ENDIAN
+    return swapBytes (value);
+#else
+    return value;
+#endif
+}
+
+}
+
+#endif
--- a/beast/CStdInt.h
+++ b/beast/CStdInt.h
@@ -0,0 +1,88 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CSTDINT_H_INCLUDED
+#define BEAST_CSTDINT_H_INCLUDED
+
+#include "Config.h"
+
+namespace beast {
+
+typedef signed char                 int8;
+typedef signed short                int16;
+typedef signed int                  int32;
+typedef unsigned char               uint8;
+typedef unsigned short              uint16;
+typedef unsigned int                uint32;
+
+#if BEAST_MSVC
+  typedef __int64                   int64;
+  typedef unsigned __int64          uint64;
+
+  /** A platform-independent macro for writing 64-bit literals, needed because
+      different compilers have different syntaxes for this.
+
+      E.g. writing literal64bit (0x1000000000) will translate to 0x1000000000LL for
+      GCC, or 0x1000000000 for MSVC.
+  */
+  #define literal64bit(longLiteral)     ((__int64) longLiteral)
+
+#else
+  /** A platform-independent 64-bit integer type. */
+  typedef long long                 int64;
+  /** A platform-independent 64-bit unsigned integer type. */
+  typedef unsigned long long        uint64;
+  /** A platform-independent macro for writing 64-bit literals, needed because
+      different compilers have different syntaxes for this.
+
+      E.g. writing literal64bit (0x1000000000) will translate to 0x1000000000LL for
+      GCC, or 0x1000000000 for MSVC.
+  */
+  #define literal64bit(longLiteral)     (longLiteral##LL)
+
+#endif
+
+#if BEAST_64BIT
+  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef int64                     pointer_sized_int;
+  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef uint64                    pointer_sized_uint;
+#elif BEAST_MSVC
+  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef _W64 int                  pointer_sized_int;
+  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef _W64 unsigned int         pointer_sized_uint;
+#else
+  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef int                       pointer_sized_int;
+  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef unsigned int              pointer_sized_uint;
+#endif
+
+#if BEAST_MSVC
+  typedef pointer_sized_int ssize_t;
+#endif
+
+}
+
+#endif
--- a/beast/Chrono.h
+++ b/beast/Chrono.h
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CHRONO_H_INCLUDED
+#define BEAST_CHRONO_H_INCLUDED
+
+#include "chrono/CPUMeter.h"
+#include "chrono/RelativeTime.h"
+#include "chrono/ScopedTimeInterval.h"
+
+#endif
--- a/beast/Config.h
+++ b/beast/Config.h
@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONFIG_H_INCLUDED
+#define BEAST_CONFIG_H_INCLUDED
+
+// VFALCO NOTE this is analogous to <boost/config.hpp>
+
+#if !defined(BEAST_COMPILER_CONFIG) && !defined(BEAST_NO_COMPILER_CONFIG) && !defined(BEAST_NO_CONFIG)
+#include "config/SelectCompilerConfig.h"
+#endif
+#ifdef   BEAST_COMPILER_CONFIG
+#include BEAST_COMPILER_CONFIG
+#endif
+
+#if !defined(BEAST_STDLIB_CONFIG) && !defined(BEAST_NO_STDLIB_CONFIG) && !defined(BEAST_NO_CONFIG) && defined(__cplusplus)
+#include "config/SelectStdlibConfig.h"
+#endif
+#ifdef   BEAST_STDLIB_CONFIG
+#include BEAST_STDLIB_CONFIG
+#endif
+
+#if !defined(BEAST_PLATFORM_CONFIG) && !defined(BEAST_NO_PLATFORM_CONFIG) && !defined(BEAST_NO_CONFIG)
+#include "config/SelectCompilerConfig.h"
+#endif
+#ifdef   BEAST_PLATFORM_CONFIG
+#include BEAST_PLATFORM_CONFIG
+#endif
+
+// Legacy
+#include "Version.h"
+#include "config/PlatformConfig.h"
+#include "config/CompilerConfig.h"
+#include "config/StandardConfig.h"
+#include "config/ConfigCheck.h"
+
+// Suffix
+#include "config/Suffix.h"
+    
+#endif
--- a/beast/Crypto.h
+++ b/beast/Crypto.h
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CRYPTO_H_INCLUDED
+#define BEAST_CRYPTO_H_INCLUDED
+
+#include "crypto/Sha256.h"
+
+#endif
+
--- a/beast/FixedArray.h
+++ b/beast/FixedArray.h
@@ -0,0 +1,165 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_FIXEDARRAY_H_INCLUDED
+#define BEAST_FIXEDARRAY_H_INCLUDED
+
+#include "Config.h"
+
+#include <cstddef>
+#include <iterator>
+#include <stdexcept>
+
+namespace beast {
+
+// Ideas from Boost
+
+/** An array whose size is determined at compile-time.
+    The interface tries to follow std::vector as closely as possible within
+    the limitations of having a fixed size.
+*/
+template <class T, std::size_t N>
+class FixedArray
+{
+public:
+    T values [N];
+
+    typedef T                value_type;
+    typedef T*               iterator;
+    typedef T const*         const_iterator;
+    typedef T&               reference;
+    typedef T const&         const_reference;
+    typedef std::size_t      size_type;
+    typedef std::ptrdiff_t   difference_type;
+
+    // iterators
+    iterator        begin()       { return values; }
+    const_iterator  begin() const { return values; }
+    const_iterator cbegin() const { return values; }
+    iterator        end()       { return values+N; }
+    const_iterator  end() const { return values+N; }
+    const_iterator cend() const { return values+N; }
+
+    typedef std::reverse_iterator <iterator> reverse_iterator;
+    typedef std::reverse_iterator <const_iterator> const_reverse_iterator;
+
+    reverse_iterator rbegin() { return reverse_iterator(end()); }
+    const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const { return const_reverse_iterator(end()); }
+    reverse_iterator rend() { return reverse_iterator(begin()); }
+    const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend() const { return const_reverse_iterator(begin()); }
+
+    reference operator[](size_type i)
+    {
+        bassert (i < N);
+        return values[i];
+    }
+
+    const_reference operator[](size_type i) const
+    {
+        bassert (i < N);
+        return values[i];
+    }
+
+    reference at(size_type i) { rangecheck(i); return values[i]; }
+    const_reference at(size_type i) const { rangecheck(i); return values[i]; }
+
+    reference front() { return values[0]; }
+    reference back()  { return values[N-1]; }
+    const_reference front () const { return values[0]; }
+    const_reference back()   const { return values[N-1]; }
+
+    static size_type size() { return N; }
+    static bool empty() { return false; }
+    static size_type max_size() { return N; }
+    
+    enum { static_size = N };
+
+    T const* data() const { return values; }
+    T* data() { return values; }
+    T* c_array() { return values; }
+
+    template <typename T2>
+    FixedArray<T,N>& operator= (FixedArray<T2,N> const& rhs)
+    {
+        std::copy (rhs.begin(), rhs.end(), begin());
+        return *this;
+    }
+
+    void assign (T const& value) { fill (value); }
+
+    void fill (T const& value)
+    {
+        std::fill_n (begin(), size(), value);
+    }
+
+    void clear ()
+    {
+        fill (T ());
+    }
+
+    static void rangecheck (size_type i)
+    {
+        if (i >= size())
+            throw std::out_of_range ("FixedArray<>: index out of range");
+    }
+};
+
+//------------------------------------------------------------------------------
+
+template <class T, std::size_t N>
+bool operator== (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return std::equal (lhs.begin(), lhs.end(), rhs.begin());
+}
+
+template <class T, std::size_t N>
+bool operator!= (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return !(lhs==rhs);
+}
+
+template <class T, std::size_t N>
+bool operator< (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return std::lexicographical_compare (lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+}
+
+template <class T, std::size_t N>
+bool operator> (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return rhs<lhs;
+}
+
+template <class T, std::size_t N>
+bool operator<= (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return !(rhs<lhs);
+}
+
+template <class T, std::size_t N>
+bool operator>= (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return !(lhs<rhs);
+}
+
+}
+
+#endif
--- a/beast/HTTP.h
+++ b/beast/HTTP.h
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_HTTP_H_INCLUDED
+#define BEAST_HTTP_H_INCLUDED
+
+#include "http/URL.h"
+#include "http/ParsedURL.h"
+
+#endif
--- a/modules/beast_core/memory/beast_HeapBlock.h
+++ b/modules/beast_core/memory/beast_HeapBlock.h
@@ -24,6 +24,46 @@
 #ifndef BEAST_HEAPBLOCK_H_INCLUDED
 #define BEAST_HEAPBLOCK_H_INCLUDED

+#include <cstddef>
+#include <cstdlib>
+#include <stdexcept>
+
+#include "Memory.h"
+#include "Uncopyable.h"
+
+// If the MSVC debug heap headers were included, disable
+// the macros during the juce include since they conflict.
+#ifdef _CRTDBG_MAP_ALLOC
+#pragma push_macro("calloc")
+#pragma push_macro("free")
+#pragma push_macro("malloc")
+#pragma push_macro("realloc")
+#pragma push_macro("_recalloc")
+#pragma push_macro("_aligned_free")
+#pragma push_macro("_aligned_malloc")
+#pragma push_macro("_aligned_offset_malloc")
+#pragma push_macro("_aligned_realloc")
+#pragma push_macro("_aligned_recalloc")
+#pragma push_macro("_aligned_offset_realloc")
+#pragma push_macro("_aligned_offset_recalloc")
+#pragma push_macro("_aligned_msize")
+#undef calloc
+#undef free
+#undef malloc
+#undef realloc
+#undef _recalloc
+#undef _aligned_free
+#undef _aligned_malloc
+#undef _aligned_offset_malloc
+#undef _aligned_realloc
+#undef _aligned_recalloc
+#undef _aligned_offset_realloc
+#undef _aligned_offset_recalloc
+#undef _aligned_msize
+#endif
+
+namespace beast {
+
 #ifndef DOXYGEN
 namespace HeapBlockHelper
 {
@@ -305,5 +345,23 @@ private:
   #endif
 };

+}
+
+#ifdef _CRTDBG_MAP_ALLOC
+#pragma pop_macro("_aligned_msize")
+#pragma pop_macro("_aligned_offset_recalloc")
+#pragma pop_macro("_aligned_offset_realloc")
+#pragma pop_macro("_aligned_recalloc")
+#pragma pop_macro("_aligned_realloc")
+#pragma pop_macro("_aligned_offset_malloc")
+#pragma pop_macro("_aligned_malloc")
+#pragma pop_macro("_aligned_free")
+#pragma pop_macro("_recalloc")
+#pragma pop_macro("realloc")
+#pragma pop_macro("malloc")
+#pragma pop_macro("free")
+#pragma pop_macro("calloc")
+#endif
+
+#endif

-#endif   // BEAST_HEAPBLOCK_H_INCLUDED
--- a/beast/Intrusive.h
+++ b/beast/Intrusive.h
@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_INTRUSIVE_H_INCLUDED
+#define BEAST_INTRUSIVE_H_INCLUDED
+
+#include "intrusive/ForwardList.h"
+#include "intrusive/IntrusiveArray.h"
+#include "intrusive/List.h"
+#include "intrusive/LockFreeStack.h"
+
+#endif
--- a/beast/MPL.h
+++ b/beast/MPL.h
@@ -21,7 +21,9 @@
 #define BEAST_MPL_H_INCLUDED

 #include "mpl/AddConst.h"
+#include "mpl/CopyConst.h"
 #include "mpl/IfCond.h"
+#include "mpl/IsCallPossible.h"
 #include "mpl/PointerToOther.h"
 #include "mpl/RemoveConst.h"
 #include "mpl/RemoveConstVolatile.h"
--- a/modules/beast_core/memory/beast_Memory.h
+++ b/modules/beast_core/memory/beast_Memory.h
@@ -24,13 +24,21 @@
 #ifndef BEAST_MEMORY_H_INCLUDED
 #define BEAST_MEMORY_H_INCLUDED

+#include <cstring>
+    
+#include "Config.h"
+
+namespace beast {
+
 //==============================================================================
 /** Fills a block of memory with zeros. */
-inline void zeromem (void* memory, size_t numBytes) noexcept        { memset (memory, 0, numBytes); }
+inline void zeromem (void* memory, size_t numBytes) noexcept
+    { memset (memory, 0, numBytes); }

 /** Overwrites a structure or object with zeros. */
 template <typename Type>
-inline void zerostruct (Type& structure) noexcept                   { memset (&structure, 0, sizeof (structure)); }
+void zerostruct (Type& structure) noexcept
+    { memset (&structure, 0, sizeof (structure)); }

 /** Delete an object pointer, and sets the pointer to null.

@@ -38,26 +46,30 @@ inline void zerostruct (Type& structure) noexcept                   { memset (&s
    or other automatic lifetime-management system rather than resorting to deleting raw pointers!
 */
 template <typename Type>
-inline void deleteAndZero (Type& pointer)                           { delete pointer; pointer = nullptr; }
+void deleteAndZero (Type& pointer)
+    { delete pointer; pointer = nullptr; }

 /** A handy function which adds a number of bytes to any type of pointer and returns the result.
    This can be useful to avoid casting pointers to a char* and back when you want to move them by
    a specific number of bytes,
 */
 template <typename Type, typename IntegerType>
-inline Type* addBytesToPointer (Type* pointer, IntegerType bytes) noexcept  { return (Type*) (((char*) pointer) + bytes); }
+Type* addBytesToPointer (Type* pointer, IntegerType bytes) noexcept
+    { return (Type*) (((char*) pointer) + bytes); }

 /** A handy function which returns the difference between any two pointers, in bytes.
    The address of the second pointer is subtracted from the first, and the difference in bytes is returned.
 */
 template <typename Type1, typename Type2>
-inline int getAddressDifference (Type1* pointer1, Type2* pointer2) noexcept  { return (int) (((const char*) pointer1) - (const char*) pointer2); }
+int getAddressDifference (Type1* pointer1, Type2* pointer2) noexcept
+    { return (int) (((const char*) pointer1) - (const char*) pointer2); }

 /** If a pointer is non-null, this returns a new copy of the object that it points to, or safely returns
    nullptr if the pointer is null.
 */
 template <class Type>
-inline Type* createCopyIfNotNull (const Type* pointer)     { return pointer != nullptr ? new Type (*pointer) : nullptr; }
+Type* createCopyIfNotNull (const Type* pointer)
+    { return pointer != nullptr ? new Type (*pointer) : nullptr; }

 //==============================================================================
 #if BEAST_MAC || BEAST_IOS || DOXYGEN
@@ -90,5 +102,7 @@ inline Type* createCopyIfNotNull (const Type* pointer)     { return pointer != n
 #define BEAST_AUTORELEASEPOOL
 #endif

+}
+
 #endif

--- a/beast/Net.h
+++ b/beast/Net.h
@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_NET_H_INCLUDED
+#define BEAST_NET_H_INCLUDED
+
+#include "net/BufferType.h"
+#include "net/DynamicBuffer.h"
+
+#include "net/IPEndpoint.h"
+
+#endif
--- a/modules/beast_core/diagnostic/beast_SafeBool.h
+++ b/modules/beast_core/diagnostic/beast_SafeBool.h
@@ -20,23 +20,11 @@
 #ifndef BEAST_SAFEBOOL_H_INCLUDED
 #define BEAST_SAFEBOOL_H_INCLUDED

-/** Safe evaluation of class as `bool`.
+namespace beast {

-    This allows a class to be safely evaluated as a bool without the usual
-    harmful side effects of the straightforward operator conversion approach.
-    To use it, derive your class from SafeBool and implement `asBoolean()` as:
+namespace detail {

-    @code
-
-    bool asBoolean () const;
-
-    @endcode
-
-    Ideas from http://www.artima.com/cppsource/safebool.html
-
-    @class SafeBool
-*/
-class BEAST_API SafeBoolBase
+class SafeBoolBase
 {
 private:
    void disallowed () const { }
@@ -56,11 +44,29 @@ protected:
    ~SafeBoolBase () { }
 };

+}
+
+/** Safe evaluation of class as `bool`.
+
+    This allows a class to be safely evaluated as a bool without the usual
+    harmful side effects of the straightforward operator conversion approach.
+    To use it, derive your class from SafeBool and implement `asBoolean()` as:
+
+    @code
+
+    bool asBoolean () const;
+
+    @endcode
+
+    Ideas from http://www.artima.com/cppsource/safebool.html
+
+    @class SafeBool
+*/
 template <typename T = void>
-class SafeBool : public SafeBoolBase
+class SafeBool : public detail::SafeBoolBase
 {
 public:
-    operator boolean_t () const
+    operator detail::SafeBoolBase::boolean_t () const
    {
        return (static_cast <T const*> (this))->asBoolean ()
               ? &SafeBoolBase::allowed : 0;
@@ -82,6 +88,8 @@ void operator!= (SafeBool <T> const& lhs, SafeBool <U> const& rhs)
    lhs.disallowed ();
 }

+}
+
 #endif


--- a/beast/SmartPtr.h
+++ b/beast/SmartPtr.h
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_SMARTPTR_H_INCLUDED
+#define BEAST_SMARTPTR_H_INCLUDED
+
+#include "Config.h"
+
+#include "smart_ptr/ContainerDeletePolicy.h"
+#include "smart_ptr/SharedObject.h"
+#include "smart_ptr/SharedPtr.h"
+#include "smart_ptr/ScopedPointer.h"
+
+#endif
--- a/modules/beast_core/thread/beast_GlobalThreadGroup.h
+++ b/modules/beast_core/thread/beast_GlobalThreadGroup.h
@@ -17,33 +17,29 @@
 */
 //==============================================================================

-#ifndef BEAST_GLOBALTHREADGROUP_H_INCLUDED
-#define BEAST_GLOBALTHREADGROUP_H_INCLUDED
+#ifndef BEAST_STATICASSERT_H_INCLUDED
+#define BEAST_STATICASSERT_H_INCLUDED

-/*============================================================================*/
-/**
-  A ThreadGroup singleton.
-
-  @see ThreadGroup
-
-  @ingroup beast_concurrent
-*/
-class BEAST_API GlobalThreadGroup : public ThreadGroup,
-    public SharedSingleton <GlobalThreadGroup>
+#ifndef DOXYGEN
+namespace beast
 {
-private:
-    friend class SharedSingleton <GlobalThreadGroup>;
+    template <bool b>
+    struct BeastStaticAssert;

-    GlobalThreadGroup ()
-        : SharedSingleton <GlobalThreadGroup> (
-            SingletonLifetime::persistAfterCreation)
+    template <>
+    struct BeastStaticAssert <true>
    {
-    }
+        static void dummy() {}
+    };
+}
+#endif

-    static GlobalThreadGroup* createInstance ()
-    {
-        return new GlobalThreadGroup;
-    }
-};
+/** A compile-time assertion macro.
+    If the expression parameter is false, the macro will cause a compile error.
+    (The actual error message that the compiler generates may be completely
+    bizarre and seem to have no relation to the place where you put the
+    static_assert though!)
+*/
+#define static_bassert(expression) beast::BeastStaticAssert<expression>::dummy();

 #endif
--- a/beast/Strings.h
+++ b/beast/Strings.h
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_STRINGS_H_INCLUDED
+#define BEAST_STRINGS_H_INCLUDED
+
+#include "strings/String.h"
+#include "strings/NewLine.h"
+
+#endif
+
--- a/modules/beast_core/memory/beast_FifoFreeStore.h
+++ b/modules/beast_core/memory/beast_FifoFreeStore.h
@@ -17,22 +17,21 @@
 */
 //==============================================================================

-#ifndef BEAST_FIFOFREESTORE_H_INCLUDED
-#define BEAST_FIFOFREESTORE_H_INCLUDED
+#ifndef BEAST_THREADS_H_INCLUDED
+#define BEAST_THREADS_H_INCLUDED

-/** Selected free store based on compilation settings.
-
-    @ingroup beast_concurrent
-*/
-// VFALCO NOTE Disabled this because it seems that the TLS
-//             implementation has a leak. Although the other
-//             one also seems to have a leak.
-//
-//#if BEAST_USE_BOOST_FEATURES
-#if 0
-typedef FifoFreeStoreWithTLS FifoFreeStoreType;
-#else
-typedef FifoFreeStoreWithoutTLS FifoFreeStoreType;
-#endif
+#include "threads/LockGuard.h"
+#include "threads/UnlockGuard.h"
+#include "threads/TryLockGuard.h"
+#include "threads/SharedLockGuard.h"
+#include "threads/SharedMutexAdapter.h"
+#include "threads/SharedData.h"
+#include "threads/ServiceQueue.h"
+#include "threads/SpinLock.h"
+#include "threads/Stoppable.h"
+#include "threads/Thread.h"
+#include "threads/ThreadLocalValue.h"
+#include "threads/WaitableEvent.h"
+#include "threads/ScopedWrapperContext.h"

 #endif
--- a/beast/TypeTraits.h
+++ b/beast/TypeTraits.h
@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_TYPETRAITS_H_INCLUDED
+#define BEAST_TYPETRAITS_H_INCLUDED
+
+#include "type_traits/IntegralConstant.h"
+#include "type_traits/IsIntegral.h"
+#include "type_traits/IsSigned.h"
+#include "type_traits/RemoveSigned.h"
+
+#endif
--- a/modules/beast_core/memory/beast_Uncopyable.h
+++ b/modules/beast_core/memory/beast_Uncopyable.h
@@ -20,6 +20,11 @@
 #ifndef BEAST_UNCOPYABLE_H_INCLUDED
 #define BEAST_UNCOPYABLE_H_INCLUDED

+namespace beast
+{
+
+// Ideas from boost
+
 /** Prevent copy construction and assignment.

    This is used to suppress warnings and prevent unsafe operations on
@@ -59,12 +64,14 @@
 class Uncopyable
 {
 protected:
-    inline Uncopyable () { }
-    inline ~Uncopyable () { }
+    Uncopyable () { }
+    ~Uncopyable () { }

 private:
    Uncopyable (Uncopyable const&);
    Uncopyable const& operator= (Uncopyable const&);
 };

+}
+
 #endif
--- a/beast/Utility.h
+++ b/beast/Utility.h
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_UTILITY_H_INCLUDED
+#define BEAST_UTILITY_H_INCLUDED
+
+#include "utility/BaseFromMember.h"
+#include "utility/Debug.h"
+#include "utility/EnableIf.h"
+#include "utility/Error.h"
+#include "utility/Journal.h"
+#include "utility/LeakChecked.h"
+#include "utility/PropertyStream.h"
+#include "utility/StaticObject.h"
+
+#endif
+
--- a/beast/Version.h
+++ b/beast/Version.h
@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_VERSION_H_INCLUDED
+#define BEAST_VERSION_H_INCLUDED
+
+/** Current BEAST version number.
+    See also SystemStats::getBeastVersion() for a string version.
+*/
+// VFALCO TODO Replace this with SemanticVerson
+#define BEAST_MAJOR_VERSION      1
+#define BEAST_MINOR_VERSION      0
+#define BEAST_BUILDNUMBER        0
+
+/** Current Beast version number.
+    Bits 16 to 32 = major version.
+    Bits 8 to 16 = minor version.
+    Bits 0 to 8 = point release.
+    See also SystemStats::getBeastVersion() for a string version.
+*/
+#define BEAST_VERSION ((BEAST_MAJOR_VERSION << 16) + (BEAST_MINOR_VERSION << 8) + BEAST_BUILDNUMBER)
+
+#endif
+
--- a/beast/boost/Boost.cpp
+++ b/beast/boost/Boost.cpp
@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "ErrorCode.h"
--- a/beast/boost/ErrorCode.h
+++ b/beast/boost/ErrorCode.h
@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_BOOST_ERRORCODE_H_INCLUDED
+#define BEAST_BOOST_ERRORCODE_H_INCLUDED
+
+#include <boost/system/error_code.hpp>
+
+namespace beast {
+
+// Lift this into our namespace. For now we will
+// use boost, and then switch to std::error_code when
+// it is available on all our supported platforms.
+//
+typedef boost::system::error_code ErrorCode;
+
+}
+
+#endif
--- a/beast/chrono/CPUMeter.h
+++ b/beast/chrono/CPUMeter.h
@@ -0,0 +1,158 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CHRONO_CPUMETER_H_INCLUDED
+#define BEAST_CHRONO_CPUMETER_H_INCLUDED
+
+#include "RelativeTime.h"
+#include "ScopedTimeInterval.h"
+#include "../threads/SharedData.h"
+#include "../Atomic.h"
+
+namespace beast {
+
+/** Measurements of CPU utilization. */
+class CPUMeter
+{
+private:
+    struct MeasureIdle
+    {
+        explicit MeasureIdle (CPUMeter& meter)
+            : m_meter (&meter)
+            { }
+        void operator() (RelativeTime const& interval) const
+            { m_meter->addIdleTime (interval); }
+        CPUMeter* m_meter;
+    };
+
+    struct MeasureActive
+    {
+        explicit MeasureActive (CPUMeter& meter)
+            : m_meter (&meter)
+            { }
+        void operator() (RelativeTime const& interval) const
+            { m_meter->addActiveTime (interval); }
+        CPUMeter* m_meter;
+    };
+
+    enum
+    {
+        // The amount of time an aggregate must accrue before a swap
+        secondsPerAggregate     = 3
+
+        // The number of aggregates in the rolling history buffer
+        ,numberOfAggregates     = 20
+    };
+
+    // Aggregated sample data
+    struct Aggregate
+    {
+        RelativeTime idle;
+        RelativeTime active;
+
+        // Returns the total number of seconds in the aggregate
+        double seconds () const
+            { return idle.inSeconds() + active.inSeconds(); }
+
+        // Reset the accumulated times
+        void clear ()
+            { idle = RelativeTime (0); active = RelativeTime (0); }
+
+        Aggregate& operator+= (Aggregate const& other)
+            { idle += other.idle; active += other.active; return *this; }
+
+        Aggregate& operator-= (Aggregate const& other)
+            { idle -= other.idle; active -= other.active; return *this; }
+    };
+
+    struct State
+    {
+        State () : index (0)
+        {
+        }
+
+        // Returns a reference to the current aggregate
+        Aggregate& front ()
+        {
+            return history [index];
+        }
+
+        // Checks the current aggregate to see if we should advance
+        void update()
+        {
+            if (front().seconds() >= secondsPerAggregate)
+                advance();
+        }
+
+        // Advance the index in the rolling history
+        void advance ()
+        {
+            usage += history [index];
+            index = (index+1) % numberOfAggregates;
+            usage -= history [index];
+            history [index].clear ();
+        }
+
+        // Index of the current aggregate we are accumulating
+        int index;
+
+        // Delta summed usage over the entire history buffer
+        Aggregate usage;
+
+        // The rolling history buffer
+        Aggregate history [numberOfAggregates];
+    };
+
+    typedef SharedData <State> SharedState;
+
+    SharedState m_state;
+
+    void addIdleTime (RelativeTime const& interval)
+    {
+        SharedState::Access state (m_state);
+        state->front().idle += interval;
+        state->update();
+    }
+
+    void addActiveTime (RelativeTime const& interval)
+    {
+        SharedState::Access state (m_state);
+        state->front().active += interval;
+        state->update();
+    }
+
+public:
+    /** The type of container that measures idle time. */
+    typedef ScopedTimeInterval <MeasureIdle>    ScopedIdleTime;
+    typedef ScopedTimeInterval <MeasureActive>  ScopedActiveTime;
+
+    /** Returns the fraction of time that the CPU is being used. */
+    double getUtilizaton () const
+    {
+        SharedState::ConstAccess state (m_state);
+        double const seconds (state->usage.seconds());
+        if (seconds > 0)
+            return (state->usage.active.inSeconds() / seconds);
+        return 0;
+    }
+};
+
+}
+
+#endif
--- a/beast/chrono/Chrono.cpp
+++ b/beast/chrono/Chrono.cpp
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "impl/CPUMeter.cpp"
+#include "impl/RelativeTime.cpp"
--- a/modules/beast_core/time/beast_RelativeTime.h
+++ b/modules/beast_core/time/beast_RelativeTime.h
@@ -21,8 +21,16 @@
 */
 //==============================================================================

-#ifndef BEAST_RELATIVETIME_H_INCLUDED
-#define BEAST_RELATIVETIME_H_INCLUDED
+#ifndef BEAST_CHRONO_RELATIVETIME_H_INCLUDED
+#define BEAST_CHRONO_RELATIVETIME_H_INCLUDED
+
+#include "../Config.h"
+#include "../strings/String.h"
+
+#include <string>
+#include <sstream>
+
+namespace beast {

 //==============================================================================
 /** A relative measure of time.
@@ -35,13 +43,22 @@
 class BEAST_API  RelativeTime
 {
 public:
+    //==============================================================================
+    /** The underlying data type used by RelativeTime.
+
+        If you need to get to the underlying time and manipulate it
+        you can use this to declare a type that is guaranteed to
+        work cleanly.
+    */
+    typedef double value_type;
+
    //==============================================================================
    /** Creates a RelativeTime.

        @param seconds  the number of seconds, which may be +ve or -ve.
        @see milliseconds, minutes, hours, days, weeks
    */
-    explicit RelativeTime (double seconds = 0.0) noexcept;
+    explicit RelativeTime (value_type seconds = 0.0) noexcept;

    /** Copies another relative time. */
    RelativeTime (const RelativeTime& other) noexcept;
@@ -52,6 +69,15 @@ public:
    /** Destructor. */
    ~RelativeTime() noexcept;

+    bool isZero() const
+        { return numSeconds == 0; }
+
+    bool isNotZero() const
+        { return numSeconds != 0; }
+
+    /** Returns the amount of time since the process was started. */
+    static RelativeTime fromStartup ();
+
    //==============================================================================
    /** Creates a new RelativeTime object representing a number of milliseconds.
        @see seconds, minutes, hours, days, weeks
@@ -66,27 +92,27 @@ public:
    /** Creates a new RelativeTime object representing a number of seconds.
        @see milliseconds, minutes, hours, days, weeks
    */
-    static RelativeTime seconds (double seconds) noexcept;
+    static RelativeTime seconds (value_type seconds) noexcept;

    /** Creates a new RelativeTime object representing a number of minutes.
        @see milliseconds, hours, days, weeks
    */
-    static RelativeTime minutes (double numberOfMinutes) noexcept;
+    static RelativeTime minutes (value_type numberOfMinutes) noexcept;

    /** Creates a new RelativeTime object representing a number of hours.
        @see milliseconds, minutes, days, weeks
    */
-    static RelativeTime hours (double numberOfHours) noexcept;
+    static RelativeTime hours (value_type numberOfHours) noexcept;

    /** Creates a new RelativeTime object representing a number of days.
        @see milliseconds, minutes, hours, weeks
    */
-    static RelativeTime days (double numberOfDays) noexcept;
+    static RelativeTime days (value_type numberOfDays) noexcept;

    /** Creates a new RelativeTime object representing a number of weeks.
        @see milliseconds, minutes, hours, days
    */
-    static RelativeTime weeks (double numberOfWeeks) noexcept;
+    static RelativeTime weeks (value_type numberOfWeeks) noexcept;

    //==============================================================================
    /** Returns the number of milliseconds this time represents.
@@ -97,27 +123,27 @@ public:
    /** Returns the number of seconds this time represents.
        @see inMilliseconds, inMinutes, inHours, inDays, inWeeks
    */
-    double inSeconds() const noexcept       { return numSeconds; }
+    value_type inSeconds() const noexcept       { return numSeconds; }

    /** Returns the number of minutes this time represents.
        @see inMilliseconds, inSeconds, inHours, inDays, inWeeks
    */
-    double inMinutes() const noexcept;
+    value_type inMinutes() const noexcept;

    /** Returns the number of hours this time represents.
        @see inMilliseconds, inSeconds, inMinutes, inDays, inWeeks
    */
-    double inHours() const noexcept;
+    value_type inHours() const noexcept;

    /** Returns the number of days this time represents.
        @see inMilliseconds, inSeconds, inMinutes, inHours, inWeeks
    */
-    double inDays() const noexcept;
+    value_type inDays() const noexcept;

    /** Returns the number of weeks this time represents.
        @see inMilliseconds, inSeconds, inMinutes, inHours, inDays
    */
-    double inWeeks() const noexcept;
+    value_type inWeeks() const noexcept;

    /** Returns a readable textual description of the time.

@@ -135,42 +161,55 @@ public:
        @see inMilliseconds, inSeconds, inMinutes, inHours, inDays, inWeeks
    */
    String getDescription (const String& returnValueForZeroTime = "0") const;
+    std::string to_string () const;

+    template <typename Number>
+    RelativeTime operator+ (Number seconds) const noexcept
+        { return RelativeTime (numSeconds + seconds); }
+
+    template <typename Number>
+    RelativeTime operator- (Number seconds) const noexcept
+        { return RelativeTime (numSeconds - seconds); }

-    //==============================================================================
    /** Adds another RelativeTime to this one. */
    RelativeTime operator+= (RelativeTime timeToAdd) noexcept;
+
    /** Subtracts another RelativeTime from this one. */
    RelativeTime operator-= (RelativeTime timeToSubtract) noexcept;

    /** Adds a number of seconds to this time. */
-    RelativeTime operator+= (double secondsToAdd) noexcept;
+    RelativeTime operator+= (value_type secondsToAdd) noexcept;
+
    /** Subtracts a number of seconds from this time. */
-    RelativeTime operator-= (double secondsToSubtract) noexcept;
+    RelativeTime operator-= (value_type secondsToSubtract) noexcept;

 private:
-    //==============================================================================
-    double numSeconds;
+    value_type numSeconds;
 };

-//==============================================================================
-/** Compares two RelativeTimes. */
+//------------------------------------------------------------------------------
+
 bool operator== (RelativeTime t1, RelativeTime t2) noexcept;
-/** Compares two RelativeTimes. */
 bool operator!= (RelativeTime t1, RelativeTime t2) noexcept;
-/** Compares two RelativeTimes. */
 bool operator>  (RelativeTime t1, RelativeTime t2) noexcept;
-/** Compares two RelativeTimes. */
 bool operator<  (RelativeTime t1, RelativeTime t2) noexcept;
-/** Compares two RelativeTimes. */
 bool operator>= (RelativeTime t1, RelativeTime t2) noexcept;
-/** Compares two RelativeTimes. */
 bool operator<= (RelativeTime t1, RelativeTime t2) noexcept;

-//==============================================================================
-/** Adds two RelativeTimes together. */
-RelativeTime  operator+  (RelativeTime t1, RelativeTime t2) noexcept;
-/** Subtracts two RelativeTimes. */
-RelativeTime  operator-  (RelativeTime t1, RelativeTime t2) noexcept;
+//------------------------------------------------------------------------------

-#endif   // BEAST_RELATIVETIME_H_INCLUDED
+/** Adds two RelativeTimes together. */
+RelativeTime operator+ (RelativeTime t1, RelativeTime t2) noexcept;
+
+/** Subtracts two RelativeTimes. */
+RelativeTime operator- (RelativeTime t1, RelativeTime t2) noexcept;
+
+inline std::ostream& operator<< (std::ostream& os, RelativeTime const& diff)
+{
+    os << diff.to_string();
+    return os;
+}
+
+}
+
+#endif
--- a/modules/beast_core/memory/beast_GlobalPagedFreeStore.h
+++ b/modules/beast_core/memory/beast_GlobalPagedFreeStore.h
@@ -17,43 +17,46 @@
 */
 //==============================================================================

-#ifndef BEAST_GLOBALPAGEDFREESTORE_H_INCLUDED
-#define BEAST_GLOBALPAGEDFREESTORE_H_INCLUDED
+#ifndef BEAST_CHRONO_SCOPEDTIMEINTERVAL_H_INCLUDED
+#define BEAST_CHRONO_SCOPEDTIMEINTERVAL_H_INCLUDED

-/*============================================================================*/
-/**
-  A PagedFreeStore singleton.
+#include "../Uncopyable.h"
+#include "RelativeTime.h"

-  @ingroup beast_concurrent
+namespace beast {
+
+/** Time measurement using scoped RAII container. 
+    UnaryFunction will be called with this signature:
+        void (RelativeTime const& interval);
 */
-class BEAST_API GlobalPagedFreeStore
-    : public SharedSingleton <GlobalPagedFreeStore>
-    , LeakChecked <GlobalPagedFreeStore>
+template <class UnaryFunction>
+class ScopedTimeInterval : public Uncopyable
 {
 public:
-    GlobalPagedFreeStore ();
-    ~GlobalPagedFreeStore ();
-
-public:
-    inline size_t getPageBytes ()
+    /** Create the measurement with a default-constructed UnaryFunction. */
+    ScopedTimeInterval ()
+        : m_start (RelativeTime::fromStartup())
    {
-        return m_allocator.getPageBytes ();
    }

-    inline void* allocate ()
+    /** Create the measurement with UnaryFunction constructed from one argument. */
+    template <typename Arg>
+    explicit ScopedTimeInterval (Arg& arg)
+        : m_func (arg)
+        , m_start (RelativeTime::fromStartup ())
    {
-        return m_allocator.allocate ();
    }

-    static inline void deallocate (void* const p)
+    ~ScopedTimeInterval ()
    {
-        PagedFreeStore::deallocate (p);
+        m_func (RelativeTime::fromStartup() - m_start);
    }

-    static GlobalPagedFreeStore* createInstance ();
-
 private:
-    PagedFreeStore m_allocator;
+    UnaryFunction m_func;
+    RelativeTime m_start;
 };

+}
+
 #endif
--- a/beast/chrono/impl/CPUMeter.cpp
+++ b/beast/chrono/impl/CPUMeter.cpp
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../CPUMeter.h"
+
--- a/beast/chrono/impl/RelativeTime.cpp
+++ b/beast/chrono/impl/RelativeTime.cpp
@@ -0,0 +1,326 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../RelativeTime.h"
+
+// VFALCO TODO Migrate the localizable strings interfaces for this file
+
+#ifndef NEEDS_TRANS
+#define NEEDS_TRANS(s) (s)
+#endif
+
+#ifndef TRANS
+#define TRANS(s) (s)
+#endif
+
+namespace beast {
+
+RelativeTime::RelativeTime (const RelativeTime::value_type secs) noexcept
+    : numSeconds (secs)
+{
+}
+
+RelativeTime::RelativeTime (const RelativeTime& other) noexcept
+    : numSeconds (other.numSeconds)
+{
+}
+
+RelativeTime::~RelativeTime() noexcept {}
+
+//==============================================================================
+
+RelativeTime RelativeTime::milliseconds (const int milliseconds) noexcept
+{
+    return RelativeTime (milliseconds * 0.001);
+}
+
+RelativeTime RelativeTime::milliseconds (const int64 milliseconds) noexcept
+{
+    return RelativeTime (milliseconds * 0.001);
+}
+
+RelativeTime RelativeTime::seconds (RelativeTime::value_type s) noexcept
+{
+    return RelativeTime (s);
+}
+
+RelativeTime RelativeTime::minutes (const RelativeTime::value_type numberOfMinutes) noexcept
+{
+    return RelativeTime (numberOfMinutes * 60.0);
+}
+
+RelativeTime RelativeTime::hours (const RelativeTime::value_type numberOfHours) noexcept
+{
+    return RelativeTime (numberOfHours * (60.0 * 60.0));
+}
+
+RelativeTime RelativeTime::days (const RelativeTime::value_type numberOfDays) noexcept
+{
+    return RelativeTime (numberOfDays  * (60.0 * 60.0 * 24.0));
+}
+
+RelativeTime RelativeTime::weeks (const RelativeTime::value_type numberOfWeeks) noexcept
+{
+    return RelativeTime (numberOfWeeks * (60.0 * 60.0 * 24.0 * 7.0));
+}
+
+//==============================================================================
+
+int64 RelativeTime::inMilliseconds() const noexcept
+{
+    return (int64) (numSeconds * 1000.0);
+}
+
+RelativeTime::value_type RelativeTime::inMinutes() const noexcept
+{
+    return numSeconds / 60.0;
+}
+
+RelativeTime::value_type RelativeTime::inHours() const noexcept
+{
+    return numSeconds / (60.0 * 60.0);
+}
+
+RelativeTime::value_type RelativeTime::inDays() const noexcept
+{
+    return numSeconds / (60.0 * 60.0 * 24.0);
+}
+
+RelativeTime::value_type RelativeTime::inWeeks() const noexcept
+{
+    return numSeconds / (60.0 * 60.0 * 24.0 * 7.0);
+}
+
+//==============================================================================
+
+RelativeTime& RelativeTime::operator= (const RelativeTime& other) noexcept      { numSeconds = other.numSeconds; return *this; }
+
+RelativeTime RelativeTime::operator+= (RelativeTime t) noexcept
+{
+    numSeconds += t.numSeconds; return *this;
+}
+
+RelativeTime RelativeTime::operator-= (RelativeTime t) noexcept
+{
+    numSeconds -= t.numSeconds; return *this;
+}
+
+RelativeTime RelativeTime::operator+= (const RelativeTime::value_type secs) noexcept
+{
+    numSeconds += secs; return *this;
+}
+
+RelativeTime RelativeTime::operator-= (const RelativeTime::value_type secs) noexcept
+{
+    numSeconds -= secs; return *this;
+}
+
+RelativeTime operator+ (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1 += t2;
+}
+
+RelativeTime operator- (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1 -= t2;
+}
+
+bool operator== (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() == t2.inSeconds();
+}
+
+bool operator!= (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() != t2.inSeconds();
+}
+
+bool operator>  (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() >  t2.inSeconds();
+}
+
+bool operator<  (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() <  t2.inSeconds();
+}
+
+bool operator>= (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() >= t2.inSeconds();
+}
+
+bool operator<= (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() <= t2.inSeconds();
+}
+
+//==============================================================================
+
+static void translateTimeField (String& result, int n, const char* singular, const char* plural)
+{
+    result << TRANS (String((n == 1) ? singular : plural))
+                .replace (n == 1 ? "1" : "2", String (n))
+           << ' ';
+}
+
+String RelativeTime::getDescription (const String& returnValueForZeroTime) const
+{
+    if (numSeconds < 0.001 && numSeconds > -0.001)
+        return returnValueForZeroTime;
+
+    String result;
+    result.preallocateBytes (32);
+
+    if (numSeconds < 0)
+        result << '-';
+
+    int fieldsShown = 0;
+    int n = std::abs ((int) inWeeks());
+    if (n > 0)
+    {
+        translateTimeField (result, n, NEEDS_TRANS("1 week"), NEEDS_TRANS("2 weeks"));
+        ++fieldsShown;
+    }
+
+    n = std::abs ((int) inDays()) % 7;
+    if (n > 0)
+    {
+        translateTimeField (result, n, NEEDS_TRANS("1 day"), NEEDS_TRANS("2 days"));
+        ++fieldsShown;
+    }
+
+    if (fieldsShown < 2)
+    {
+        n = std::abs ((int) inHours()) % 24;
+        if (n > 0)
+        {
+            translateTimeField (result, n, NEEDS_TRANS("1 hour"), NEEDS_TRANS("2 hours"));
+            ++fieldsShown;
+        }
+
+        if (fieldsShown < 2)
+        {
+            n = std::abs ((int) inMinutes()) % 60;
+            if (n > 0)
+            {
+                translateTimeField (result, n, NEEDS_TRANS("1 minute"), NEEDS_TRANS("2 minutes"));
+                ++fieldsShown;
+            }
+
+            if (fieldsShown < 2)
+            {
+                n = std::abs ((int) inSeconds()) % 60;
+                if (n > 0)
+                {
+                    translateTimeField (result, n, NEEDS_TRANS("1 seconds"), NEEDS_TRANS("2 seconds"));
+                    ++fieldsShown;
+                }
+
+                if (fieldsShown == 0)
+                {
+                    n = std::abs ((int) inMilliseconds()) % 1000;
+                    if (n > 0)
+                        result << n << ' ' << TRANS ("ms");
+                }
+            }
+        }
+    }
+
+    return result.trimEnd();
+}
+
+std::string RelativeTime::to_string () const
+{
+    return getDescription ().toStdString();
+}
+
+}
+
+#if BEAST_WINDOWS
+
+#include <Windows.h>
+
+namespace beast {
+
+RelativeTime RelativeTime::fromStartup ()
+{
+    ULONGLONG ticks (GetTickCount64());
+
+    return RelativeTime (ticks / 1000.0);
+}
+
+}
+
+#else
+
+#include <time.h>
+
+namespace beast {
+
+namespace detail {
+
+// Converts a timespec to a RelativeTme
+static RelativeTime toRelativeTime (timespec const& ts)
+{
+    return RelativeTime (ts.tv_sec +
+        ts.tv_nsec / 1000000000.0);
+}
+
+// Records and returns the time from process startup
+static RelativeTime getStartupTime()
+{
+    struct StartupTime
+    {
+        StartupTime ()
+            { clock_gettime (CLOCK_MONOTONIC, &ts); }
+        timespec ts;
+    };
+
+    static StartupTime startupTime;
+
+    return toRelativeTime (startupTime.ts);
+}
+
+// Used to call getStartupTime as early as possible
+struct StartupTimeStaticInitializer
+{
+    StartupTimeStaticInitializer ()
+        { getStartupTime(); }
+};
+
+static StartupTimeStaticInitializer startupTimeStaticInitializer;
+
+}
+
+RelativeTime RelativeTime::fromStartup ()
+{
+    timespec ts;
+    clock_gettime (CLOCK_MONOTONIC, &ts);
+
+    return detail::toRelativeTime (ts) - detail::getStartupTime();
+}
+
+}
+
+#endif
--- a/modules/beast_core/system/PlatformDefs.h
+++ b/modules/beast_core/system/PlatformDefs.h
@@ -21,16 +21,20 @@
 */
 //==============================================================================

-#ifndef BEAST_PLATFORMDEFS_H_INCLUDED
-#define BEAST_PLATFORMDEFS_H_INCLUDED
+#ifndef BEAST_CONFIG_COMPILERCONFIG_H_INCLUDED
+#define BEAST_CONFIG_COMPILERCONFIG_H_INCLUDED
+
+// This file has to work when included in a C source file.
+
+#ifndef BEAST_CONFIG_PLATFORMCONFIG_H_INCLUDED
+#error "PlatformConfig.h must come first!"
+#endif

 // This file defines miscellaneous macros for debugging, assertions, etc.

-#ifdef BEAST_FORCE_DEBUG
+#if BEAST_FORCE_DEBUG
 # undef BEAST_DEBUG
-# if BEAST_FORCE_DEBUG
-#  define BEAST_DEBUG 1
-# endif
+# define BEAST_DEBUG 1
 #endif

 /** This macro defines the C calling convention used as the standard for Beast calls.
@@ -86,6 +90,17 @@

 //------------------------------------------------------------------------------

+#ifdef __cplusplus
+extern "C" {
+#endif
+/** Report a fatal error message and terminate the application.
+    Normally you won't call this directly.
+*/
+extern void beast_reportFatalError (char const* message, char const* fileName, int lineNumber);
+#ifdef __cplusplus
+}
+#endif
+
 #if BEAST_DEBUG || DOXYGEN

 /** Writes a string to the standard error stream.
@@ -101,17 +116,12 @@
 #define bassertfalse          { beast_LogCurrentAssertion; if (beast::beast_isRunningUnderDebugger()) beast_breakDebugger; BEAST_ANALYZER_NORETURN }

 /** Platform-independent assertion macro.
-
    This macro gets turned into a no-op when you're building with debugging turned off, so be
    careful that the expression you pass to it doesn't perform any actions that are vital for the
    correct behaviour of your program!
    @see bassertfalse
  */
-#if 0
-#define bassert(expression)   { if (! (expression)) bassertfalse; }
-#else
-#define bassert(expression)   { if (! (expression)) fatal_error(#expression); }
-#endif
+#define bassert(expression)   { if (! (expression)) beast_reportFatalError(#expression,__FILE__,__LINE__); }

 #else

@@ -130,21 +140,6 @@

 //------------------------------------------------------------------------------

-#ifndef DOXYGEN
-namespace beast
-{
-template <bool b> struct BeastStaticAssert;
-template <> struct BeastStaticAssert <true> { static void dummy() {} };
-}
-#endif
-
-/** A compile-time assertion macro.
-    If the expression parameter is false, the macro will cause a compile error. (The actual error
-    message that the compiler generates may be completely bizarre and seem to have no relation to
-    the place where you put the static_assert though!)
-*/
-#define static_bassert(expression)      beast::BeastStaticAssert<expression>::dummy();
-
 /** This macro can be added to class definitions to disable the use of new/delete to
    allocate the object on the heap, forcing it to only be used as a stack or member variable.
 */
@@ -300,4 +295,11 @@ template <> struct BeastStaticAssert <true> { static void dummy() {} };
 #define override
 #endif

+#ifdef __cplusplus
+namespace beast {
+bool beast_isRunningUnderDebugger();
+void logAssertion (char const* file, int line) noexcept;
+}
+#endif
+
 #endif
--- a/modules/beast_core/system/BeastConfigCheck.h
+++ b/modules/beast_core/system/BeastConfigCheck.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================

-#ifndef BEAST_CORE_SYSTEM_BEASTCONFIGCHECK_H_INCLUDED
-#define BEAST_CORE_SYSTEM_BEASTCONFIGCHECK_H_INCLUDED
+#ifndef BEAST_CONFIG_CONFIGCHECK_H_INCLUDED
+#define BEAST_CONFIG_CONFIGCHECK_H_INCLUDED

 // This file makes sure that BeastConfig.h was included.
 // It also sets defaults for all config options.
@@ -55,10 +55,6 @@
 # endif
 #endif

-#ifndef BEAST_CATCH_UNHANDLED_EXCEPTIONS
-#define BEAST_CATCH_UNHANDLED_EXCEPTIONS 0
-#endif
-
 #if BEAST_DEBUG && ! defined (BEAST_CHECK_MEMORY_LEAKS)
 #define BEAST_CHECK_MEMORY_LEAKS 1
 #endif
@@ -73,10 +69,6 @@

 //------------------------------------------------------------------------------

-#ifndef BEAST_DISABLE_BEAST_VERSION_PRINTING
-#define BEAST_DISABLE_BEAST_VERSION_PRINTING 0
-#endif
-
 #ifndef BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
 #define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0
 #endif
--- a/modules/beast_core/diagnostic/ContractChecks.h
+++ b/modules/beast_core/diagnostic/ContractChecks.h
@@ -17,8 +17,10 @@
 */
 //==============================================================================

-#ifndef BEAST_CONTRACTCHECKS_H_INCLUDED
-#define BEAST_CONTRACTCHECKS_H_INCLUDED
+#ifndef BEAST_CONFIG_CONTRACTCHECKS_H_INCLUDED
+#define BEAST_CONFIG_CONTRACTCHECKS_H_INCLUDED
+
+// This file has to work when included in a C source file.

 #if defined (fatal_error) || \
    defined (fatal_condition) || \
@@ -33,15 +35,13 @@
 #error "Programming by contract macros cannot be overriden!"
 #endif

-extern void reportFatalError (char const* message, char const* fileName, int lineNumber);
-
 /** Report a fatal error message and terminate the application.
    This macro automatically fills in the file and line number
    Meets this declaration syntax:
    @code inline void fatal_error (char const* message); @endif
    @see FatalError
 */
-#define fatal_error(message) reportFatalError (message, __FILE__, __LINE__)
+#define fatal_error(message) beast_reportFatalError (message, __FILE__, __LINE__)

 /** Reports a fatal error message type if the condition is false
    The condition is always evaluated regardless of settings.
@@ -49,7 +49,7 @@ extern void reportFatalError (char const* message, char const* fileName, int lin
    @code inline void fatal_condition (bool condition, char const* category); @endcode
 */
 #define fatal_condition(condition,category) static_cast <void> \
-    (((!!(condition)) || (reportFatalError ( \
+    (((!!(condition)) || (beast_reportFatalError ( \
        category " '" BEAST_STRINGIFY(condition) "' failed.", __FILE__, __LINE__), 0)))

 /** Replacement for assert which generates a fatal error if the condition is false.
@@ -65,7 +65,7 @@ extern void reportFatalError (char const* message, char const* fileName, int lin
    @code inline void fatal_condition (bool condition, char const* category); @endcode
 */
 #define meets_condition(condition,category) static_cast <bool> \
-    (((!!(condition)) || (reportFatalError ( \
+    (((!!(condition)) || (beast_reportFatalError ( \
        category " '" BEAST_STRINGIFY(condition) "' failed.", __FILE__, __LINE__), false)))

 /** Condition tests for programming by contract.
--- a/modules/beast_core/system/TargetPlatform.h
+++ b/modules/beast_core/system/TargetPlatform.h
@@ -21,8 +21,8 @@
 */
 //==============================================================================

-#ifndef BEAST_TARGETPLATFORM_H_INCLUDED
-#define BEAST_TARGETPLATFORM_H_INCLUDED
+#ifndef BEAST_CONFIG_PLATFORMCONFIG_H_INCLUDED
+#define BEAST_CONFIG_PLATFORMCONFIG_H_INCLUDED

 //==============================================================================
 /*  This file figures out which platform is being built, and defines some macros
@@ -213,4 +213,5 @@
 #define BEAST_PP_STR1_(x) BEAST_PP_STR2_(x)
 #define BEAST_FILEANDLINE_ __FILE__ "(" BEAST_PP_STR1_(__LINE__) "): warning:"

-#endif   // BEAST_TARGETPLATFORM_H_INCLUDED
+#endif
+
--- a/beast/config/SelectCompilerConfig.h
+++ b/beast/config/SelectCompilerConfig.h
@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Ideas from boost
+
+// Intel
+#if defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
+#define BEAST_COMPILER_CONFIG "config/compiler/Intel.h"
+
+// Clang C++ emulates GCC, so it has to appear early.
+#elif defined __clang__
+#define BEAST_COMPILER_CONFIG "config/compiler/Clang.h"
+
+//  GNU C++:
+#elif defined __GNUC__
+#define BEAST_COMPILER_CONFIG "config/compiler/Gcc.h"
+
+//  Microsoft Visual C++
+//
+//  Must remain the last #elif since some other vendors (Metrowerks, for
+//  example) also #define _MSC_VER
+#elif defined _MSC_VER
+#define BEAST_COMPILER_CONFIG "config/compiler/VisualC.h"
+
+#else
+#error "Unsupported compiler."
+#endif
+
--- a/modules/beast_core/containers/detail/removecv.h
+++ b/modules/beast_core/containers/detail/removecv.h
@@ -17,57 +17,28 @@
 */
 //==============================================================================

-#ifndef BEAST_CORE_CONTAINERS_DETAIL_REMOVECV_H_INCLUDED
-#define BEAST_CORE_CONTAINERS_DETAIL_REMOVECV_H_INCLUDED
+// Ideas from boost

-namespace detail
-{
+// Android, which must be manually set by defining BEAST_ANDROID
+#if defined(BEAST_ANDROID)
+#define BEAST_PLATFORM_CONFIG "config/platform/Android.h"

-// Strip all cv qualifiers from T
-template <typename T>
-struct removecv
-{
-	typedef T type;
-};
+// linux, also other platforms (Hurd etc) that use GLIBC
+#elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
+#define BEAST_PLATFORM_CONFIG "config/platform/Linux.h"

-template <typename T>
-struct removecv <const T>
-{
-	typedef typename removecv <T>::type type;
-};
+// BSD
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#define BEAST_PLATFORM_CONFIG "config/platform/Bsd.h"

-template <typename T>
-struct removecv <volatile T>
-{
-	typedef typename removecv <T>::type type;
-};
+// win32
+#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(_WIN64)
+#define BEAST_PLATFORM_CONFIG "config/platform/Win32.h"

-template <typename T>
-struct removecv <const volatile T>
-{
-	typedef typename removecv <T>::type type;
-};
-
-template <typename T>
-struct removecv <T*>
-{
-	typedef typename removecv <T>::type type;
-};
-
-template <typename T>
-struct removecv <T&>
-{
-	typedef typename removecv <T>::type type;
-};
-
-#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-template <typename T>
-struct removecv <T&&>
-{
-	typedef typename removecv <T>::type type;
-};
-#endif
-
-}
+// MacOS
+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__APPLE_CPP__)
+#define BEAST_PLATFORM_CONFIG "config/platform/MacOS.h"

+#else
+#error "Unsupported platform."
 #endif
--- a/beast/config/SelectStdlibConfig.h
+++ b/beast/config/SelectStdlibConfig.h
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Ideas from boost
+
--- a/modules/beast_core/system/StandardHeader.h
+++ b/modules/beast_core/system/StandardHeader.h
@@ -21,33 +21,12 @@
 */
 //==============================================================================

-#ifndef BEAST_STANDARDHEADER_H_INCLUDED
-#define BEAST_STANDARDHEADER_H_INCLUDED
+#ifndef BEAST_CONFIG_STANDARDCONFIG_H_INCLUDED
+#define BEAST_CONFIG_STANDARDCONFIG_H_INCLUDED

-//------------------------------------------------------------------------------
-
-/** Current BEAST version number.
-
-    See also SystemStats::getBeastVersion() for a string version.
-*/
-// VFALCO TODO Replace this with SemanticVerson
-#define BEAST_MAJOR_VERSION      1
-#define BEAST_MINOR_VERSION      0
-#define BEAST_BUILDNUMBER        0
-
-/** Current Beast version number.
-
-    Bits 16 to 32 = major version.
-    Bits 8 to 16 = minor version.
-    Bits 0 to 8 = point release.
-
-    See also SystemStats::getBeastVersion() for a string version.
-*/
-#define BEAST_VERSION   ((BEAST_MAJOR_VERSION << 16) + (BEAST_MINOR_VERSION << 8) + BEAST_BUILDNUMBER)
-
-//------------------------------------------------------------------------------
-
-#include "PlatformDefs.h"
+#ifndef BEAST_CONFIG_COMPILERCONFIG_H_INCLUDED
+#error "CompilerConfig.h must be included first"
+#endif

 // Now we'll include some common OS headers..
 #if BEAST_MSVC
@@ -55,45 +34,6 @@
 #pragma warning (disable: 4514 4245 4100)
 #endif

-#include <algorithm>
-#include <cfloat>
-#include <climits>
-#include <cmath>
-#include <cstdarg>
-#include <cstddef>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cwchar>
-#include <exception>
-#include <iostream>
-#include <istream>
-#include <iterator>
-#include <limits>
-#include <list>
-#include <map>
-#include <new>
-#include <numeric>
-#include <ostream>
-#include <sstream>
-#include <stdexcept>
-#include <string>
-#include <typeinfo>
-#include <vector>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <float.h>
-#include <locale.h>
-#include <math.h>
-#include <memory.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #if BEAST_USE_INTRINSICS
 # include <intrin.h>
 #endif
--- a/beast/config/Suffix.h
+++ b/beast/config/Suffix.h
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONFIG_SUFFIX_H_INCLUDED
+#define BEAST_CONFIG_SUFFIX_H_INCLUDED
+
+// Included at the end of Config.h
+
+#endif
--- a/beast/config/compiler/Clang.h
+++ b/beast/config/compiler/Clang.h
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Clang compiler configuration
--- a/beast/config/compiler/Gcc.h
+++ b/beast/config/compiler/Gcc.h
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// GNU C++ compiler configuration
--- a/beast/config/compiler/Intel.h
+++ b/beast/config/compiler/Intel.h
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Intel compiler configuration
--- a/beast/config/compiler/VisualC.h
+++ b/beast/config/compiler/VisualC.h
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Microsoft Visual C++ compiler configuration
--- a/beast/config/platform/Android.h
+++ b/beast/config/platform/Android.h
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Android platform configuration
+
+#ifdef BEAST_ANDROID
+#undef BEAST_ANDROID
+#endif
+#define BEAST_ANDROID 1
+
--- a/beast/config/platform/Bsd.h
+++ b/beast/config/platform/Bsd.h
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// BSD, FreeBSD platform configuration
--- a/beast/config/platform/Linux.h
+++ b/beast/config/platform/Linux.h
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Linux-compatible platform configuration
+
--- a/beast/config/platform/MacOS.h
+++ b/beast/config/platform/MacOS.h
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// MacOS and iOS platform configuration
+
--- a/beast/config/platform/Win32.h
+++ b/beast/config/platform/Win32.h
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Win32 platform configuration
+
--- a/beast/crypto/Crypto.cpp
+++ b/beast/crypto/Crypto.cpp
@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "impl/Sha256.cpp"
--- a/beast/crypto/Sha256.h
+++ b/beast/crypto/Sha256.h
@@ -0,0 +1,156 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CRYPTO_SHA256_H_INCLUDED
+#define BEAST_CRYPTO_SHA256_H_INCLUDED
+
+#include "../Config.h"
+#include "../CStdInt.h"
+#include "../FixedArray.h"
+
+//------------------------------------------------------------------------------
+
+namespace beast {
+namespace Sha256 {
+
+enum
+{
+    digestLength = 32,
+    blockLength = 64
+};
+
+/** A container suitable for holding the resulting hash. */
+typedef FixedArray <uint8, digestLength> digest_type;
+
+namespace detail {
+struct Context
+{
+	beast::uint32 state[8];
+	beast::uint64 bitcount;
+	beast::uint8  buffer[Sha256::blockLength];
+};
+}
+
+/** Computes the Sha256 hash of data. */
+class Context
+{
+public:
+    /** Create a new hasher prepared for input. */
+    Context();
+
+    /** Update the hashing context with the input sequence. */
+    /** @{ */
+    void update (void const* buffer, std::size_t bytes);
+
+    void update (int8 const* begin, int8 const* end)
+    {
+        update (begin, end - begin);
+    }
+
+    void update (uint8 const* begin, uint8 const* end)
+    {
+        update (begin, end - begin);
+    }
+
+    template <typename T>
+    void update (T const& t)
+    {
+        update (&t, sizeof(T));
+    }
+    /** @} */
+
+    /** Finalize the hash process and store the digest.
+        The memory pointed to by `digest` must be at least digestLength
+        bytes. This object may not be re-used after calling finish.
+        @return A pointer to the passed hash buffer.
+    */
+    /** @{ */
+    void* finish (void* digest);
+
+    digest_type& finish (digest_type& digest)
+    {
+        finish (digest.c_array());
+        return digest;
+    }
+
+    digest_type finish ()
+    {
+        digest_type digest;
+        finish (digest);
+        return digest;
+    }
+    /** @} */
+
+private:
+    detail::Context m_context;
+};
+
+//------------------------------------------------------------------------------
+
+/** Returns the hash produced by a single octet equal to zero. */
+digest_type const& empty_digest();
+
+/** Performs an entire hashing operation in a single step.
+    A zero length input sequence produces the empty_digest().
+    @return The resulting digest depending on the arguments.
+*/
+/** @{ */
+void* hash (void const* buffer, std::size_t bytes, void* digest);
+digest_type& hash ( void const* buffer, std::size_t bytes, digest_type& digest);
+digest_type hash (void const* buffer, std::size_t bytes);
+void* hash (int8 const* begin, int8 const* end, void* digest);
+void* hash (uint8 const* begin, uint8 const* end, void* digest);
+digest_type hash (int8 const* begin, int8 const* end);
+digest_type hash (uint8 const* begin, uint8 const* end);
+
+template <typename T>
+void* hash (T const& t, void* digest)
+{
+    return hash (&t, sizeof(T), digest);
+}
+
+template <typename T>
+digest_type& hash (T const& t, digest_type& digest)
+{
+    return hash (&t, sizeof(T), digest);
+}
+
+template <typename T>
+digest_type hash (T const& t)
+{
+    digest_type digest;
+    hash (&t, sizeof(T), digest);
+    return digest;
+}
+/** @} */
+
+/** Calculate the hash of a hash in one step.
+    The memory pointed to by source_digest must be at
+    least digestLength bytes or undefined behavior results.
+*/
+/** @{ */
+void* hash (void const* source_digest, void* digest);
+digest_type& hash (void const* source_digest, digest_type& digest);
+digest_type hash (void const* source_digest);;
+/** @} */
+
+}
+}
+
+#endif
--- a/beast/crypto/impl/Sha256.cpp
+++ b/beast/crypto/impl/Sha256.cpp
@@ -0,0 +1,144 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../Sha256.h"
+
+namespace beast {
+namespace Sha256 {
+
+#ifndef  LITTLE_ENDIAN
+# define LITTLE_ENDIAN 1234
+#endif
+#ifndef  BIG_ENDIAN
+# define BIG_ENDIAN 4321
+#endif
+#if !defined(BYTE_ORDER)
+# if BEAST_BIG_ENDIAN
+#  define BYTE_ORDER BIG_ENDIAN
+# else
+#  define BYTE_ORDER LITTLE_ENDIAN
+# endif
+#endif
+
+//#define SHA2_USE_INTTYPES_H
+
+namespace detail {
+#include "sha2/sha2.c"
+}
+
+Context::Context ()
+{
+    detail::SHA256_Init (&m_context);
+}
+
+void Context::update (void const* buffer, std::size_t bytes)
+{
+    detail::SHA256_Update (&m_context, static_cast <uint8 const*> (buffer), bytes);
+}
+
+void* Context::finish (void* hash)
+{
+    detail::SHA256_Final (static_cast <uint8*> (hash), &m_context);
+    return hash;
+}
+
+//------------------------------------------------------------------------------
+
+digest_type const& empty_digest()
+{
+    struct Holder
+    {
+        Holder ()
+        {
+            uint8 zero (0);
+            hash (zero, digest);
+        }
+
+        digest_type digest;
+    };
+
+    static Holder const holder;
+
+    return holder.digest;
+}
+
+void* hash (void const* buffer, std::size_t bytes, void* digest)
+{
+    Context h;
+    h.update (buffer, bytes);
+    h.finish (digest);
+    return digest;
+}
+
+digest_type& hash (void const* buffer, std::size_t bytes, digest_type& digest)
+{
+    hash (buffer, bytes, digest.c_array());
+    return digest;
+}
+
+digest_type hash (void const* buffer, std::size_t bytes)
+{
+    digest_type digest;
+    hash (buffer, bytes, digest);
+    return digest;
+}
+
+void* hash (int8 const* begin, int8 const* end, void* digest)
+{
+    return hash (begin, end - begin, digest);
+}
+
+void* hash (uint8 const* begin, uint8 const* end, void* digest)
+{
+    return hash (begin, end - begin, digest);
+}
+
+digest_type hash (int8 const* begin, int8 const* end)
+{
+    digest_type digest;
+    hash (begin, end - begin, digest);
+    return digest;
+}
+
+digest_type hash (uint8 const* begin, uint8 const* end)
+{
+    digest_type digest;
+    hash (begin, end - begin, digest);
+    return digest;
+}
+
+void* hash (void const* source_digest, void* digest)
+{
+    return hash (source_digest, digestLength, digest);
+}
+
+digest_type& hash (void const* source_digest, digest_type& digest)
+{
+    return hash (source_digest, digestLength, digest);
+}
+
+digest_type hash (void const* source_digest)
+{
+    digest_type digest;
+    hash (source_digest, digestLength, digest);
+    return digest;
+}
+
+}
+}
--- a/beast/crypto/impl/sha2/README
+++ b/beast/crypto/impl/sha2/README
@@ -0,0 +1,277 @@
+VERSION:
+
+This is version 1.0.1 RELEASE
+
+While this is my "release" version, due to lack of additional
+official test vectors against which to verify this implementation's
+correctness, beware that there may be implementation bugs.  Also,
+it has not yet been tested on very many other architectures,
+big-endian machines in particular.
+
+
+LICENSE:
+
+This implementation is released freely under an open-source BSD
+license which appears at the top of each source code file.
+
+
+WHAT IT IS:
+
+The files sha2.h and sha2.c implement the SHA-256, SHA-384, and SHA-512
+hash algorithms as described in the PDF document found at the following
+web address:
+
+  http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf
+
+The interface is similar to the interface to SHA-1 found in the OpenSSL
+library.
+
+The file sha2prog.c is a simple program that accepts input from either
+STDIN or reads one or more files specified on the command line, and then
+generates the specified hash (either SHA-256, SHA-384, SHA-512, or any
+combination thereof, including all three at once).
+
+
+LIMITATIONS:
+
+This implementation has several limitations:
+
+ * Input data is only accepted in octet-length increments.  No sub-byte
+   data is handled.  The NIST document describes how to handle sub-byte
+   input data, but for ease of implementation this version will only
+   accept message data in multiples of bytes.
+ * This implementation utilizes 64-bit integer data types.  If your
+   system and compiler does not have a 64-bit integer data type, this
+   implementation will not work.
+ * Because of the use of 64-bit operations, many 32-bit architectures
+   that do have 64-bit data types but do operations most efficiently
+   on 32-bit words, this implementation may be slower than an
+   implementation designed to use only 32-bit words (emulating the
+   64-bit operations).
+ * On platforms with 128-bit integer data types, the SHA-384 and SHA-512
+   bit counters used by this implementation might be better off using
+   the 128-bit type instead of simulating it with two 64-bit integers.
+ * This implementation was written in C in hopes of portability and for
+   the fun of it during my spare time.  It is probably not the most
+   efficient or fastest C implementation.  I welcome suggestions,
+   however, that suggest ways to speed things up without breaking
+   portability.  I also welcome suggestions to improve portability.
+ * As mentioned above, this code has NOT been thoroughly tested.
+   This is perhaps the most severe limitation.
+
+
+BEFORE YOU COMPILE (OPTIONS):
+
+Each of the options described below may either be defined in the sha2.h
+header file (or in the sha2.c file in some cases), or on the command
+line at compile time if your compiler supports such things.  For
+example:
+
+  #define SHA2_USE_INTTYPES_H
+  #define SHA2_UNROLL_TRANSFORM
+
+Or:
+
+  cc -c -DSHA2_UNROLL_TRANSFORM sha2.c
+  cc -c -DBYTE_ORDER=4321 -DBIG_ENDIAN=4321 sha2.c
+
+Here are the available options.  Read on below for a description of
+each one:
+
+  SHA2_USE_INTTYPES_H
+  SHA2_USE_MEMSET_MEMCPY/SHA2_USE_BZERO_BCOPY
+  SHA2_UNROLL_TRANSFORM
+  BYTE_ORDER (LITTLE_ENDIAN/BIG_ENDIAN)
+
+* SHA2_USE_INTTYPES_H option:
+By default, this code uses u_intXX_t data types for 8 bit, 32 bit, and
+64 bit unsigned integer type definitions.  Most BSD systems define these,
+as does Linux.  However, some (like Compaq's Tru64 Unix) may instead
+use uintXX_t data types as defined by recent ANSI C standards and as
+included in the inttypes.h header file.  Those wanting to use inttypes.h
+need to define this either in sha.h or at compile time.
+
+On those systems where NEITHER definitions are available, you will need
+to edit both sha2.h and sha2.c and define things by hand in the appropriate
+sections.
+
+* BYTE_ORDER definitions:
+This code assumes that BYTE_ORDER will be defined by the system during
+compile to either equal LITTLE_ENDIAN or BIG_ENDIAN.  If your system
+does not define these, you may need to define them by hand in the sha.c
+file according to the byte ordering conventions of your system.
+
+* SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY
+The code in sha2.c can use either memset()/memcpy() for memory block
+operations, or bzero()/mcopy().  If you define neither of these, the
+code will default to memset()/memcpy().  You can define either at the
+command line or in sha2.h or in sha2.c.
+
+* SHA2_UNROLL_TRANSFORM
+By defining this either on the command line or in sha2.h or sha2.c,
+the code will use macros to partially "unroll" the SHA transform
+function.  This usually generates bigger executables.  It CAN (but
+not necessarily WILL) generate faster code when you tell your compiler
+to optimize things.  For example, on the FreeBSD and Linux x86 systems
+I tested things on (using gcc), when I optimized with just -O2 and
+unrolled the transform, the hash transform was faster by 15-30%.  On
+these same systems, if I did NO optimization, the unrolled transform
+was SLOWER, much slower (I'm guessing because the code was breaking
+the cache, but I'm not sure).  Your mileage may vary.
+
+
+PORTABILITY:
+
+The code in sha2.c and sha2.h is intended to be portable.  It may
+require that you do a few #definitions in the .h file.  I've successfully
+compiled and tested the sha2.c and sha2.h code on Apple's OS X (on
+a PPC), FreeBSD 4.1.1 on Intel, Linux on Intel, FreeBSD on the Alpha,
+and even under Windows98SE using Metrowerks C.  The utility/example
+programs (sha2prog.c, sha2test.c, and sha2speed.c) will very likely
+have more trouble in portability since they do I/O.
+
+To get sha2.c/sha2.h working under Windows, I had to define
+SHA2_USE_INTTYPES_H, BYTE_ORDER, LITTLE_ENDIAN, and had to comment
+out the include of <sys/types.h> in sha2.h.  With a bit more work
+I got the test program to run and verified that all the test
+cases passed.
+
+
+SUGGESTIONS/BUG FIXES:
+
+If you make changes to get it working on other architectures, if you fix
+any bugs, or if you make changes that improve this implementation's
+efficiency that would be relatively portable and you're willing to release
+your changes under the same license, please send them to me for possible
+inclusion in future versions.
+
+If you know where I can find some additional test vectors, please let me
+know.
+
+
+CHANGE HISTORY:
+
+0.8 to 0.9 	- Fixed spelling errors, changed to u_intXX_t type usage,
+		  removed names from prototypes, added prototypes to sha2.c,
+		  and a few things I can't recall.
+
+0.9 to 0.9.5	- Add a new define in sha2.c that permits one to compile
+		  it to either use memcpy()/memset() or bcopy()/bzero()
+		  for memory block copying and zeroing.  Added support
+		  for unrolled SHA-256/384/512 transform loops.  Just
+		  compile with SHA2_UNROLL_TRANSFORM to enable.  It takes
+		  longer to compile, but I hope it is a bit faster.  I
+		  need to do some test to see whether or not it is. Oh,
+		  in sha2.c, you either need to define SHA2_USE_BZERO_BCOPY
+		  or SHA2_USE_MEMSET_MEMCPY to choose which way you want
+		  to compile.  *Whew*  It's amazing how quickly something
+		  simple starts to grow more complex even in the span of
+		  just a few hours.  I didn't really intend to do this much.
+0.9.5 to 0.9.6  - Added a test program (sha2test) which tests against several
+                  known test vectors.  WARNING: Some of the test output
+                  hashes are NOT from NIST's documentation and are the
+                  output of this implementation and so may be incorrect.
+0.9.6 to 0.9.7  - Fixed a bug that could cause invalid output in certain
+		  cases and added an assumed scenario where zero-length
+		  data is hashed.  Also changed the rotation macros to use
+		  a temporary variable as this reduces the number of operations.
+		  When data is fed in blocks of the right length, copying of
+		  data is reduced in this version.  Added SHAYXZ_Data()
+		  functions for ease of hashing a set of data.  Added another
+		  file sha2speed.c for doing speed testing.  Added another test
+		  vector with a larger data size (16KB).  Fixed u_intXX_t and
+		  uintXX_t handling by adding a define for SHA2_USE_INTTYPES_H
+		  as well as made a few other minor changes to get rid of
+		  warnings when compiling on Compaq's Tru64 Unix.
+0.9.7 to 0.9.8  - The bug fix in 0.9.7 was incomplete and in some cases made
+                  things worse.  I believe that 0.9.8 fixes the bug completely
+                  so that output is correct.  I cannot verify this, however,
+                  because of the lack of test vectors against which to do such
+                  verification.  All versions correctly matched the very few
+                  NIST-provided vectors, but unfortunately the bug only
+                  appeared in longer message data sets.
+0.9.8 to 0.9.9  - Fixed some really bad typos and mistakes on my part that
+                  only affected big-endian systems.  I didn't have direct
+                  access for testing before this version.  Thanks to
+                  Lucas Marshall for giving me access to his OS X system.
+0.9.9 to 1.0.0b1  Added a few more test samples and made a few changes to
+                  make things easier compiling on several other platforms.
+                  Also I experimented with alternate macro definitions
+                  in the SHA2_UNROLL_TRANSFORM version (see sha2.slower.c)
+                  and eliminated the T1 temporary variable (the compiler
+                  would of course still use internal temporary storage
+                  during expression evaluation, but I'd hoped the compiler
+                  would be more efficient), but unfortunately under FreeBSD
+                  4.1.1-STABLE on an x86 platform, the change slowed things
+                  down.
+1.0.0b1 to 1.0 RELEASE  Fixed an off-by-one implementation bug that affected
+                  SHA-256 when hashed data length L = 55 + 64 * X where X is
+                  either zero or a positive integer, and another (basically
+                  the same bug) bug in SHA-384 and SHA-512 that showed up when
+                  hashed data lengths L = 111 + 128 * X.  Thanks to Rogier
+		  van de Pol for sending me test data that revealed the bug.
+                  The fix was very simple (just two tiny changes).  Also,
+                  I finally put the files into RCS so future changes will be
+                  easier to manage.  The sha2prog.c file was rewritten to
+                  be more useful to me, and I got rid of the old C testing
+                  program and now use a perl script with a subdirectory full
+                  of test data.  It's a more flexible test system.
+
+1.0 to 1.0.1    - Specified the specific *_CTX structure in the MEMSET_BZERO
+                  macro doing clean-up after hashing.  This should eliminate
+                  some warnings using Clang in version 3.0 (trunk 135348).
+                  Thanks, Stephane Leon for reporting this.
+
+
+LATEST VERSION:
+
+The latest version and documentation (if any ;) should always be available
+on the web at:
+
+  http://www.aarongifford.com/computers/sha.html
+
+
+CONTACT ME:
+
+I can be reached via email at:
+
+  Aaron Gifford   <m e @ a a r o n g i f f o r d . c o m>
+
+Please don't send support questions.  I don't have the time to answer and
+they'll probably be ignored.  Bug fixes, or patches that add something useful
+will be gratefully accepted, however.
+
+If you use this implementation, I would enjoy getting a brief email message
+letting me know who you are and what use to which it is being put.  There
+is no requirement to do so.  I just think it would be fun.
+
+
+EXAMPLES:
+
+Here's an example of compiling and using the sha2 program (in this example
+I build it using the unrolled transform version with -O2 optimizations),
+and then running the perl testing script:
+
+  cc -O2 -DSHA2_UNROLL_TRANSFORM -Wall -o sha2 sha2prog.c sha2.c
+  % ./sha2test.pl
+
+  [most of the perl script output deleted for brevity]
+
+  ===== RESULTS (18 VECTOR DATA FILES HASHED) =====
+
+  HASH TYPE       NO. OF TESTS    PASSED  FAILED
+  ---------       ------------    ------  ------
+  SHA-256                   18        18       0
+  SHA-384                   18        18       0
+  SHA-512                   18        18       0
+  ----------------------------------------------
+  TOTAL:                    54        54       0
+
+  NO ERRORS!  ALL TESTS WERE SUCCESSFUL!
+
+  ALL TEST VECTORS PASSED!
+
+That's all folks!  Have fun!
+
+Aaron out.
+
--- a/beast/crypto/impl/sha2/sha2.c
+++ b/beast/crypto/impl/sha2/sha2.c
--- a/beast/crypto/impl/sha2/sha2.h
+++ b/beast/crypto/impl/sha2/sha2.h
@@ -0,0 +1,117 @@
+/*
+ * FILE:	sha2.h
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+ * 
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $
+ */
+
+#ifndef __SHA2_H__
+#define __SHA2_H__
+
+//#ifdef __cplusplus
+//extern "C" {
+//#endif
+
+/*
+ * Import u_intXX_t size_t type definitions from system headers.  You
+ * may need to change this, or define these things yourself in this
+ * file.
+ */
+#include <sys/types.h>
+
+
+/*** SHA-256/384/512 Various Length Definitions ***********************/
+#define SHA256_DIGEST_STRING_LENGTH	(Sha256::digestLength * 2 + 1)
+#define SHA384_BLOCK_LENGTH   128
+#define SHA384_DIGEST_LENGTH   48
+#define SHA384_DIGEST_STRING_LENGTH	(SHA384_DIGEST_LENGTH * 2 + 1)
+#define SHA512_BLOCK_LENGTH	 128
+#define SHA512_DIGEST_LENGTH  64
+#define SHA512_DIGEST_STRING_LENGTH	(SHA512_DIGEST_LENGTH * 2 + 1)
+
+/*** SHA-256/384/512 Context Structures *******************************/
+typedef struct _SHA512_CTX {
+	uint64	state[8];
+	uint64	bitcount[2];
+	uint8	buffer[SHA512_BLOCK_LENGTH];
+} SHA512_CTX;
+
+typedef SHA512_CTX SHA384_CTX;
+
+
+/*** SHA-256/384/512 Function Prototypes ******************************/
+#ifndef NOPROTO
+
+void SHA256_Init(Sha256::detail::Context *);
+void SHA256_Update(Sha256::detail::Context*, const uint8*, size_t);
+void SHA256_Final(uint8[Sha256::digestLength], Sha256::detail::Context*);
+char* SHA256_End(Sha256::detail::Context*, char[SHA256_DIGEST_STRING_LENGTH]);
+char* SHA256_Data(const uint8*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
+
+void SHA384_Init(SHA384_CTX*);
+void SHA384_Update(SHA384_CTX*, const uint8*, size_t);
+void SHA384_Final(uint8[SHA384_DIGEST_LENGTH], SHA384_CTX*);
+char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
+char* SHA384_Data(const uint8*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
+
+void SHA512_Init(SHA512_CTX*);
+void SHA512_Update(SHA512_CTX*, const uint8*, size_t);
+void SHA512_Final(uint8[SHA512_DIGEST_LENGTH], SHA512_CTX*);
+char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
+char* SHA512_Data(const uint8*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
+
+#else /* NOPROTO */
+
+void SHA256_Init();
+void SHA256_Update();
+void SHA256_Final();
+char* SHA256_End();
+char* SHA256_Data();
+
+void SHA384_Init();
+void SHA384_Update();
+void SHA384_Final();
+char* SHA384_End();
+char* SHA384_Data();
+
+void SHA512_Init();
+void SHA512_Update();
+void SHA512_Final();
+char* SHA512_End();
+char* SHA512_Data();
+
+#endif /* NOPROTO */
+
+//#ifdef	__cplusplus
+//}
+//#endif /* __cplusplus */
+
+#endif /* __SHA2_H__ */
+
--- a/beast/crypto/impl/sha2/sha2prog.c
+++ b/beast/crypto/impl/sha2/sha2prog.c
@@ -0,0 +1,132 @@
+/*
+ * FILE:	sha2prog.c
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+ * 
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sysexits.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+
+#include "sha2.h"
+
+void usage(char *prog, char *msg) {
+	fprintf(stderr, "%s\nUsage:\t%s [options] [<file>]\nOptions:\n\t-256\tGenerate SHA-256 hash\n\t-384\tGenerate SHA-284 hash\n\t-512\tGenerate SHA-512 hash\n\t-ALL\tGenerate all three hashes\n\t-q\tQuiet mode - only output hexadecimal hashes, one per line\n\n", msg, prog);
+	exit(-1);
+}
+
+#define BUFLEN 16384
+
+int main(int argc, char **argv) {
+	int		kl, l, fd, ac;
+	int		quiet = 0, hash = 0;
+	char		*av, *file = (char*)0;
+	FILE		*IN = (FILE*)0;
+	SHA256_CTX	ctx256;
+	SHA384_CTX	ctx384;
+	SHA512_CTX	ctx512;
+	unsigned char	buf[BUFLEN];
+
+	SHA256_Init(&ctx256);
+	SHA384_Init(&ctx384);
+	SHA512_Init(&ctx512);
+
+	/* Read data from STDIN by default */
+	fd = fileno(stdin);
+
+	ac = 1;
+	while (ac < argc) {
+		if (*argv[ac] == '-') {
+			av = argv[ac] + 1;
+			if (!strcmp(av, "q")) {
+				quiet = 1;
+			} else if (!strcmp(av, "256")) {
+				hash |= 1;
+			} else if (!strcmp(av, "384")) {
+				hash |= 2;
+			} else if (!strcmp(av, "512")) {
+				hash |= 4;
+			} else if (!strcmp(av, "ALL")) {
+				hash = 7;
+			} else {
+				usage(argv[0], "Invalid option.");
+			}
+			ac++;
+		} else {
+			file = argv[ac++];
+			if (ac != argc) {
+				usage(argv[0], "Too many arguments.");
+			}
+			if ((IN = fopen(file, "r")) == NULL) {
+				perror(argv[0]);
+				exit(-1);
+			}
+			fd = fileno(IN);
+		}
+	}
+	if (hash == 0)
+		hash = 7;	/* Default to ALL */
+
+	kl = 0;
+	while ((l = read(fd,buf,BUFLEN)) > 0) {
+		kl += l;
+		SHA256_Update(&ctx256, (unsigned char*)buf, l);
+		SHA384_Update(&ctx384, (unsigned char*)buf, l);
+		SHA512_Update(&ctx512, (unsigned char*)buf, l);
+	}
+	if (file) {
+		fclose(IN);
+	}
+
+	if (hash & 1) {
+		SHA256_End(&ctx256, buf);
+		if (!quiet)
+			printf("SHA-256 (%s) = ", file);
+		printf("%s\n", buf);
+	}
+	if (hash & 2) {
+		SHA384_End(&ctx384, buf);
+		if (!quiet)
+			printf("SHA-384 (%s) = ", file);
+		printf("%s\n", buf);
+	}
+	if (hash & 4) {
+		SHA512_End(&ctx512, buf);
+		if (!quiet)
+			printf("SHA-512 (%s) = ", file);
+		printf("%s\n", buf);
+	}
+
+	return 1;
+}
+
--- a/beast/crypto/impl/sha2/sha2speed.c
+++ b/beast/crypto/impl/sha2/sha2speed.c
@@ -0,0 +1,174 @@
+/*
+ * FILE:	sha2speed.c
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+ * 
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: sha2speed.c,v 1.1 2001/11/08 00:02:23 adg Exp adg $
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include "sha2.h"
+
+#define BUFSIZE	16384
+
+void usage(char *prog) {
+	fprintf(stderr, "Usage:\t%s [<num-of-bytes>] [<num-of-loops>] [<fill-byte>]\n", prog);
+	exit(-1);
+}
+
+void printspeed(char *caption, unsigned long bytes, double time) {
+	if (bytes / 1073741824UL > 0) {
+                printf("%s %.4f sec (%.3f GBps)\n", caption, time, (double)bytes/1073741824UL/time);
+        } else if (bytes / 1048576 > 0) {
+                printf("%s %.4f (%.3f MBps)\n", caption, time, (double)bytes/1048576/time);
+        } else if (bytes / 1024 > 0) {
+                printf("%s %.4f (%.3f KBps)\n", caption, time, (double)bytes/1024/time);
+        } else {
+		printf("%s %.4f (%f Bps)\n", caption, time, (double)bytes/time);
+	}
+}
+
+
+int main(int argc, char **argv) {
+	SHA256_CTX	c256;
+	SHA384_CTX	c384;
+	SHA512_CTX	c512;
+	char		buf[BUFSIZE];
+	char		md[SHA512_DIGEST_STRING_LENGTH];
+	int		bytes, blocks, rep, i, j;
+	struct timeval	start, end;
+	double		t, ave256, ave384, ave512;
+	double		best256, best384, best512;
+
+	if (argc > 4) {
+		usage(argv[0]);
+	}
+
+	/* Default to 1024 16K blocks (16 MB) */
+	bytes = 1024 * 1024 * 16;
+	if (argc > 1) {
+		blocks = atoi(argv[1]);
+	}
+	blocks = bytes / BUFSIZE;
+
+	/* Default to 10 repetitions */
+	rep = 10;
+	if (argc > 2) {
+		rep = atoi(argv[2]);
+	}
+
+	/* Set up the input data */
+	if (argc > 3) {
+		memset(buf, atoi(argv[2]), BUFSIZE);
+	} else {
+		memset(buf, 0xb7, BUFSIZE);
+	}
+
+	ave256 = ave384 = ave512 = 0;
+	best256 = best384 = best512 = 100000;
+	for (i = 0; i < rep; i++) {
+		SHA256_Init(&c256);
+		SHA384_Init(&c384);
+		SHA512_Init(&c512);
+	
+		gettimeofday(&start, (struct timezone*)0);
+		for (j = 0; j < blocks; j++) {
+			SHA256_Update(&c256, (unsigned char*)buf, BUFSIZE);
+		}
+		if (bytes % BUFSIZE) {
+			SHA256_Update(&c256, (unsigned char*)buf, bytes % BUFSIZE);
+		}
+		SHA256_End(&c256, md);
+		gettimeofday(&end, (struct timezone*)0);
+		t = ((end.tv_sec - start.tv_sec) * 1000000.0 + (end.tv_usec - start.tv_usec)) / 1000000.0;
+		ave256 += t;
+		if (t < best256) {
+			best256 = t;
+		}
+		printf("SHA-256[%d] (%.4f/%.4f/%.4f seconds) = 0x%s\n", i+1, t, ave256/(i+1), best256, md);
+
+		gettimeofday(&start, (struct timezone*)0);
+		for (j = 0; j < blocks; j++) {
+			SHA384_Update(&c384, (unsigned char*)buf, BUFSIZE);
+		}
+		if (bytes % BUFSIZE) {
+			SHA384_Update(&c384, (unsigned char*)buf, bytes % BUFSIZE);
+		}
+		SHA384_End(&c384, md);
+		gettimeofday(&end, (struct timezone*)0);
+		t = ((end.tv_sec - start.tv_sec) * 1000000.0 + (end.tv_usec - start.tv_usec)) / 1000000.0;
+		ave384 += t;
+		if (t < best384) {
+			best384 = t;
+		}
+		printf("SHA-384[%d] (%.4f/%.4f/%.4f seconds) = 0x%s\n", i+1, t, ave384/(i+1), best384, md);
+
+		gettimeofday(&start, (struct timezone*)0);
+		for (j = 0; j < blocks; j++) {
+			SHA512_Update(&c512, (unsigned char*)buf, BUFSIZE);
+		}
+		if (bytes % BUFSIZE) {
+			SHA512_Update(&c512, (unsigned char*)buf, bytes % BUFSIZE);
+		}
+		SHA512_End(&c512, md);
+		gettimeofday(&end, (struct timezone*)0);
+		t = ((end.tv_sec - start.tv_sec) * 1000000.0 + (end.tv_usec - start.tv_usec)) / 1000000.0;
+		ave512 += t;
+		if (t < best512) {
+			best512 = t;
+		}
+		printf("SHA-512[%d] (%.4f/%.4f/%.4f seconds) = 0x%s\n", i+1, t, ave512/(i+1), best512, md);
+	}
+	ave256 /= rep;
+	ave384 /= rep;
+	ave512 /= rep;
+	printf("\nTEST RESULTS SUMMARY:\nTEST REPETITIONS: %d\n", rep);
+	if (bytes / 1073741824UL > 0) {
+		printf("TEST SET SIZE: %.3f GB\n", (double)bytes/1073741824UL);
+	} else if (bytes / 1048576 > 0) {
+		printf("TEST SET SIZE: %.3f MB\n", (double)bytes/1048576);
+	} else if (bytes /1024 > 0) {
+		printf("TEST SET SIZE: %.3f KB\n", (double)bytes/1024);
+	} else {
+		printf("TEST SET SIZE: %d B\n", bytes);
+	}
+	printspeed("SHA-256 average:", bytes, ave256);
+	printspeed("SHA-256 best:   ", bytes, best256);
+	printspeed("SHA-384 average:", bytes, ave384);
+	printspeed("SHA-384 best:   ", bytes, best384);
+	printspeed("SHA-512 average:", bytes, ave512);
+	printspeed("SHA-512 best:   ", bytes, best512);
+
+	return 1;
+}
+
--- a/beast/crypto/impl/sha2/sha2test.pl
+++ b/beast/crypto/impl/sha2/sha2test.pl
@@ -0,0 +1,358 @@
+#!/usr/bin/perl
+#
+# FILE:		sha2test.pl
+# AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+# 
+# Copyright (c) 2001, Aaron D. Gifford
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $Id: sha2test.pl,v 1.1 2001/11/08 00:02:37 adg Exp adg $
+#
+
+sub usage {
+	my ($err) = shift(@_);
+
+	print <<EOM;
+Error:
+	$err
+Usage:
+	$0 [<options>] [<test-vector-info-file> [<test-vector-info-file> ...]]
+
+Options:
+	-256	Use SHA-256 hashes during testing
+	-384	Use SHA-384 hashes during testing
+	-512	Use SHA-512 hashes during testing
+	-ALL	Use all three hashes during testing
+	-c256 <command-spec>	Specify a command to execute to generate a
+				SHA-256 hash.  Be sure to include a '%'
+				character which will be replaced by the
+				test vector data filename containing the
+				data to be hashed.  This command implies
+				the -256 option.
+	-c384 <command-spec>	Specify a command to execute to generate a
+				SHA-384 hash.  See above.  Implies -384.
+	-c512 <command-spec>	Specify a command to execute to generate a
+				SHA-512 hash.  See above.  Implies -512.
+	-cALL <command-spec>	Specify a command to execute that will
+				generate all three hashes at once and output
+				the data in hexadecimal.  See above for
+				information about the <command-spec>.
+				This option implies the -ALL option, and
+				also overrides any other command options if
+				present.
+
+By default, this program expects to execute the command ./sha2 within the
+current working directory to generate all hashes.  If no test vector
+information files are specified, this program expects to read a series of
+files ending in ".info" within a subdirectory of the current working
+directory called "testvectors".
+
+EOM
+	exit(-1);
+}
+
+$c256 = $c384 = $c512 = $cALL = "";
+$hashes = 0;
+@FILES = ();
+
+# Read all command-line options and files:
+while ($opt = shift(@ARGV)) {
+	if ($opt =~ s/^\-//) {
+		if ($opt eq "256") {
+			$hashes |= 1;
+		} elsif ($opt eq "384") {
+			$hashes |= 2;
+		} elsif ($opt eq "512") {
+			$hashes |= 4;
+		} elsif ($opt =~ /^ALL$/i) {
+			$hashes = 7;
+		} elsif ($opt =~ /^c256$/i) {
+			$hashes |= 1;
+			$opt = $c256 = shift(@ARGV);
+			$opt =~ s/\s+.*$//;
+			if (!$c256 || $c256 !~ /\%/ || !-x $opt) {
+				usage("Missing or invalid command specification for option -c256: $opt\n");
+			}
+		} elsif ($opt =~ /^c384$/i) {
+			$hashes |= 2;
+			$opt = $c384 = shift(@ARGV);
+			$opt =~ s/\s+.*$//;
+			if (!$c384 || $c384 !~ /\%/ || !-x $opt) {
+				usage("Missing or invalid command specification for option -c384: $opt\n");
+			}
+		} elsif ($opt =~ /^c512$/i) {
+			$hashes |= 4;
+			$opt = $c512 = shift(@ARGV);
+			$opt =~ s/\s+.*$//;
+			if (!$c512 || $c512 !~ /\%/ || !-x $opt) {
+				usage("Missing or invalid command specification for option -c512: $opt\n");
+			}
+		} elsif ($opt =~ /^cALL$/i) {
+			$hashes = 7;
+			$opt = $cALL = shift(@ARGV);
+			$opt =~ s/\s+.*$//;
+			if (!$cALL || $cALL !~ /\%/ || !-x $opt) {
+				usage("Missing or invalid command specification for option -cALL: $opt\n");
+			}
+		} else {
+			usage("Unknown/invalid option '$opt'\n");
+		}
+	} else {
+		usage("Invalid, nonexistent, or unreadable file '$opt': $!\n") if (!-f $opt);
+		push(@FILES, $opt);
+	}
+}
+
+# Set up defaults:
+if (!$cALL && !$c256 && !$c384 && !$c512) {
+	$cALL = "./sha2 -ALL %";
+	usage("Required ./sha2 binary executable not found.\n") if (!-x "./sha2");
+}
+$hashes = 7 if (!$hashes);
+
+# Do some sanity checks:
+usage("No command was supplied to generate SHA-256 hashes.\n") if ($hashes & 1 == 1 && !$cALL && !$c256);
+usage("No command was supplied to generate SHA-384 hashes.\n") if ($hashes & 2 == 2 && !$cALL && !$c384);
+usage("No command was supplied to generate SHA-512 hashes.\n") if ($hashes & 4 == 4 && !$cALL && !$c512);
+
+# Default .info files:
+if (scalar(@FILES) < 1) {
+	opendir(DIR, "testvectors") || usage("Unable to scan directory 'testvectors' for vector information files: $!\n");
+	@FILES = grep(/\.info$/, readdir(DIR));
+	closedir(DIR);
+	@FILES = map { s/^/testvectors\//; $_; } @FILES;
+	@FILES = sort(@FILES);
+}
+
+# Now read in each test vector information file:
+foreach $file (@FILES) {
+	$dir = $file;
+	if ($file !~ /\//) {
+		$dir = "./";
+	} else {
+		$dir =~ s/\/[^\/]+$//;
+		$dir .= "/";
+	}
+	open(FILE, "<" . $file) ||
+		usage("Unable to open test vector information file '$file' for reading: $!\n");
+	$vec = { desc => "", file => "", sha256 => "", sha384 => "", sha512 => "" };
+	$data = $field = "";
+	$line = 0;
+	while(<FILE>) {
+		$line++;
+		s/\s*[\r\n]+$//;
+		next if ($field && $field ne "DESCRIPTION" && !$_);
+		if (/^(DESCRIPTION|FILE|SHA256|SHA384|SHA512):$/) {
+			if ($field eq "DESCRIPTION") {
+				$vec->{desc} = $data;
+			} elsif ($field eq "FILE") {
+				$data = $dir . $data if ($data !~ /^\//);
+				$vec->{file} = $data;
+			} elsif ($field eq "SHA256") {
+				$vec->{sha256} = $data;
+			} elsif ($field eq "SHA384") {
+				$vec->{sha384} = $data;
+			} elsif ($field eq "SHA512") {
+				$vec->{sha512} = $data;
+			}
+			$data = "";
+			$field = $1;
+		} elsif ($field eq "DESCRIPTION") {
+			s/^    //;
+			$data .= $_ . "\n";
+		} elsif ($field =~ /^SHA\d\d\d$/) {
+			s/^\s+//;
+			if (!/^([a-f0-9]{32}|[a-f0-9]{64})$/) {
+				usage("Invalid SHA-256/384/512 test vector information " .
+				      "file format at line $line of file '$file'\n");
+			}
+			$data .= $_;
+		} elsif ($field eq "FILE") {
+			s/^    //;
+			$data .= $_;
+		} else {
+			usage("Invalid SHA-256/384/512 test vector information file " .
+			      "format at line $line of file '$file'\n");
+		}
+	}
+	if ($field eq "DESCRIPTION") {
+		$data = $dir . $data if ($data !~ /^\//);
+		$vec->{desc} = $data;
+	} elsif ($field eq "FILE") {
+		$vec->{file} = $data;
+	} elsif ($field eq "SHA256") {
+		$vec->{sha256} = $data;
+	} elsif ($field eq "SHA384") {
+		$vec->{sha384} = $data;
+	} elsif ($field eq "SHA512") {
+		$vec->{sha512} = $data;
+	} else {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  Missing required fields in file '$file'\n");
+	}
+
+	# Sanity check all entries:
+	if (!$vec->{desc}) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  Missing required DESCRIPTION field in file '$file'\n");
+	}
+	if (!$vec->{file}) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  Missing required FILE field in file '$file'\n");
+	}
+	if (! -f $vec->{file}) {
+		usage("The test vector data file (field FILE) name " .
+		      "'$vec->{file}' is not a readable file.  Check the FILE filed in " .
+		      "file '$file'.\n");
+	}
+	if (!($vec->{sha256} || $vec->{sha384} || $vec->{sha512})) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  There must be at least one SHA256, SHA384, or SHA512 " .
+		      "field specified in file '$file'.\n");
+	}
+	if ($vec->{sha256} !~ /^(|[a-f0-9]{64})$/) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  The SHA256 field is invalid in file '$file'.\n");
+	}
+	if ($vec->{sha384} !~ /^(|[a-f0-9]{96})$/) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  The SHA384 field is invalid in file '$file'.\n");
+	}
+	if ($vec->{sha512} !~ /^(|[a-f0-9]{128})$/) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  The SHA512 field is invalid in file '$file'.\n");
+	}
+	close(FILE);
+	if ($hashes & (($vec->{sha256} ? 1 : 0) | ($vec->{sha384} ? 2 : 0) | ($vec->{sha512} ? 4 : 0))) {
+		push(@VECTORS, $vec);
+	}
+}
+
+usage("There were no test vectors for the specified hash(es) in any of the test vector information files you specified.\n") if (scalar(@VECTORS) < 1);
+
+$num = $errors = $error256 = $error384 = $error512 = $tests = $test256 = $test384 = $test512 = 0;
+foreach $vec (@VECTORS) {
+	$num++;
+	print "TEST VECTOR #$num:\n";
+	print "\t" . join("\n\t", split(/\n/, $vec->{desc})) . "\n";
+	print "VECTOR DATA FILE:\n\t$vec->{file}\n";
+	$sha256 = $sha384 = $sha512 = "";
+	if ($cALL) {
+		$prog = $cALL;
+		$prog =~ s/\%/'$vec->{file}'/g;
+		@SHA = grep(/[a-fA-f0-9]{64,128}/, split(/\n/, `$prog`));
+		($sha256) = grep(/(^[a-fA-F0-9]{64}$|^[a-fA-F0-9]{64}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{64}$|[^a-fA-F0-9][a-fA-F0-9]{64}[^a-fA-F0-9])/, @SHA);
+		($sha384) = grep(/(^[a-fA-F0-9]{96}$|^[a-fA-F0-9]{96}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{96}$|[^a-fA-F0-9][a-fA-F0-9]{96}[^a-fA-F0-9])/, @SHA);
+		($sha512) = grep(/(^[a-fA-F0-9]{128}$|^[a-fA-F0-9]{128}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{128}$|[^a-fA-F0-9][a-fA-F0-9]{128}[^a-fA-F0-9])/, @SHA);
+	} else {
+		if ($c256) {
+			$prog = $c256;
+			$prog =~ s/\%/'$vec->{file}'/g;
+			@SHA = grep(/[a-fA-f0-9]{64,128}/, split(/\n/, `$prog`));
+			($sha256) = grep(/(^[a-fA-F0-9]{64}$|^[a-fA-F0-9]{64}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{64}$|[^a-fA-F0-9][a-fA-F0-9]{64}[^a-fA-F0-9])/, @SHA);
+		}
+		if ($c384) {
+			$prog = $c384;
+			$prog =~ s/\%/'$vec->{file}'/g;
+			@SHA = grep(/[a-fA-f0-9]{64,128}/, split(/\n/, `$prog`));
+			($sha384) = grep(/(^[a-fA-F0-9]{96}$|^[a-fA-F0-9]{96}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{96}$|[^a-fA-F0-9][a-fA-F0-9]{96}[^a-fA-F0-9])/, @SHA);
+		}
+		if ($c512) {
+			$prog = $c512;
+			$prog =~ s/\%/'$vec->{file}'/g;
+			@SHA = grep(/[a-fA-f0-9]{64,128}/, split(/\n/, `$prog`));
+			($sha512) = grep(/(^[a-fA-F0-9]{128}$|^[a-fA-F0-9]{128}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{128}$|[^a-fA-F0-9][a-fA-F0-9]{128}[^a-fA-F0-9])/, @SHA);
+		}
+	}
+	usage("Unable to generate any hashes for file '$vec->{file}'!\n") if (!$sha256 && !$sha384 && $sha512);
+	$sha256 =~ tr/A-F/a-f/;
+	$sha384 =~ tr/A-F/a-f/;
+	$sha512 =~ tr/A-F/a-f/;
+	$sha256 =~ s/^.*([a-f0-9]{64}).*$/$1/;
+	$sha384 =~ s/^.*([a-f0-9]{96}).*$/$1/;
+	$sha512 =~ s/^.*([a-f0-9]{128}).*$/$1/;
+
+	if ($sha256 && $hashes & 1 == 1) {
+		if ($vec->{sha256} eq $sha256) {
+			print "SHA256 MATCHES:\n\t$sha256\n"
+		} else {
+			print "SHA256 DOES NOT MATCH:\n\tEXPECTED:\n\t\t$vec->{sha256}\n" .
+			      "\tGOT:\n\t\t$sha256\n\n";
+			$error256++;
+		}
+		$test256++;
+	}
+	if ($sha384 && $hashes & 2 == 2) {
+		if ($vec->{sha384} eq $sha384) {
+			print "SHA384 MATCHES:\n\t" . substr($sha384, 0, 64) . "\n\t" .
+			      substr($sha384, -32) . "\n";
+		} else {
+			print "SHA384 DOES NOT MATCH:\n\tEXPECTED:\n\t\t" .
+			      substr($vec->{sha384}, 0, 64) . "\n\t\t" .
+			      substr($vec->{sha384}, -32) . "\n\tGOT:\n\t\t" .
+			      substr($sha384, 0, 64) . "\n\t\t" . substr($sha384, -32) . "\n\n";
+			$error384++;
+		}
+		$test384++;
+	}
+	if ($sha512 && $hashes & 4 == 4) {
+		if ($vec->{sha512} eq $sha512) {
+			print "SHA512 MATCHES:\n\t" . substr($sha512, 0, 64) . "\n\t" .
+			      substr($sha512, -64) . "\n";
+		} else {
+			print "SHA512 DOES NOT MATCH:\n\tEXPECTED:\n\t\t" .
+			      substr($vec->{sha512}, 0, 64) . "\n\t\t" .
+			      substr($vec->{sha512}, -32) . "\n\tGOT:\n\t\t" .
+			      substr($sha512, 0, 64) . "\n\t\t" . substr($sha512, -64) . "\n\n";
+			$error512++;
+		}
+		$test512++;
+	}
+}
+
+$errors = $error256 + $error384 + $error512;
+$tests = $test256 + $test384 + $test512;
+print "\n\n===== RESULTS ($num VECTOR DATA FILES HASHED) =====\n\n";
+print "HASH TYPE\tNO. OF TESTS\tPASSED\tFAILED\n";
+print "---------\t------------\t------\t------\n";
+if ($test256) {
+	$pass = $test256 - $error256;
+	print "SHA-256\t\t".substr("           $test256", -12)."\t".substr("     $pass", -6)."\t".substr("     $error256", -6)."\n";
+}
+if ($test384) {
+	$pass = $test384 - $error384;
+	print "SHA-384\t\t".substr("           $test384", -12)."\t".substr("     $pass", -6)."\t".substr("     $error384", -6)."\n";
+}
+if ($test512) {
+	$pass = $test512 - $error512;
+	print "SHA-512\t\t".substr("           $test512", -12)."\t".substr("     $pass", -6)."\t".substr("     $error512", -6)."\n";
+}
+print "----------------------------------------------\n";
+$pass = $tests - $errors;
+print "TOTAL:          ".substr("           $tests", -12)."\t".substr("     $pass", -6)."\t".substr("     $errors", -6)."\n\n";
+print "NO ERRORS!  ALL TESTS WERE SUCCESSFUL!\n\n" if (!$errors);
+
--- a/beast/http/HTTP.cpp
+++ b/beast/http/HTTP.cpp
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "impl/URL.cpp"
+#include "impl/ParsedURL.cpp"
+#include "impl/http_parser.cpp"
--- a/beast/http/ParsedURL.h
+++ b/beast/http/ParsedURL.h
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_HTTP_PARSEDURL_H_INCLUDED
+#define BEAST_HTTP_PARSEDURL_H_INCLUDED
+
+#include "../Strings.h"
+#include "URL.h"
+
+namespace beast {
+
+/** Parses a String containing a URL. */
+class ParsedURL
+{
+public:
+    ParsedURL ();
+    explicit ParsedURL (String const& url);
+    ParsedURL (int error, URL const& url);
+    ParsedURL (ParsedURL const& other);
+    ParsedURL& operator= (ParsedURL const& other);
+
+    /** Zero for success, else a non zero value indicating failure. */
+    int error () const;
+
+    /** The parsed URL if there was no error. */
+    URL url () const;
+
+private:
+    int m_error;
+    URL m_url;
+};
+
+}
+
+#endif
--- a/modules/beast_asio/http/UniformResourceLocator.h
+++ b/modules/beast_asio/http/UniformResourceLocator.h
@@ -17,20 +17,24 @@
 */
 //==============================================================================

-#ifndef BEAST_ASIO_PROTOCOL_UNIFORMRESOURCELOCATOR_H_INCLUDED
-#define BEAST_ASIO_PROTOCOL_UNIFORMRESOURCELOCATOR_H_INCLUDED
+#ifndef BEAST_HTTP_URL_H_INCLUDED
+#define BEAST_HTTP_URL_H_INCLUDED
+
+#include "../strings/String.h"
+
+namespace beast {

 /** A URL.
    The accompanying robust parser is hardened against all forms of attack.
 */
-class UniformResourceLocator
+class URL
 {
 public:
    /** Construct an empty URL. */
-    explicit UniformResourceLocator ();
+    explicit URL ();

    /** Construct a URL from it's components. */
-    UniformResourceLocator (
+    URL (
        String schema_,
        String host_,
        uint16 port_,
@@ -41,10 +45,13 @@ public:
        String userinfo_ = "");

    /** Copy construct a URL. */
-    UniformResourceLocator (UniformResourceLocator const& other);
+    URL (URL const& other);

    /** Copy assign a URL. */
-    UniformResourceLocator& operator= (UniformResourceLocator const& other);
+    URL& operator= (URL const& other);
+
+    /** Returns `true` if this is an empty URL. */
+    bool empty () const;

    /** Returns the scheme of the URL.
        If no scheme was specified, the string will be empty.
@@ -96,28 +103,6 @@ private:
    String m_userinfo;
 };

-//------------------------------------------------------------------------------
-
-/** Parses a String containing a URL.    
-*/
-class ParsedURL
-{
-public:
-    ParsedURL ();
-    explicit ParsedURL (String const& url);
-    ParsedURL (int error, UniformResourceLocator const& url);
-    ParsedURL (ParsedURL const& other);
-    ParsedURL& operator= (ParsedURL const& other);
-
-    /** Zero for success, else a non zero value indicating failure. */
-    int error () const;
-
-    /** The parsed URL if there was no error. */
-    UniformResourceLocator url () const;
-
-private:
-    int m_error;
-    UniformResourceLocator m_url;
-};
+}

 #endif
--- a/modules/beast_asio/http/UniformResourceLocator.cpp
+++ b/modules/beast_asio/http/UniformResourceLocator.cpp
@@ -17,134 +17,13 @@
 */
 //==============================================================================

-UniformResourceLocator::UniformResourceLocator ()
-    : m_port (0)
-{
-}
+#include "../ParsedURL.h"

-UniformResourceLocator::UniformResourceLocator (
-    String scheme_,
-    String host_,
-    uint16 port_,
-    String port_string_,
-    String path_,
-    String query_,
-    String fragment_,
-    String userinfo_)
-    : m_scheme (scheme_)
-    , m_host (host_)
-    , m_port (port_)
-    , m_port_string (port_string_)
-    , m_path (path_)
-    , m_query (query_)
-    , m_fragment (fragment_)
-    , m_userinfo (userinfo_)
-{
-}
+#include "http-parser/http_parser.h"

-UniformResourceLocator::UniformResourceLocator (UniformResourceLocator const& other)
-    : m_scheme (other.m_scheme)
-    , m_host (other.m_host)
-    , m_port (other.m_port)
-    , m_port_string (other.m_port_string)
-    , m_path (other.m_path)
-    , m_query (other.m_query)
-    , m_fragment (other.m_fragment)
-    , m_userinfo (other.m_userinfo)
-{
-}
+#include "../../../modules/beast_core/beast_core.h" // for UnitTest

-UniformResourceLocator& UniformResourceLocator::operator= (UniformResourceLocator const& other)
-{
-    m_scheme = other.m_scheme;
-    m_host = other.m_host;
-    m_port = other.m_port;
-    m_port_string = other.m_port_string;
-    m_path = other.m_path;
-    m_query = other.m_query;
-    m_fragment = other.m_fragment;
-    m_userinfo = other.m_userinfo;
-    return *this;
-}
-
-//------------------------------------------------------------------------------
-
-String UniformResourceLocator::scheme () const
-{
-    return m_scheme;
-}
-
-String UniformResourceLocator::host () const
-{
-    return m_host;
-}
-
-String UniformResourceLocator::port_string () const
-{
-    return m_port_string;
-}
-
-uint16 UniformResourceLocator::port () const
-{
-    return m_port;
-}
-
-String UniformResourceLocator::path () const
-{
-    return m_path;
-}
-
-String UniformResourceLocator::query () const
-{
-    return m_query;
-}
-
-String UniformResourceLocator::fragment () const
-{
-    return m_fragment;
-}
-
-String UniformResourceLocator::userinfo () const
-{
-    return m_userinfo;
-}
-
-//------------------------------------------------------------------------------
-/*
-    From
-        http://en.wikipedia.org/wiki/URI_scheme
-
-    <scheme name> : <hierarchical part> [ ? <query> ] [ # <fragment> ]
-
-    e.g.
-
-    foo://username:password@example.com:8042/over/there/index.dtb?type=animal&name=narwhal#nose
-*/
-String UniformResourceLocator::full () const
-{
-    String s;
-
-    s = scheme () + "://";
-    
-    if (userinfo () != String::empty)
-        s = userinfo () + "@";
-
-    s = s + host ();
-
-    if (port () != 0)
-        s = s + ":" + String::fromNumber (port ());
-
-    s = s + path ();
-
-    if (query () != String::empty)
-        s = "?" + query ();
-
-    if (fragment () != String::empty)
-        s = "#" + fragment ();
-
-    return s;
-}
-//------------------------------------------------------------------------------
+namespace beast {

 ParsedURL::ParsedURL ()
    : m_error (0)
@@ -226,7 +105,7 @@ ParsedURL::ParsedURL (String const& url)
                    u.field_data [UF_USERINFO].len);
        }

-        m_url = UniformResourceLocator (
+        m_url = URL (
            scheme_,
            host_,
            port_,
@@ -238,7 +117,7 @@ ParsedURL::ParsedURL (String const& url)
    }
 }

-ParsedURL::ParsedURL (int error, UniformResourceLocator const& url)
+ParsedURL::ParsedURL (int error, URL const& url)
    : m_error (error)
    , m_url (url)
 {
@@ -262,7 +141,7 @@ int ParsedURL::error () const
    return m_error;
 }

-UniformResourceLocator ParsedURL::url () const
+URL ParsedURL::url () const
 {
    return m_url;
 }
@@ -297,3 +176,5 @@ public:
 };

 static ParsedURLTests parsedURLTests;
+
+}
--- a/beast/http/impl/README.md
+++ b/beast/http/impl/README.md
@@ -0,0 +1,3 @@
+git-subtree: "http-parser"
+remote: https://github.com/joyent/http-parser.git
+branch: master
--- a/beast/http/impl/URL.cpp
+++ b/beast/http/impl/URL.cpp
@@ -0,0 +1,158 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../URL.h"
+
+namespace beast {
+
+URL::URL ()
+    : m_port (0)
+{
+}
+
+URL::URL (
+    String scheme_,
+    String host_,
+    uint16 port_,
+    String port_string_,
+    String path_,
+    String query_,
+    String fragment_,
+    String userinfo_)
+    : m_scheme (scheme_)
+    , m_host (host_)
+    , m_port (port_)
+    , m_port_string (port_string_)
+    , m_path (path_)
+    , m_query (query_)
+    , m_fragment (fragment_)
+    , m_userinfo (userinfo_)
+{
+}
+
+URL::URL (URL const& other)
+    : m_scheme (other.m_scheme)
+    , m_host (other.m_host)
+    , m_port (other.m_port)
+    , m_port_string (other.m_port_string)
+    , m_path (other.m_path)
+    , m_query (other.m_query)
+    , m_fragment (other.m_fragment)
+    , m_userinfo (other.m_userinfo)
+{
+}
+
+URL& URL::operator= (URL const& other)
+{
+    m_scheme = other.m_scheme;
+    m_host = other.m_host;
+    m_port = other.m_port;
+    m_port_string = other.m_port_string;
+    m_path = other.m_path;
+    m_query = other.m_query;
+    m_fragment = other.m_fragment;
+    m_userinfo = other.m_userinfo;
+    return *this;
+}
+
+//------------------------------------------------------------------------------
+
+bool URL::empty () const
+{
+    return m_scheme == String::empty;
+}
+
+String URL::scheme () const
+{
+    return m_scheme;
+}
+
+String URL::host () const
+{
+    return m_host;
+}
+
+String URL::port_string () const
+{
+    return m_port_string;
+}
+
+uint16 URL::port () const
+{
+    return m_port;
+}
+
+String URL::path () const
+{
+    return m_path;
+}
+
+String URL::query () const
+{
+    return m_query;
+}
+
+String URL::fragment () const
+{
+    return m_fragment;
+}
+
+String URL::userinfo () const
+{
+    return m_userinfo;
+}
+
+//------------------------------------------------------------------------------
+/*
+    From
+        http://en.wikipedia.org/wiki/URI_scheme
+
+    <scheme name> : <hierarchical part> [ ? <query> ] [ # <fragment> ]
+
+    e.g.
+
+    foo://username:password@example.com:8042/over/there/index.dtb?type=animal&name=narwhal#nose
+*/
+String URL::full () const
+{
+    String s;
+
+    s = scheme () + "://";
+    
+    if (userinfo () != String::empty)
+        s = userinfo () + "@";
+
+    s = s + host ();
+
+    if (port () != 0)
+        s = s + ":" + String::fromNumber (port ());
+
+    s = s + path ();
+
+    if (query () != String::empty)
+        s = "?" + query ();
+
+    if (fragment () != String::empty)
+        s = "#" + fragment ();
+
+    return s;
+}
+
+}
+
--- a/modules/beast_asio/parsehttp/.gitignore
+++ b/modules/beast_asio/parsehttp/.gitignore
--- a/modules/beast_asio/parsehttp/.mailmap
+++ b/modules/beast_asio/parsehttp/.mailmap
--- a/modules/beast_asio/parsehttp/.travis.yml
+++ b/modules/beast_asio/parsehttp/.travis.yml
--- a/modules/beast_asio/parsehttp/AUTHORS
+++ b/modules/beast_asio/parsehttp/AUTHORS
--- a/modules/beast_asio/parsehttp/CONTRIBUTIONS
+++ b/modules/beast_asio/parsehttp/CONTRIBUTIONS
--- a/modules/beast_asio/parsehttp/LICENSE-MIT
+++ b/modules/beast_asio/parsehttp/LICENSE-MIT
--- a/modules/beast_asio/parsehttp/Makefile
+++ b/modules/beast_asio/parsehttp/Makefile
--- a/modules/beast_asio/parsehttp/README.md
+++ b/modules/beast_asio/parsehttp/README.md
--- a/modules/beast_asio/parsehttp/contrib/parsertrace.c
+++ b/modules/beast_asio/parsehttp/contrib/parsertrace.c
--- a/modules/beast_asio/parsehttp/contrib/url_parser.c
+++ b/modules/beast_asio/parsehttp/contrib/url_parser.c
--- a/modules/beast_asio/parsehttp/http_parser.c
+++ b/modules/beast_asio/parsehttp/http_parser.c
--- a/modules/beast_asio/parsehttp/http_parser.gyp
+++ b/modules/beast_asio/parsehttp/http_parser.gyp
--- a/modules/beast_asio/parsehttp/http_parser.h
+++ b/modules/beast_asio/parsehttp/http_parser.h
--- a/modules/beast_asio/parsehttp/test.c
+++ b/modules/beast_asio/parsehttp/test.c
--- a/beast/http/impl/http_parser.cpp
+++ b/beast/http/impl/http_parser.cpp
@@ -0,0 +1,36 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "../../Config.h"
+
+namespace beast {
+
+#ifdef _MSC_VER
+#pragma warning (push)
+#pragma warning (disable: 4127) // conditional expression is constant
+#pragma warning (disable: 4244) // integer conversion, possible loss of data
+#endif
+#include "http-parser/http_parser.c"
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+
+}
--- a/beast/intrusive/ForwardList.h
+++ b/beast/intrusive/ForwardList.h
@@ -20,10 +20,13 @@
 #ifndef BEAST_INTRUSIVE_FORWARDLIST_H_INCLUDED
 #define BEAST_INTRUSIVE_FORWARDLIST_H_INCLUDED

-#include <iterator>
+#include "../Config.h"

 #include "PointerTraits.h"
-#include "../mpl.h"
+
+#include "../MPL.h"
+
+#include <iterator>

 // Ideas based on boost

--- a/beast/intrusive/IntrusiveArray.h
+++ b/beast/intrusive/IntrusiveArray.h
@@ -0,0 +1,187 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_INTRUSIVE_INTRUSIVEARRAY_H_INCLUDED
+#define BEAST_INTRUSIVE_INTRUSIVEARRAY_H_INCLUDED
+
+#include "../Config.h"
+
+#include <cstddef>
+#include <iterator>
+#include <stdexcept>
+#include <vector>
+
+namespace beast {
+
+/** A run-time fixed size array that references outside storage.
+    The interface tries to follow std::vector as closely as possible within
+    the limitations of a fixed size and unowned storage.
+*/
+template <class T>
+class IntrusiveArray
+{
+private:
+    T* m_begin;
+    T* m_end;
+
+public:
+    typedef T                value_type;
+    typedef T*               iterator;
+    typedef T const*         const_iterator;
+    typedef T&               reference;
+    typedef T const&         const_reference;
+    typedef std::size_t      size_type;
+    typedef std::ptrdiff_t   difference_type;
+
+    // Calling methods on a default constructed
+    // array results in undefined behavior!
+    //
+    IntrusiveArray ()
+        : m_begin (nullptr), m_end (nullptr)
+        { }
+    IntrusiveArray (T* begin, T* end)
+        : m_begin (begin), m_end (end)
+        { }
+    IntrusiveArray (IntrusiveArray const& other)
+        : m_begin (other.m_begin), m_end (other.m_end)
+        { }
+    IntrusiveArray (std::vector <T> const& v)
+        : m_begin (&v.front()), m_end (&v.back()+1)
+        { }
+    IntrusiveArray (std::vector <T>& v)
+        : m_begin (&v.front()), m_end (&v.back()+1)
+        { }
+    IntrusiveArray& operator= (IntrusiveArray const& other)
+    {
+        m_begin = other.m_begin;
+        m_end = other.m_end;
+        return *this;
+    }
+
+    // iterators
+    iterator        begin()       { return m_begin; }
+    const_iterator  begin() const { return m_begin; }
+    const_iterator cbegin() const { return m_begin; }
+    iterator        end()       { return m_end; }
+    const_iterator  end() const { return m_end; }
+    const_iterator cend() const { return m_end; }
+
+    typedef std::reverse_iterator <iterator> reverse_iterator;
+    typedef std::reverse_iterator <const_iterator> const_reverse_iterator;
+
+    reverse_iterator rbegin() { return reverse_iterator(end()); }
+    const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const { return const_reverse_iterator(end()); }
+    reverse_iterator rend() { return reverse_iterator(begin()); }
+    const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend() const { return const_reverse_iterator(begin()); }
+
+    reference operator[](size_type i)
+    {
+        bassert (i < size());
+        return m_begin[i];
+    }
+
+    const_reference operator[](size_type i) const
+    {
+        bassert (i < size());
+        return m_begin[i];
+    }
+
+    reference at(size_type i) { rangecheck(i); return m_begin[i]; }
+    const_reference at(size_type i) const { rangecheck(i); return m_begin[i]; }
+
+    reference front() { return m_begin[0]; }
+    reference back()  { return m_end[-1]; }
+    const_reference front () const { return m_begin; }
+    const_reference back()   const { return m_end[-1]; }
+
+    size_type size() const { return std::distance (m_begin, m_end); }
+    bool empty() const { return m_begin == m_end; }
+
+    T const* data() const { return m_begin; }
+    T* data() { return m_begin; }
+    T* c_array() { return m_begin; }
+
+    void assign (T const& value) { fill (value); }
+
+    void fill (T const& value)
+    {
+        std::fill_n (begin(), size(), value);
+    }
+
+    void clear ()
+    {
+        fill (T ());
+    }
+
+    void rangecheck (size_type i)
+    {
+        if (i >= size())
+            throw std::out_of_range ("IntrusiveArray<>: index out of range");
+    }
+};
+
+//------------------------------------------------------------------------------
+
+template <class T>
+bool operator== (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    if ((lhs.begin() == rhs.begin()) && (lhs.end() == rhs.end()))
+        return true;
+    if (lhs.size() != rhs.size())
+        return false;
+    return std::equal (lhs.begin(), lhs.end(), rhs.begin());
+}
+
+template <class T>
+bool operator!= (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    return !(lhs==rhs);
+}
+
+template <class T>
+bool operator< (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    if ((lhs.begin() == rhs.begin()) && (lhs.end() == rhs.end()))
+        return false;
+    return std::lexicographical_compare (lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+}
+
+template <class T>
+bool operator> (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    return rhs<lhs;
+}
+
+template <class T>
+bool operator<= (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    return !(rhs<lhs);
+}
+
+template <class T>
+bool operator>= (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    return !(lhs<rhs);
+}
+
+}
+
+#endif
--- a/modules/beast_core/containers/List.h
+++ b/modules/beast_core/containers/List.h
@@ -17,180 +17,18 @@
 */
 //==============================================================================

-#ifndef BEAST_CORE_CONTAINERS_LIST_H_INCLUDED
-#define BEAST_CORE_CONTAINERS_LIST_H_INCLUDED
+#ifndef BEAST_INTRUSIVE_LIST_H_INCLUDED
+#define BEAST_INTRUSIVE_LIST_H_INCLUDED

-/** Intrusive Containers
+#include "../Config.h"

-    # Introduction
+#include "../mpl/CopyConst.h"

-    Intrusive containers are special containers that offer better performance
-    and exception safety guarantees than non-intrusive containers (like the
-    STL containers). They are useful building blocks for high performance
-    concurrent systems or other purposes where allocations are restricted
-    (such as the AudioIODeviceCallback object), because intrusive list
-    operations do not allocate or free memory.
+#include "../Uncopyable.h"

-    While intrusive containers were and are widely used in C, they became more
-    and more forgotten in C++ due to the presence of the standard containers
-    which don't support intrusive techniques. VFLib not only reintroduces this
-    technique to C++ for lists, it also encapsulates the implementation in a
-    mostly compliant STL interface. Hence anyone familiar with standard
-    containers can easily use them.
+#include <iterator>

-    # Interface
-
-    The interface for intrusive elements in this library is unified for all
-    containers. Unlike STL containers, objects placed into intrusive containers
-    are not copied. Instead, a pointer to the object is stored. All
-    responsibility for object lifetime is the responsibility of the caller;
-    the intrusive container just keeps track of what is in it.
-
-    Summary of intrusive container differences:
-
-    - Holds pointers to existing objects instead of copies.
-
-    - Does not allocate or free any objects.
-
-    - Requires a element's class declaration to be modified.
-
-    - Methods never throw exceptions when called with valid arguments.
-
-    # Usage
-
-    Like STL containers, intrusive containers are all template based, where the
-    template argument specifies the type of object that the container will hold.
-    These declarations specify a doubly linked list where each element points
-    to a user defined class:
-
-    @code
-
-    struct Object; // Forward declaration
-
-    List <Object> list; // Doubly-linked list of Object
-
-    @endcode
-
-    Because intrusive containers allocate no memory, allowing objects to be
-    placed inside requires a modification to their class declaration. Each
-    intrusive container declares a nested class `Node` which elements must be
-    derived from, using the Curiously Recurring Template Pattern (CRTP). We
-    will continue to fully declare the Object type from the previous example
-    to support emplacement into an intrusive container:
-
-    @code
-
-    struct Object : public List <Object>::Node // Required for List
-    {
-        void performAction ();
-    };
-
-    @endcode
-
-    Usage of a typedef eliminates redundant specification of the template
-    arguments but requires a forward declaration. The following code is
-    equivalent.
-
-    @code
-
-    struct Object; // Forward declaration
-
-    // Specify template parameters just once
-    typedef List <Object> ListType;
-
-    struct Object : public ListType::Node
-    {
-        void performAction ();
-    };
-
-    ListType::Node list;
-
-    @endcode
-
-    With these declarations we may proceed to create our objects, add them to
-    the list, and perform operations:
-
-    @code
-
-    // Create a few objects and put them in the list
-    for (i = 0; i < 5; ++i)
-        list.push_back (*new Object);
-
-    // Call a method on each list
-    for (ListType::iterator iter = list.begin(); iter != list.end (); ++iter)
-        iter->performAction ();
-
-    @endcode
-
-    Unlike regular STL containers, an object derived from an intrusive container
-    node cannot exist in more than one instance of that list at a time. This is
-    because the bookkeeping information for maintaining the list is kept in
-    the object rather than the list.
-
-    To support objects existing in multiple containers, templates variations
-    are instantiated by distinguishing them with an empty structure, called a
-    tag. The object is derived from multiple instances of Node, where each
-    instance specifies a unique tag. The tag is passed as the second template
-    argument. When the second argument is unspecified, the default tag is used.
-
-    This declaration example shows the usage of tags to allow an object to exist
-    simultaneously in two separate lists:
-
-    @code
-
-    struct GlobalListTag { }; // list of all objects
-    struct ActiveListTag { }; // subset of all objects that are active
-
-    class Object : public List <Object, GlobalListTag>
-                , public List <Object, ActiveListTag>
-    {
-    public:
-    Object () : m_isActive (false)
-    {
-        // Add ourselves to the global list
-        s_globalList.push_front (*this);
-    }
-
-    ~Object ()
-    {
-        deactivate ();
-    }
-
-    void becomeActive ()
-    {
-        // Add ourselves to the active list
-        if (!m_isActive)
-        {
-            s_activeList.push_front (*this);
-            m_isActive = true;
-        }
-    }
-
-    void deactivate ()
-    {
-        if (m_isActive)
-        {
-            // Doesn't delete the object
-            s_activeList.erase (s_activeList.iterator_to (this));
-
-            m_isActive = false;
-        }
-    }
-
-    private:
-        bool m_isActive;
-
-        static List <Object, GlobalListTag> s_globalList;
-        static List <Object, ActiveListTag> s_activeList;
-    }
-
-    @endcode
-
-    @defgroup intrusive intrusive
-    @ingroup beast_core
-*/
- 
-//------------------------------------------------------------------------------
+namespace beast {

 template <typename, typename>
 class List;
@@ -203,13 +41,12 @@ namespace detail
 // concurrently is required.
 //
 template <typename T, typename Tag>
-class ListNode : public Uncopyable
+class ListNode
 {
 private:
    typedef T value_type;

-    template <typename, typename>
-    friend class List;
+    friend class List<T, Tag>;

    template <typename>
    friend class ListIterator;
@@ -225,8 +62,7 @@ class ListIterator : public std::iterator <
    std::bidirectional_iterator_tag, std::size_t>
 {
 public:
-    typedef typename copyconst <N, typename N::value_type>::type
-    
+    typedef typename mpl::CopyConst<N, typename N::value_type>::type
                                   value_type;
    typedef value_type*            pointer;
    typedef value_type&            reference;
@@ -243,14 +79,6 @@ public:
    {
    }

-#if 0
-    template <typename M>
-    ListIterator& operator= (ListIterator <M> const& other) noexcept
-    {
-        m_node = other.m_node;
-        return *this;
-    }
-#endif
    template <typename M>
    bool operator== (ListIterator <M> const& other) const noexcept
    {
@@ -307,14 +135,11 @@ private:

    void increment () noexcept
    {
-        bassert (m_node->m_next);
        m_node = m_node->m_next;
    }

    void decrement () noexcept
    {
-        bassert (m_node->m_prev &&
-                 m_node->m_prev->m_prev != nullptr);
        m_node = m_node->m_prev;
    }

@@ -323,8 +148,7 @@ private:

 }

-/**
-    Intrusive doubly linked list.
+/** Intrusive doubly linked list.
  
    This intrusive List is a container similar in operation to std::list in the
    Standard Template Library (STL). Like all @ref intrusive containers, List
@@ -583,7 +407,6 @@ public:
        @param pos The location to insert after.
        @param other The list to insert.
    */
-
    void insert (iterator pos, List& other) noexcept
    {
        if (!other.empty ())
@@ -717,4 +540,6 @@ private:
    Node m_tail;
 };

+}
+
 #endif
--- a/beast/intrusive/LockFreeStack.h
+++ b/beast/intrusive/LockFreeStack.h
@@ -0,0 +1,285 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_INTRUSIVE_LOCKFREESTACK_H_INCLUDED
+#define BEAST_INTRUSIVE_LOCKFREESTACK_H_INCLUDED
+
+#include <iterator>
+#include "../mpl/IfCond.h"
+#include "../Atomic.h"
+#include "../Uncopyable.h"
+
+namespace beast {
+
+//------------------------------------------------------------------------------
+
+template <class Container, bool IsConst>
+class LockFreeStackIterator
+    : public std::iterator <
+        std::forward_iterator_tag,
+        typename Container::value_type,
+        typename Container::difference_type,
+        typename mpl::IfCond <IsConst,
+            typename Container::const_pointer,
+            typename Container::pointer>::type,
+        typename mpl::IfCond <IsConst,
+            typename Container::const_reference,
+            typename Container::reference>::type>
+{
+protected:
+    typedef typename Container::Node Node;
+    typedef typename mpl::IfCond <IsConst, Node const*, Node*>::type NodePtr;
+
+public:
+    typedef typename Container::value_type value_type;
+    typedef typename mpl::IfCond <IsConst,
+        typename Container::const_pointer,
+        typename Container::pointer>::type pointer;
+    typedef typename mpl::IfCond <IsConst,
+        typename Container::const_reference,
+        typename Container::reference>::type reference;
+
+    LockFreeStackIterator ()
+        : m_node ()
+    {
+    }
+
+    LockFreeStackIterator (NodePtr node)
+        : m_node (node)
+    {
+    }
+
+    template <bool OtherIsConst>
+    explicit LockFreeStackIterator (LockFreeStackIterator <Container, OtherIsConst> const& other)
+        : m_node (other.m_node)
+    {
+    }
+
+    LockFreeStackIterator& operator= (NodePtr node)
+    {
+        m_node = node;
+        return static_cast <LockFreeStackIterator&> (*this);
+    }
+
+    LockFreeStackIterator& operator++ ()
+    {
+        m_node = m_node->m_next.get();
+        return static_cast <LockFreeStackIterator&> (*this);
+    }
+
+    LockFreeStackIterator operator++ (int)
+    {
+        LockFreeStackIterator result (*this);
+        m_node = m_node->m_next;
+        return result;
+    }
+
+    NodePtr node() const
+    {
+        return m_node;
+    }
+
+    reference operator* () const
+    {
+        return *this->operator-> ();
+    }
+
+    pointer operator-> () const
+    {
+        return static_cast <pointer> (m_node);
+    }
+
+private:
+    NodePtr m_node;
+};
+
+//------------------------------------------------------------------------------
+
+template <class Container, bool LhsIsConst, bool RhsIsConst>
+bool operator== (LockFreeStackIterator <Container, LhsIsConst> const& lhs,
+                 LockFreeStackIterator <Container, RhsIsConst> const& rhs)
+{
+    return lhs.node() == rhs.node();
+}
+
+template <class Container, bool LhsIsConst, bool RhsIsConst>
+bool operator!= (LockFreeStackIterator <Container, LhsIsConst> const& lhs,
+                 LockFreeStackIterator <Container, RhsIsConst> const& rhs)
+{
+    return lhs.node() != rhs.node();
+}
+
+//------------------------------------------------------------------------------
+
+/** Multiple Producer, Multiple Consumer (MPMC) intrusive stack.
+
+    This stack is implemented using the same intrusive interface as List.
+    All mutations are lock-free.
+
+    The caller is responsible for preventing the "ABA" problem:
+        http://en.wikipedia.org/wiki/ABA_problem
+
+    @param Tag  A type name used to distinguish lists and nodes, for
+                putting objects in multiple lists. If this parameter is
+                omitted, the default tag is used.
+*/
+template <class Element, class Tag = void>
+class LockFreeStack : public Uncopyable
+{
+public:
+    class Node : public Uncopyable
+    {
+    public:
+        Node ()
+        {
+        }
+
+        explicit Node (Node* next) : m_next (next)
+        {
+        }
+
+    private:
+        friend class LockFreeStack;
+        
+        template <class Container, bool IsConst>
+        friend class LockFreeStackIterator;
+
+        Atomic <Node*> m_next;
+    };
+
+public:
+    typedef Element                             value_type;
+    typedef Element*                            pointer;
+    typedef Element&                            reference;
+    typedef Element const*                      const_pointer;
+    typedef Element const&                      const_reference;
+    typedef std::size_t                         size_type;
+    typedef std::ptrdiff_t                      difference_type;
+    typedef LockFreeStackIterator <
+        LockFreeStack <Element, Tag>, false>    iterator;
+    typedef LockFreeStackIterator <
+        LockFreeStack <Element, Tag>, true>     const_iterator;
+
+    LockFreeStack ()
+        : m_end (nullptr)
+        , m_head (&m_end)
+    {
+    }
+
+    /** Returns true if the stack is empty. */
+    bool empty() const
+    {
+        return m_head.get() == &m_end;
+    }
+
+    /** Push a node onto the stack.
+        The caller is responsible for preventing the ABA problem.
+        This operation is lock-free.
+        Thread safety:
+            Safe to call from any thread.
+
+        @param node The node to push.
+
+        @return `true` if the stack was previously empty. If multiple threads
+                are attempting to push, only one will receive `true`.
+    */
+    bool push_front (Node* node)
+    {
+        bool first;
+        Node* head;
+        do
+        {
+            head = m_head.get ();
+            first = head == &m_end;
+            node->m_next = head;
+        }
+        while (!m_head.compareAndSetBool (node, head));
+        return first;
+    }
+
+    /** Pop an element off the stack.
+        The caller is responsible for preventing the ABA problem.
+        This operation is lock-free.
+        Thread safety:
+            Safe to call from any thread.
+
+        @return The element that was popped, or `nullptr` if the stack
+                was empty.
+    */
+    Element* pop_front ()
+    {
+        Node* node;
+        Node* head;
+        do
+        {
+            node = m_head.get ();
+            if (node == &m_end)
+                return nullptr;
+            head = node->m_next.get ();
+        }
+        while (!m_head.compareAndSetBool (head, node));
+        return static_cast <Element*> (node);
+    }
+
+    /** Return a forward iterator to the beginning or end of the stack.
+        Undefined behavior results if push_front or pop_front is called
+        while an iteration is in progress.
+        Thread safety:
+            Caller is responsible for synchronization.
+    */
+    /** @{ */
+    iterator begin ()
+    {
+        return iterator (m_head.get ());
+    }
+
+    iterator end ()
+    {
+        return iterator (&m_end);
+    }
+    
+    const_iterator begin () const
+    {
+        return const_iterator (m_head.get ());
+    }
+
+    const_iterator end () const
+    {
+        return const_iterator (&m_end);
+    }
+    
+    const_iterator cbegin () const
+    {
+        return const_iterator (m_head.get ());
+    }
+
+    const_iterator cend () const
+    {
+        return const_iterator (&m_end);
+    }
+    /** @} */
+
+private:
+    Node m_end;
+    Atomic <Node*> m_head;
+};
+
+}
+
+#endif
--- a/beast/intrusive/PointerTraits.h
+++ b/beast/intrusive/PointerTraits.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_INTRUSIVE_POINTERTRAITS_H_INCLUDED
 #define BEAST_INTRUSIVE_POINTERTRAITS_H_INCLUDED

+#include <cstddef>
+
 namespace beast {
 namespace intrusive {

--- a/beast/mpl/AddConst.h
+++ b/beast/mpl/AddConst.h
@@ -20,16 +20,18 @@
 #ifndef BEAST_MPL_ADDCONST_H_INCLUDED
 #define BEAST_MPL_ADDCONST_H_INCLUDED

+#include "RemoveConst.h"
+
 // Ideas based on boost

 namespace beast {
 namespace mpl {

-/// Add the `const` qualifier to a type.
+/** Add the `const` qualifier to a type. */
 template <typename T>
 struct AddConst
 {
-    typedef T const type;
+    typedef typename RemoveConst<T>::type const type;
 };

 }
--- a/modules/beast_core/containers/detail/copyconst.h
+++ b/modules/beast_core/containers/detail/copyconst.h
@@ -17,25 +17,30 @@
 */
 //==============================================================================

-#ifndef BEAST_CORE_CONTAINERS_DETAIL_COPYCONST_H_INCLUDED
-#define BEAST_CORE_CONTAINERS_DETAIL_COPYCONST_H_INCLUDED
+#ifndef BEAST_MPL_COPYCONST_H_INCLUDED
+#define BEAST_MPL_COPYCONST_H_INCLUDED

-namespace detail
-{
+#include "RemoveConst.h"

-// Copy const attribute from T to U if present
+namespace beast {
+namespace mpl {
+
+/** Copy `const` attribute from T to U if present. */
+/** @{ */
 template <typename T, typename U>
-struct copyconst
+struct CopyConst
 {
-    typedef typename removecv <U>::type type;
+    typedef typename RemoveConst<U>::type type;
 };

 template <typename T, typename U>
-struct copyconst <T const, U>
+struct CopyConst <T const, U>
 {
-    typedef typename removecv <U>::type const type;
+    typedef typename RemoveConst<U>::type const type;
 };
+/** @} */

+}
 }

 #endif
--- a/beast/mpl/IfCond.h
+++ b/beast/mpl/IfCond.h
@@ -25,8 +25,8 @@ namespace mpl {

 // Ideas based on boost

-/// Select between T1 or T2 depending on Condition.
-/// @{
+/** Select between T1 or T2 depending on Condition. */
+/** @{ */
 template <bool Condition, typename T1, typename T2>
 struct IfCond
 {
@@ -38,7 +38,7 @@ struct IfCond <false, T1, T2>
 {
    typedef T2 type;
 };
-/// @}
+/** @} */

 }
 }
--- a/beast/mpl/IsCallPossible.h
+++ b/beast/mpl/IsCallPossible.h
@@ -0,0 +1,270 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_MPL_ISCALLPOSSIBLE_H_INCLUDED
+#define BEAST_MPL_ISCALLPOSSIBLE_H_INCLUDED
+
+namespace beast {
+namespace mpl {
+
+// inspired by Roman Perepelitsa's presentation from comp.lang.c++.moderated
+// based on the implementation here: http://www.rsdn.ru/forum/cpp/2759773.1.aspx
+//
+namespace is_call_possible_detail
+{
+    template<typename T>
+    struct add_reference
+    {
+      typedef T& type;
+    };
+
+    template<typename T>
+    struct add_reference<T&>
+    {
+      typedef T& type;
+    };
+
+   template <typename T> class void_exp_result {}; 
+
+   template <typename T, typename U> 
+   U const& operator,(U const&, void_exp_result<T>); 
+
+   template <typename T, typename U> 
+   U& operator,(U&, void_exp_result<T>); 
+
+   template <typename src_type, typename dest_type> 
+   struct clone_constness 
+   { 
+     typedef dest_type type; 
+   }; 
+
+   template <typename src_type, typename dest_type> 
+   struct clone_constness<const src_type, dest_type> 
+   { 
+     typedef const dest_type type; 
+   }; 
+}
+
+#define BEAST_DEFINE_HAS_MEMBER_FUNCTION(trait_name, member_function_name)                                   \
+template<typename T, typename Signature> class trait_name;                                                   \
+                                                                                                             \
+template<typename T, typename Result>                                                                        \
+class trait_name<T, Result(void)>                                                                            \
+{                                                                                                            \
+   class yes { char m; };                                                                                    \
+   class no { yes m[2]; };                                                                                   \
+   struct base_mixin                                                                                         \
+   {                                                                                                         \
+     Result member_function_name();                                                                          \
+   };                                                                                                        \
+   struct base : public T, public base_mixin { private: base(); };                                           \
+   template <typename U, U t>  class helper{};                                                               \
+   template <typename U>                                                                                     \
+   static no deduce(U*, helper<Result (base_mixin::*)(), &U::member_function_name>* = 0);                    \
+   static yes deduce(...);                                                                                   \
+public:                                                                                                      \
+   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
+};                                                                                                           \
+                                                                                                             \
+template<typename T, typename Result, typename Arg>                                                          \
+class trait_name<T, Result(Arg)>                                                                             \
+{                                                                                                            \
+   class yes { char m; };                                                                                    \
+   class no { yes m[2]; };                                                                                   \
+   struct base_mixin                                                                                         \
+   {                                                                                                         \
+     Result member_function_name(Arg);                                                                       \
+   };                                                                                                        \
+   struct base : public T, public base_mixin { private: base(); };                                           \
+   template <typename U, U t>  class helper{};                                                               \
+   template <typename U>                                                                                     \
+   static no deduce(U*, helper<Result (base_mixin::*)(Arg), &U::member_function_name>* = 0);                 \
+   static yes deduce(...);                                                                                   \
+public:                                                                                                      \
+   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
+};                                                                                                           \
+                                                                                                             \
+template<typename T, typename Result, typename Arg1, typename Arg2>                                          \
+class trait_name<T, Result(Arg1,Arg2)>                                                                       \
+{                                                                                                            \
+   class yes { char m; };                                                                                    \
+   class no { yes m[2]; };                                                                                   \
+   struct base_mixin                                                                                         \
+   {                                                                                                         \
+     Result member_function_name(Arg1,Arg2);                                                                 \
+   };                                                                                                        \
+   struct base : public T, public base_mixin { private: base(); };                                           \
+   template <typename U, U t>  class helper{};                                                               \
+   template <typename U>                                                                                     \
+   static no deduce(U*, helper<Result (base_mixin::*)(Arg1,Arg2), &U::member_function_name>* = 0);           \
+   static yes deduce(...);                                                                                   \
+public:                                                                                                      \
+   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
+};                                                                                                           \
+                                                                                                             \
+template<typename T, typename Result, typename Arg1, typename Arg2, typename Arg3>                           \
+class trait_name<T, Result(Arg1,Arg2,Arg3)>                                                                  \
+{                                                                                                            \
+   class yes { char m; };                                                                                    \
+   class no { yes m[2]; };                                                                                   \
+   struct base_mixin                                                                                         \
+   {                                                                                                         \
+     Result member_function_name(Arg1,Arg2,Arg3);                                                            \
+   };                                                                                                        \
+   struct base : public T, public base_mixin { private: base(); };                                           \
+   template <typename U, U t>  class helper{};                                                               \
+   template <typename U>                                                                                     \
+   static no deduce(U*, helper<Result (base_mixin::*)(Arg1,Arg2,Arg3), &U::member_function_name>* = 0);      \
+   static yes deduce(...);                                                                                   \
+public:                                                                                                      \
+   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
+};                                                                                                           \
+                                                                                                             \
+template<typename T, typename Result, typename Arg1, typename Arg2, typename Arg3, typename Arg4>            \
+class trait_name<T, Result(Arg1,Arg2,Arg3,Arg4)>                                                             \
+{                                                                                                            \
+   class yes { char m; };                                                                                    \
+   class no { yes m[2]; };                                                                                   \
+   struct base_mixin                                                                                         \
+   {                                                                                                         \
+     Result member_function_name(Arg1,Arg2,Arg3,Arg4);                                                       \
+   };                                                                                                        \
+   struct base : public T, public base_mixin { private: base(); };                                           \
+   template <typename U, U t>  class helper{};                                                               \
+   template <typename U>                                                                                     \
+   static no deduce(U*, helper<Result (base_mixin::*)(Arg1,Arg2,Arg3,Arg4), &U::member_function_name>* = 0); \
+   static yes deduce(...);                                                                                   \
+public:                                                                                                      \
+   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
+}                                                                                                           
+
+#define BEAST_DEFINE_IS_CALL_POSSIBLE(trait_name, member_function_name)                                                 \
+struct trait_name##_detail                                                                                              \
+{                                                                                                                       \
+BEAST_DEFINE_HAS_MEMBER_FUNCTION(has_member, member_function_name);                                                     \
+};                                                                                                                      \
+                                                                                                                        \
+template <typename T, typename Signature>                                                                               \
+struct trait_name                                                                                                       \
+{                                                                                                                       \
+  private:                                                                                                              \
+   class yes {};                                                                                                        \
+   class no { yes m[2]; };                                                                                              \
+   struct derived : public T                                                                                            \
+   {                                                                                                                    \
+     using T::member_function_name;                                                                                     \
+     no member_function_name(...) const;                                                                                \
+     private: derived ();                                                                                               \
+   };                                                                                                                   \
+                                                                                                                        \
+   typedef typename beast::mpl::is_call_possible_detail::clone_constness<T, derived>::type derived_type;                \
+                                                                                                                        \
+   template <typename U, typename Result>                                                                               \
+   struct return_value_check                                                                                            \
+   {                                                                                                                    \
+     static yes deduce(Result);                                                                                         \
+     static no deduce(...);                                                                                             \
+     static no deduce(no);                                                                                              \
+     static no deduce(beast::mpl::is_call_possible_detail::void_exp_result<T>);                                         \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <typename U>                                                                                                \
+   struct return_value_check<U, void>                                                                                   \
+   {                                                                                                                    \
+     static yes deduce(...);                                                                                            \
+     static no deduce(no);                                                                                              \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <bool has_the_member_of_interest, typename F>                                                               \
+   struct impl                                                                                                          \
+   {                                                                                                                    \
+     static const bool value = false;                                                                                   \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <typename Result, typename Arg>                                                                             \
+   struct impl<true, Result(Arg)>                                                                                       \
+   {                                                                                                                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<derived_type>::type test_me;                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg>::type          arg;                        \
+                                                                                                                        \
+     static const bool value =                                                                                          \
+       sizeof(                                                                                                          \
+            return_value_check<T, Result>::deduce(                                                                      \
+             (test_me.member_function_name(arg), beast::mpl::is_call_possible_detail::void_exp_result<T>())             \
+                         )                                                                                              \
+            ) == sizeof(yes);                                                                                           \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <typename Result, typename Arg1, typename Arg2>                                                             \
+   struct impl<true, Result(Arg1,Arg2)>                                                                                 \
+   {                                                                                                                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<derived_type>::type test_me;                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg1>::type         arg1;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg2>::type         arg2;                       \
+                                                                                                                        \
+     static const bool value =                                                                                          \
+       sizeof(                                                                                                          \
+            return_value_check<T, Result>::deduce(                                                                      \
+             (test_me.member_function_name(arg1,arg2), beast::mpl::is_call_possible_detail::void_exp_result<T>())       \
+                         )                                                                                              \
+            ) == sizeof(yes);                                                                                           \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <typename Result, typename Arg1, typename Arg2, typename Arg3>                                              \
+   struct impl<true, Result(Arg1,Arg2,Arg3)>                                                                            \
+   {                                                                                                                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<derived_type>::type test_me;                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg1>::type         arg1;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg2>::type         arg2;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg3>::type         arg3;                       \
+                                                                                                                        \
+     static const bool value =                                                                                          \
+       sizeof(                                                                                                          \
+            return_value_check<T, Result>::deduce(                                                                      \
+             (test_me.member_function_name(arg1,arg2,arg3), beast::mpl::is_call_possible_detail::void_exp_result<T>())  \
+                         )                                                                                              \
+            ) == sizeof(yes);                                                                                           \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <typename Result, typename Arg1, typename Arg2, typename Arg3, typename Arg4>                               \
+   struct impl<true, Result(Arg1,Arg2,Arg3,Arg4)>                                                                       \
+   {                                                                                                                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<derived_type>::type test_me;                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg1>::type         arg1;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg2>::type         arg2;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg3>::type         arg3;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg4>::type         arg4;                       \
+                                                                                                                        \
+     static const bool value =                                                                                          \
+       sizeof(                                                                                                          \
+            return_value_check<T, Result>::deduce(                                                                      \
+             (test_me.member_function_name(arg1,arg2,arg3,arg4),                                                        \
+                beast::mpl::is_call_possible_detail::void_exp_result<T>())                                              \
+                         )                                                                                              \
+            ) == sizeof(yes);                                                                                           \
+   };                                                                                                                   \
+                                                                                                                        \
+  public:                                                                                                               \
+    static const bool value = impl<trait_name##_detail::has_member<T,Signature>::value, Signature>::value;              \
+}
+
+}
+}
+
+#endif
--- a/beast/mpl/PointerToOther.h
+++ b/beast/mpl/PointerToOther.h
@@ -30,7 +30,7 @@ namespace mpl {
    parameters. More specializations can be added for containers with
    more than three template parameters.
 */
-/// @{
+/** @{ */
 template <class T, class U>
 struct PointerToOther;

@@ -60,7 +60,7 @@ struct PointerToOther <T*, U>
 {
   typedef U* type;
 };
-/// @}
+/** @} */

 }
 }
--- a/beast/mpl/RemoveConst.h
+++ b/beast/mpl/RemoveConst.h
@@ -25,8 +25,8 @@
 namespace beast {
 namespace mpl {

-/// Remove the `const` qualifier from a type.
-/// @{
+/** Remove the `const` qualifier from a type. */
+/** @{ */
 template <typename T>
 struct RemoveConst
 {
@@ -38,7 +38,7 @@ struct RemoveConst <T const>
 {
    typedef T type;
 };
-/// @}
+/** @} */

 }
 }
--- a/beast/mpl/RemoveConstVolatile.h
+++ b/beast/mpl/RemoveConstVolatile.h
@@ -28,7 +28,7 @@
 namespace beast {
 namespace mpl {

-/// Remove both the `const` and `volatile` qualifiers from a type.
+/** Remove both the `const` and `volatile` qualifiers from a type. */
 template <typename T>
 struct RemoveConstVolatile
 {
--- a/beast/mpl/RemoveReference.h
+++ b/beast/mpl/RemoveReference.h
@@ -25,8 +25,8 @@ namespace mpl {

 // Ideas based on boost

-/// Remove the reference qualifier from a type.
-/// @{
+/** Remove the reference qualifier from a type. */
+/** @{ */
 template <class T>
 struct RemoveReference
 {
@@ -38,7 +38,7 @@ struct RemoveReference <T&>
 {
   typedef T type;
 };
-/// @}
+/** @} */

 }
 }
--- a/beast/mpl/RemoveVolatile.h
+++ b/beast/mpl/RemoveVolatile.h
@@ -25,8 +25,8 @@
 namespace beast {
 namespace mpl {

-/// Remove the `volatile` qualifier from a type.
-/// @{
+/** Remove the `volatile` qualifier from a type. */
+/** @{ */
 template <typename T>
 struct RemoveVolatile
 {
@@ -38,7 +38,7 @@ struct RemoveVolatile <T volatile>
 {
    typedef T type;
 };
-/// @}
+/** @} */

 }
 }
--- a/Show More
+++ b/Show More