Set version to 0.60.0

Merge master (0.50.3) into release (0.60.0-rc4)
Set version to 0.60.0-rc4
2025-11-18 18:15:50 +00:00 · 2017-03-16 14:04:39 -07:00 · 2017-03-16 13:55:29 -07:00 · 2017-03-13 20:21:26 -04:00 · 2017-03-13 20:20:09 -04:00 · 2017-03-13 17:05:17 -07:00
586 changed files with 34742 additions and 18895 deletions
--- a/Builds/CMake/CMakeFuncs.cmake
+++ b/Builds/CMake/CMakeFuncs.cmake
@@ -33,16 +33,16 @@ macro(parse_target)
      if (${cur_component} STREQUAL gcc)
        if (DEFINED ENV{GNU_CC})
          set(CMAKE_C_COMPILER $ENV{GNU_CC})
-        elseif ($ENV{CXX} MATCHES .*gcc.*)
-          set(CMAKE_CXX_COMPILER $ENV{CC})
+        elseif ($ENV{CC} MATCHES .*gcc.*)
+          set(CMAKE_C_COMPILER $ENV{CC})
        else()
          find_program(CMAKE_C_COMPILER gcc)
        endif()

        if (DEFINED ENV{GNU_CXX})
-          set(CMAKE_C_COMPILER $ENV{GNU_CXX})
+          set(CMAKE_CXX_COMPILER $ENV{GNU_CXX})
        elseif ($ENV{CXX} MATCHES .*g\\+\\+.*)
-          set(CMAKE_C_COMPILER $ENV{CC})
+          set(CMAKE_CXX_COMPILER $ENV{CXX})
        else()
          find_program(CMAKE_CXX_COMPILER g++)
        endif()
@@ -51,16 +51,16 @@ macro(parse_target)
      if (${cur_component} STREQUAL clang)
        if (DEFINED ENV{CLANG_CC})
          set(CMAKE_C_COMPILER $ENV{CLANG_CC})
-        elseif ($ENV{CXX} MATCHES .*clang.*)
-          set(CMAKE_CXX_COMPILER $ENV{CC})
+        elseif ($ENV{CC} MATCHES .*clang.*)
+          set(CMAKE_C_COMPILER $ENV{CC})
        else()
          find_program(CMAKE_C_COMPILER clang)
        endif()

        if (DEFINED ENV{CLANG_CXX})
-          set(CMAKE_C_COMPILER $ENV{CLANG_CXX})
+          set(CMAKE_CXX_COMPILER $ENV{CLANG_CXX})
        elseif ($ENV{CXX} MATCHES .*clang.*)
-          set(CMAKE_C_COMPILER $ENV{CC})
+          set(CMAKE_CXX_COMPILER $ENV{CXX})
        else()
          find_program(CMAKE_CXX_COMPILER clang++)
        endif()
@@ -105,6 +105,14 @@ macro(parse_target)
      endif()

    endwhile()
+    # Promote these values to the CACHE, then unset the locals
+    # to prevent shadowing.
+    set(CMAKE_C_COMPILER ${CMAKE_C_COMPILER} CACHE FILEPATH
+      "Path to a program" FORCE)
+    unset(CMAKE_C_COMPILER)
+    set(CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER} CACHE FILEPATH
+      "Path to a program" FORCE)
+    unset(CMAKE_CXX_COMPILER)

    if (release)
      set(CMAKE_BUILD_TYPE Release)
@@ -112,9 +120,25 @@ macro(parse_target)
      set(CMAKE_BUILD_TYPE Debug)
    endif()

+    # ensure that the unity flags are set and exclusive
+    if (NOT DEFINED unity OR unity)
+      # Default to unity builds
+      set(unity true)
+      set(nonunity false)
+    else()
+      set(unity false)
+      set(nonunity true)
+    endif()
+
    if (NOT unity)
      set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}Classic)
    endif()
+    # Promote this value to the CACHE, then unset the local
+    # to prevent shadowing.
+    set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE INTERNAL
+      "Choose the type of build, options are in CMAKE_CONFIGURATION_TYPES"
+      FORCE)
+    unset(CMAKE_BUILD_TYPE)
  endif()

 endmacro()
@@ -147,15 +171,13 @@ macro(setup_build_cache)
    set(CMAKE_CONFIGURATION_TYPES
      DebugClassic
      ReleaseClassic)
-    if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-      set(CMAKE_BUILD_TYPE DebugClassic)
-    elseif(${CMAKE_BUILD_TYPE} STREQUAL "Release")
-      set(CMAKE_BUILD_TYPE ReleaseClassic)
-    endif()
  endif()

+  # Promote this value to the CACHE, then unset the local
+  # to prevent shadowing.
  set(CMAKE_CONFIGURATION_TYPES
    ${CMAKE_CONFIGURATION_TYPES} CACHE STRING "" FORCE)
+  unset(CMAKE_CONFIGURATION_TYPES)
 endmacro()

 ############################################################
@@ -487,6 +509,15 @@ macro(setup_build_boilerplate)

  if (is_gcc)
    add_compile_options(-Wno-unused-but-set-variable -Wno-deprecated)
+
+    # use gold linker if available
+    execute_process(
+      COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=gold -Wl,--version
+      ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+    if ("${LD_VERSION}" MATCHES "GNU gold")
+      append_flags(CMAKE_EXE_LINKER_FLAGS -fuse-ld=gold)
+    endif ()
+    unset(LD_VERSION)
  endif()

  # Generator expressions are not supported in add_definitions, use set_property instead
@@ -502,6 +533,15 @@ macro(setup_build_boilerplate)
      APPEND
      PROPERTY COMPILE_DEFINITIONS
      $<$<OR:$<BOOL:${profile}>,$<CONFIG:Release>,$<CONFIG:ReleaseClassic>>:NDEBUG>)
+  else()
+    # CMAKE_CXX_FLAGS_RELEASE is created by CMake for most / all generators
+    #  with defaults including /DNDEBUG or -DNDEBUG, and that value is stored
+    #  in the cache. Override that locally so that the cache value will be
+    #  avaiable if "assert" is ever changed.
+    STRING(REGEX REPLACE "[-/]DNDEBUG" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+    STRING(REGEX REPLACE "[-/]DNDEBUG" "" CMAKE_CXX_FLAGS_RELEASECLASSIC "${CMAKE_CXX_FLAGS_RELEASECLASSIC}")
+    STRING(REGEX REPLACE "[-/]DNDEBUG" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+    STRING(REGEX REPLACE "[-/]DNDEBUG" "" CMAKE_C_FLAGS_RELEASECLASSIC "${CMAKE_C_FLAGS_RELEASECLASSIC}")
  endif()

  if (NOT WIN32)
@@ -520,11 +560,19 @@ macro(setup_build_boilerplate)
      add_compile_options(
        -Wno-redeclared-class-member -Wno-mismatched-tags -Wno-deprecated-register)
      add_definitions(-DBOOST_ASIO_HAS_STD_ARRAY)
+
+      # use ldd linker if available
+      execute_process(
+        COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=lld -Wl,--version
+        ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+      if ("${LD_VERSION}" MATCHES "LLD")
+        append_flags(CMAKE_EXE_LINKER_FLAGS -fuse-ld=lld)
+      endif ()
+      unset(LD_VERSION)
    endif()

    if (APPLE)
-      add_definitions(-DBEAST_COMPILE_OBJECTIVE_CPP=1
-        -DNO_LOG_UNHANDLED_EXCEPTIONS)
+      add_definitions(-DBEAST_COMPILE_OBJECTIVE_CPP=1)
      add_compile_options(
        -Wno-deprecated -Wno-deprecated-declarations -Wno-unused-variable -Wno-unused-function)
    endif()
--- a/Builds/Test.py
+++ b/Builds/Test.py
@@ -123,6 +123,12 @@ parser.add_argument(
    help='delete all build artifacts after testing',
 )

+parser.add_argument(
+    '--quiet', '-q',
+    action='store_true',
+    help='Reduce output where possible (unit tests)',
+)
+
 parser.add_argument(
    'scons_args',
    default=(),
@@ -186,9 +192,12 @@ def run_tests(args):

            print('Unit tests for', target)
            testflag = '--unittest'
+            quiet = ''
            if ARGS.test:
                testflag += ('=' + ARGS.test)
-            resultcode, lines = shell(executable, (testflag,))
+            if ARGS.quiet:
+                quiet = '-q'
+            resultcode, lines = shell(executable, (testflag, quiet,))

            if resultcode:
                if not ARGS.verbose:
--- a/Builds/Ubuntu/install_boost.sh
+++ b/Builds/Ubuntu/install_boost.sh
@@ -4,7 +4,7 @@
 # This script builds boost with the correct ABI flags for ubuntu
 #

-version=59
+version=63
 patch=0

 if hash lsb_release 2>/dev/null; then
--- a/Builds/Ubuntu/install_rippled_depends_ubuntu.sh
+++ b/Builds/Ubuntu/install_rippled_depends_ubuntu.sh
@@ -44,7 +44,11 @@ if [ ${ubuntu_release} == "14.04" ] || [ ${ubuntu_release} == "15.04" ]; then
    exit 0
 fi

-if [ ${ubuntu_release} == "16.04" ] || [ ${ubuntu_release} == "15.10" ]; then
+# Test if 0th parameter has a version number greater than or equal to the 1st param
+function version_check() { test "$(printf '%s\n' "$@" | sort -V | tail -n 1)" == "$1"; }
+
+# this should work for versions greater than 15.10
+if version_check ${ubuntu_release} 15.10; then
    apt-get update
    apt-get -y upgrade
    apt-get -y install python-software-properties curl git scons ctags pkg-config protobuf-compiler libprotobuf-dev libssl-dev python-software-properties libboost-all-dev
--- a/Builds/VisualStudio2015/RippleD.vcxproj
+++ b/Builds/VisualStudio2015/RippleD.vcxproj
@@ -266,8 +266,6 @@
    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\core\async_completion.hpp">
    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\core\basic_streambuf.hpp">
-    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\core\bind_handler.hpp">
    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\core\buffer_cat.hpp">
@@ -320,8 +318,6 @@
    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\core\handler_ptr.hpp">
    </ClInclude>
-    <None Include="..\..\src\beast\include\beast\core\impl\basic_streambuf.ipp">
-    </None>
    <None Include="..\..\src\beast\include\beast\core\impl\consuming_buffers.ipp">
    </None>
    <None Include="..\..\src\beast\include\beast\core\impl\dynabuf_readstream.ipp">
@@ -330,6 +326,8 @@
    </None>
    <None Include="..\..\src\beast\include\beast\core\impl\static_streambuf.ipp">
    </None>
+    <None Include="..\..\src\beast\include\beast\core\impl\streambuf.ipp">
+    </None>
    <ClInclude Include="..\..\src\beast\include\beast\core\placeholders.hpp">
    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\core\prepare_buffer.hpp">
@@ -428,6 +426,8 @@
    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\mask.hpp">
    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\pmd_extension.hpp">
+    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\stream_base.hpp">
    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\utf8_checker.hpp">
@@ -464,6 +464,26 @@
    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\websocket\teardown.hpp">
    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\deflate_stream.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\detail\bitstream.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\detail\deflate_stream.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\detail\inflate_stream.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\detail\ranges.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\detail\window.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\error.hpp">
+    </ClInclude>
+    <None Include="..\..\src\beast\include\beast\zlib\impl\error.ipp">
+    </None>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\inflate_stream.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\zlib.hpp">
+    </ClInclude>
    <ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-32bit.h">
    </ClInclude>
    <ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-64bit.h">
@@ -1015,6 +1035,14 @@
    </ClCompile>
    <ClInclude Include="..\..\src\ripple\app\misc\CanonicalTXSet.h">
    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\detail\Work.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\detail\WorkBase.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\detail\WorkPlain.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\detail\WorkSSL.h">
+    </ClInclude>
    <ClInclude Include="..\..\src\ripple\app\misc\FeeVote.h">
    </ClInclude>
    <ClCompile Include="..\..\src\ripple\app\misc\FeeVoteImpl.cpp">
@@ -1041,6 +1069,10 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\ripple\app\misc\impl\Manifest.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\src\ripple\app\misc\impl\Transaction.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -1053,8 +1085,14 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\ripple\app\misc\impl\ValidatorSite.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
    <ClInclude Include="..\..\src\ripple\app\misc\LoadFeeTrack.h">
    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\Manifest.h">
+    </ClInclude>
    <ClCompile Include="..\..\src\ripple\app\misc\NetworkOPs.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -1083,6 +1121,8 @@
    </ClInclude>
    <ClInclude Include="..\..\src\ripple\app\misc\ValidatorList.h">
    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\ValidatorSite.h">
+    </ClInclude>
    <ClCompile Include="..\..\src\ripple\app\paths\AccountCurrencies.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -1285,6 +1325,12 @@
    </ClCompile>
    <ClInclude Include="..\..\src\ripple\app\tx\impl\CreateTicket.h">
    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\app\tx\impl\Escrow.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\app\tx\impl\Escrow.h">
+    </ClInclude>
    <ClInclude Include="..\..\src\ripple\app\tx\impl\Offer.h">
    </ClInclude>
    <ClCompile Include="..\..\src\ripple\app\tx\impl\OfferStream.cpp">
@@ -1335,12 +1381,6 @@
    </ClCompile>
    <ClInclude Include="..\..\src\ripple\app\tx\impl\SignerEntries.h">
    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\app\tx\impl\SusPay.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\app\tx\impl\SusPay.h">
-    </ClInclude>
    <ClCompile Include="..\..\src\ripple\app\tx\impl\Taker.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -1425,10 +1465,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\basics\impl\ThreadName.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\src\ripple\basics\impl\Time.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -1473,8 +1509,6 @@
    </ClInclude>
    <ClInclude Include="..\..\src\ripple\basics\TaggedCache.h">
    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\basics\ThreadName.h">
-    </ClInclude>
    <ClInclude Include="..\..\src\ripple\basics\ToString.h">
    </ClInclude>
    <ClInclude Include="..\..\src\ripple\basics\UnorderedContainers.h">
@@ -1541,6 +1575,11 @@
    <ClCompile Include="..\..\src\ripple\beast\core\core.unity.cpp">
      <ExcludedFromBuild>True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\ripple\beast\core\CurrentThreadName.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\beast\core\CurrentThreadName.h">
+    </ClInclude>
    <ClInclude Include="..\..\src\ripple\beast\core\LexicalCast.h">
    </ClInclude>
    <ClCompile Include="..\..\src\ripple\beast\core\linux_SystemStats.cpp">
@@ -1558,11 +1597,6 @@
    </ClInclude>
    <ClInclude Include="..\..\src\ripple\beast\core\PlatformConfig.h">
    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\beast\core\RelativeTime.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\beast\core\RelativeTime.h">
-    </ClInclude>
    <ClCompile Include="..\..\src\ripple\beast\core\SemanticVersion.cpp">
      <ExcludedFromBuild>True</ExcludedFromBuild>
    </ClCompile>
@@ -1581,11 +1615,6 @@
    </ClCompile>
    <ClInclude Include="..\..\src\ripple\beast\core\SystemStats.h">
    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\beast\core\Thread.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\beast\core\Thread.h">
-    </ClInclude>
    <ClCompile Include="..\..\src\ripple\beast\core\Time.cpp">
      <ExcludedFromBuild>True</ExcludedFromBuild>
    </ClCompile>
@@ -1792,36 +1821,26 @@
    </ClInclude>
    <ClInclude Include="..\..\src\ripple\conditions\Condition.h">
    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\conditions\Ed25519.h">
-    </ClInclude>
    <ClInclude Include="..\..\src\ripple\conditions\Fulfillment.h">
    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\conditions\impl\base64.h">
-    </ClInclude>
    <ClCompile Include="..\..\src\ripple\conditions\impl\Condition.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\conditions\impl\Ed25519.cpp">
+    <ClCompile Include="..\..\src\ripple\conditions\impl\error.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\conditions\impl\error.h">
+    </ClInclude>
    <ClCompile Include="..\..\src\ripple\conditions\impl\Fulfillment.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\conditions\impl\RsaSha256.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\conditions\impl\PreimageSha256.h">
+    </ClInclude>
    <ClInclude Include="..\..\src\ripple\conditions\impl\utils.h">
    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\conditions\PrefixSha256.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\conditions\PreimageSha256.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\conditions\RsaSha256.h">
-    </ClInclude>
    <ClInclude Include="..\..\src\ripple\core\Config.h">
    </ClInclude>
    <ClInclude Include="..\..\src\ripple\core\ConfigSections.h">
@@ -1902,7 +1921,7 @@
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\core\impl\ThreadEntry.cpp">
+    <ClCompile Include="..\..\src\ripple\core\impl\TerminateHandler.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -1940,7 +1959,7 @@
    </ClInclude>
    <ClInclude Include="..\..\src\ripple\core\Stoppable.h">
    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\core\ThreadEntry.h">
+    <ClInclude Include="..\..\src\ripple\core\TerminateHandler.h">
    </ClInclude>
    <ClInclude Include="..\..\src\ripple\core\TimeKeeper.h">
    </ClInclude>
@@ -2282,12 +2301,6 @@
    </ClCompile>
    <ClInclude Include="..\..\src\ripple\overlay\impl\ConnectAttempt.h">
    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\overlay\impl\Manifest.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\Manifest.h">
-    </ClInclude>
    <ClCompile Include="..\..\src\ripple\overlay\impl\Message.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -2954,14 +2967,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\UnlAdd.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\UnlDelete.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\src\ripple\rpc\handlers\UnlList.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -3854,6 +3859,10 @@
    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\include\secp256k1.h">
    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\include\secp256k1_ecdh.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\include\secp256k1_recovery.h">
+    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\ecdsa.h">
    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\ecdsa_impl.h">
@@ -3864,6 +3873,10 @@
    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\ecmult.h">
    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\ecmult_const.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\ecmult_const_impl.h">
+    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\ecmult_gen.h">
    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\ecmult_gen_impl.h">
@@ -3894,6 +3907,10 @@
    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\hash_impl.h">
    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\modules\ecdh\main_impl.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\modules\recovery\main_impl.h">
+    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\num.h">
    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\num_gmp.h">
@@ -3914,6 +3931,10 @@
    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\scalar_impl.h">
    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\scalar_low.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\scalar_low_impl.h">
+    </ClInclude>
    <ClCompile Include="..\..\src\secp256k1\src\secp256k1.c">
      <ExcludedFromBuild>True</ExcludedFromBuild>
    </ClCompile>
@@ -4156,6 +4177,10 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\app\Escrow_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\app\Flow_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4176,6 +4201,10 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\app\Manifest_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\app\MultiSign_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4220,10 +4249,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\src\test\app\SusPay_test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\src\test\app\Taker_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4248,6 +4273,10 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\app\ValidatorSite_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\basics\base_uint_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4280,6 +4309,10 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\basics\Slice_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\basics\StringUtilities_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4304,6 +4337,10 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\beast\beast_CurrentThreadName_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\beast\beast_Debug_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4352,22 +4389,10 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\src\test\conditions\Ed25519_test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\test\conditions\PrefixSha256_test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\src\test\conditions\PreimageSha256_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\src\test\conditions\RsaSha256_test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\src\test\core\Config_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4388,6 +4413,10 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\core\TerminateHandler_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\core\Workers_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4688,10 +4717,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\src\test\overlay\manifest_test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\src\test\overlay\short_read_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4768,6 +4793,8 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClInclude Include="..\..\src\test\quiet_reporter.h">
+    </ClInclude>
    <ClCompile Include="..\..\src\test\resource\Logic_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4800,6 +4827,10 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\rpc\GetCounts_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\rpc\JSONRPC_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -4848,6 +4879,10 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\rpc\TransactionEntry_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\server\ServerStatus_test.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
--- a/Builds/VisualStudio2015/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2015/RippleD.vcxproj.filters
@@ -43,6 +43,15 @@
    <Filter Include="beast\websocket\impl">
      <UniqueIdentifier>{A7FC9CC0-AB8D-4252-CCB2-B67F7BE99CF5}</UniqueIdentifier>
    </Filter>
+    <Filter Include="beast\zlib">
+      <UniqueIdentifier>{9455431B-BD48-F8C8-B53B-D9BCAF355341}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\zlib\detail">
+      <UniqueIdentifier>{508136FB-F124-7376-5A6F-F28EDEB18389}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\zlib\impl">
+      <UniqueIdentifier>{F85F4A52-7A2A-700C-4804-97FFC11E99FD}</UniqueIdentifier>
+    </Filter>
    <Filter Include="ed25519-donna">
      <UniqueIdentifier>{9DEED977-2072-A182-5BD9-CEBF206E8C91}</UniqueIdentifier>
    </Filter>
@@ -112,6 +121,9 @@
    <Filter Include="ripple\app\misc">
      <UniqueIdentifier>{5A1509B2-871B-A7AC-1E60-544D3F398741}</UniqueIdentifier>
    </Filter>
+    <Filter Include="ripple\app\misc\detail">
+      <UniqueIdentifier>{2919FCCC-A707-22B8-FFB4-89494A8AC070}</UniqueIdentifier>
+    </Filter>
    <Filter Include="ripple\app\misc\impl">
      <UniqueIdentifier>{C4BDB9F8-7DB7-E304-D286-098085D5D16E}</UniqueIdentifier>
    </Filter>
@@ -370,6 +382,15 @@
    <Filter Include="secp256k1\src">
      <UniqueIdentifier>{E25BE380-48B7-7EA9-DFD6-F38F1E8A22FF}</UniqueIdentifier>
    </Filter>
+    <Filter Include="secp256k1\src\modules">
+      <UniqueIdentifier>{6BE34C70-DCAB-96D1-487C-ADC692DA720B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="secp256k1\src\modules\ecdh">
+      <UniqueIdentifier>{46FCBB68-FE6A-0EB7-98C9-C695B05E6503}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="secp256k1\src\modules\recovery">
+      <UniqueIdentifier>{0B56B4A9-D9BC-B7FB-DD09-ADAF9DDE4895}</UniqueIdentifier>
+    </Filter>
    <Filter Include="snappy">
      <UniqueIdentifier>{26306562-F81D-B6CD-B192-22BA51E1A96B}</UniqueIdentifier>
    </Filter>
@@ -525,9 +546,6 @@
    <ClInclude Include="..\..\src\beast\include\beast\core\async_completion.hpp">
      <Filter>beast\core</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\core\basic_streambuf.hpp">
-      <Filter>beast\core</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\core\bind_handler.hpp">
      <Filter>beast\core</Filter>
    </ClInclude>
@@ -606,9 +624,6 @@
    <ClInclude Include="..\..\src\beast\include\beast\core\handler_ptr.hpp">
      <Filter>beast\core</Filter>
    </ClInclude>
-    <None Include="..\..\src\beast\include\beast\core\impl\basic_streambuf.ipp">
-      <Filter>beast\core\impl</Filter>
-    </None>
    <None Include="..\..\src\beast\include\beast\core\impl\consuming_buffers.ipp">
      <Filter>beast\core\impl</Filter>
    </None>
@@ -621,6 +636,9 @@
    <None Include="..\..\src\beast\include\beast\core\impl\static_streambuf.ipp">
      <Filter>beast\core\impl</Filter>
    </None>
+    <None Include="..\..\src\beast\include\beast\core\impl\streambuf.ipp">
+      <Filter>beast\core\impl</Filter>
+    </None>
    <ClInclude Include="..\..\src\beast\include\beast\core\placeholders.hpp">
      <Filter>beast\core</Filter>
    </ClInclude>
@@ -768,6 +786,9 @@
    <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\mask.hpp">
      <Filter>beast\websocket\detail</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\pmd_extension.hpp">
+      <Filter>beast\websocket\detail</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\stream_base.hpp">
      <Filter>beast\websocket\detail</Filter>
    </ClInclude>
@@ -822,6 +843,36 @@
    <ClInclude Include="..\..\src\beast\include\beast\websocket\teardown.hpp">
      <Filter>beast\websocket</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\deflate_stream.hpp">
+      <Filter>beast\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\detail\bitstream.hpp">
+      <Filter>beast\zlib\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\detail\deflate_stream.hpp">
+      <Filter>beast\zlib\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\detail\inflate_stream.hpp">
+      <Filter>beast\zlib\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\detail\ranges.hpp">
+      <Filter>beast\zlib\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\detail\window.hpp">
+      <Filter>beast\zlib\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\error.hpp">
+      <Filter>beast\zlib</Filter>
+    </ClInclude>
+    <None Include="..\..\src\beast\include\beast\zlib\impl\error.ipp">
+      <Filter>beast\zlib\impl</Filter>
+    </None>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\inflate_stream.hpp">
+      <Filter>beast\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\zlib\zlib.hpp">
+      <Filter>beast\zlib</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-32bit.h">
      <Filter>ed25519-donna</Filter>
    </ClInclude>
@@ -1497,6 +1548,18 @@
    <ClInclude Include="..\..\src\ripple\app\misc\CanonicalTXSet.h">
      <Filter>ripple\app\misc</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\detail\Work.h">
+      <Filter>ripple\app\misc\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\detail\WorkBase.h">
+      <Filter>ripple\app\misc\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\detail\WorkPlain.h">
+      <Filter>ripple\app\misc\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\detail\WorkSSL.h">
+      <Filter>ripple\app\misc\detail</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\ripple\app\misc\FeeVote.h">
      <Filter>ripple\app\misc</Filter>
    </ClInclude>
@@ -1521,6 +1584,9 @@
    <ClCompile Include="..\..\src\ripple\app\misc\impl\LoadFeeTrack.cpp">
      <Filter>ripple\app\misc\impl</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\ripple\app\misc\impl\Manifest.cpp">
+      <Filter>ripple\app\misc\impl</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\ripple\app\misc\impl\Transaction.cpp">
      <Filter>ripple\app\misc\impl</Filter>
    </ClCompile>
@@ -1530,9 +1596,15 @@
    <ClCompile Include="..\..\src\ripple\app\misc\impl\ValidatorList.cpp">
      <Filter>ripple\app\misc\impl</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\ripple\app\misc\impl\ValidatorSite.cpp">
+      <Filter>ripple\app\misc\impl</Filter>
+    </ClCompile>
    <ClInclude Include="..\..\src\ripple\app\misc\LoadFeeTrack.h">
      <Filter>ripple\app\misc</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\Manifest.h">
+      <Filter>ripple\app\misc</Filter>
+    </ClInclude>
    <ClCompile Include="..\..\src\ripple\app\misc\NetworkOPs.cpp">
      <Filter>ripple\app\misc</Filter>
    </ClCompile>
@@ -1566,6 +1638,9 @@
    <ClInclude Include="..\..\src\ripple\app\misc\ValidatorList.h">
      <Filter>ripple\app\misc</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\app\misc\ValidatorSite.h">
+      <Filter>ripple\app\misc</Filter>
+    </ClInclude>
    <ClCompile Include="..\..\src\ripple\app\paths\AccountCurrencies.cpp">
      <Filter>ripple\app\paths</Filter>
    </ClCompile>
@@ -1764,6 +1839,12 @@
    <ClInclude Include="..\..\src\ripple\app\tx\impl\CreateTicket.h">
      <Filter>ripple\app\tx\impl</Filter>
    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\app\tx\impl\Escrow.cpp">
+      <Filter>ripple\app\tx\impl</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\app\tx\impl\Escrow.h">
+      <Filter>ripple\app\tx\impl</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\ripple\app\tx\impl\Offer.h">
      <Filter>ripple\app\tx\impl</Filter>
    </ClInclude>
@@ -1815,12 +1896,6 @@
    <ClInclude Include="..\..\src\ripple\app\tx\impl\SignerEntries.h">
      <Filter>ripple\app\tx\impl</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\app\tx\impl\SusPay.cpp">
-      <Filter>ripple\app\tx\impl</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\app\tx\impl\SusPay.h">
-      <Filter>ripple\app\tx\impl</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\ripple\app\tx\impl\Taker.cpp">
      <Filter>ripple\app\tx\impl</Filter>
    </ClCompile>
@@ -1905,9 +1980,6 @@
    <ClCompile Include="..\..\src\ripple\basics\impl\Sustain.cpp">
      <Filter>ripple\basics\impl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\basics\impl\ThreadName.cpp">
-      <Filter>ripple\basics\impl</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\ripple\basics\impl\Time.cpp">
      <Filter>ripple\basics\impl</Filter>
    </ClCompile>
@@ -1968,9 +2040,6 @@
    <ClInclude Include="..\..\src\ripple\basics\TaggedCache.h">
      <Filter>ripple\basics</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\basics\ThreadName.h">
-      <Filter>ripple\basics</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\ripple\basics\ToString.h">
      <Filter>ripple\basics</Filter>
    </ClInclude>
@@ -2067,6 +2136,12 @@
    <ClCompile Include="..\..\src\ripple\beast\core\core.unity.cpp">
      <Filter>ripple\beast\core</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\ripple\beast\core\CurrentThreadName.cpp">
+      <Filter>ripple\beast\core</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\beast\core\CurrentThreadName.h">
+      <Filter>ripple\beast\core</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\ripple\beast\core\LexicalCast.h">
      <Filter>ripple\beast\core</Filter>
    </ClInclude>
@@ -2091,12 +2166,6 @@
    <ClInclude Include="..\..\src\ripple\beast\core\PlatformConfig.h">
      <Filter>ripple\beast\core</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\beast\core\RelativeTime.cpp">
-      <Filter>ripple\beast\core</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\beast\core\RelativeTime.h">
-      <Filter>ripple\beast\core</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\ripple\beast\core\SemanticVersion.cpp">
      <Filter>ripple\beast\core</Filter>
    </ClCompile>
@@ -2121,12 +2190,6 @@
    <ClInclude Include="..\..\src\ripple\beast\core\SystemStats.h">
      <Filter>ripple\beast\core</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\beast\core\Thread.cpp">
-      <Filter>ripple\beast\core</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\beast\core\Thread.h">
-      <Filter>ripple\beast\core</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\ripple\beast\core\Time.cpp">
      <Filter>ripple\beast\core</Filter>
    </ClCompile>
@@ -2376,39 +2439,27 @@
    <ClInclude Include="..\..\src\ripple\conditions\Condition.h">
      <Filter>ripple\conditions</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\conditions\Ed25519.h">
-      <Filter>ripple\conditions</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\ripple\conditions\Fulfillment.h">
      <Filter>ripple\conditions</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\conditions\impl\base64.h">
-      <Filter>ripple\conditions\impl</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\ripple\conditions\impl\Condition.cpp">
      <Filter>ripple\conditions\impl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\conditions\impl\Ed25519.cpp">
+    <ClCompile Include="..\..\src\ripple\conditions\impl\error.cpp">
      <Filter>ripple\conditions\impl</Filter>
    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\conditions\impl\error.h">
+      <Filter>ripple\conditions\impl</Filter>
+    </ClInclude>
    <ClCompile Include="..\..\src\ripple\conditions\impl\Fulfillment.cpp">
      <Filter>ripple\conditions\impl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\conditions\impl\RsaSha256.cpp">
+    <ClInclude Include="..\..\src\ripple\conditions\impl\PreimageSha256.h">
      <Filter>ripple\conditions\impl</Filter>
-    </ClCompile>
+    </ClInclude>
    <ClInclude Include="..\..\src\ripple\conditions\impl\utils.h">
      <Filter>ripple\conditions\impl</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\conditions\PrefixSha256.h">
-      <Filter>ripple\conditions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\conditions\PreimageSha256.h">
-      <Filter>ripple\conditions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\conditions\RsaSha256.h">
-      <Filter>ripple\conditions</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\ripple\core\Config.h">
      <Filter>ripple\core</Filter>
    </ClInclude>
@@ -2463,7 +2514,7 @@
    <ClCompile Include="..\..\src\ripple\core\impl\Stoppable.cpp">
      <Filter>ripple\core\impl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\core\impl\ThreadEntry.cpp">
+    <ClCompile Include="..\..\src\ripple\core\impl\TerminateHandler.cpp">
      <Filter>ripple\core\impl</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\ripple\core\impl\TimeKeeper.cpp">
@@ -2502,7 +2553,7 @@
    <ClInclude Include="..\..\src\ripple\core\Stoppable.h">
      <Filter>ripple\core</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\core\ThreadEntry.h">
+    <ClInclude Include="..\..\src\ripple\core\TerminateHandler.h">
      <Filter>ripple\core</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\ripple\core\TimeKeeper.h">
@@ -2838,12 +2889,6 @@
    <ClInclude Include="..\..\src\ripple\overlay\impl\ConnectAttempt.h">
      <Filter>ripple\overlay\impl</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\overlay\impl\Manifest.cpp">
-      <Filter>ripple\overlay\impl</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\Manifest.h">
-      <Filter>ripple\overlay\impl</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\ripple\overlay\impl\Message.cpp">
      <Filter>ripple\overlay\impl</Filter>
    </ClCompile>
@@ -3498,12 +3543,6 @@
    <ClCompile Include="..\..\src\ripple\rpc\handlers\TxHistory.cpp">
      <Filter>ripple\rpc\handlers</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\UnlAdd.cpp">
-      <Filter>ripple\rpc\handlers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\UnlDelete.cpp">
-      <Filter>ripple\rpc\handlers</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\ripple\rpc\handlers\UnlList.cpp">
      <Filter>ripple\rpc\handlers</Filter>
    </ClCompile>
@@ -4521,6 +4560,12 @@
    <ClInclude Include="..\..\src\secp256k1\include\secp256k1.h">
      <Filter>secp256k1\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\include\secp256k1_ecdh.h">
+      <Filter>secp256k1\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\include\secp256k1_recovery.h">
+      <Filter>secp256k1\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\ecdsa.h">
      <Filter>secp256k1\src</Filter>
    </ClInclude>
@@ -4536,6 +4581,12 @@
    <ClInclude Include="..\..\src\secp256k1\src\ecmult.h">
      <Filter>secp256k1\src</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\ecmult_const.h">
+      <Filter>secp256k1\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\ecmult_const_impl.h">
+      <Filter>secp256k1\src</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\ecmult_gen.h">
      <Filter>secp256k1\src</Filter>
    </ClInclude>
@@ -4581,6 +4632,12 @@
    <ClInclude Include="..\..\src\secp256k1\src\hash_impl.h">
      <Filter>secp256k1\src</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\modules\ecdh\main_impl.h">
+      <Filter>secp256k1\src\modules\ecdh</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\modules\recovery\main_impl.h">
+      <Filter>secp256k1\src\modules\recovery</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\secp256k1\src\num.h">
      <Filter>secp256k1\src</Filter>
    </ClInclude>
@@ -4611,6 +4668,12 @@
    <ClInclude Include="..\..\src\secp256k1\src\scalar_impl.h">
      <Filter>secp256k1\src</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\scalar_low.h">
+      <Filter>secp256k1\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\secp256k1\src\scalar_low_impl.h">
+      <Filter>secp256k1\src</Filter>
+    </ClInclude>
    <ClCompile Include="..\..\src\secp256k1\src\secp256k1.c">
      <Filter>secp256k1\src</Filter>
    </ClCompile>
@@ -4908,6 +4971,9 @@
    <ClCompile Include="..\..\src\test\app\Discrepancy_test.cpp">
      <Filter>test\app</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\app\Escrow_test.cpp">
+      <Filter>test\app</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\app\Flow_test.cpp">
      <Filter>test\app</Filter>
    </ClCompile>
@@ -4923,6 +4989,9 @@
    <ClCompile Include="..\..\src\test\app\LoadFeeTrack_test.cpp">
      <Filter>test\app</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\app\Manifest_test.cpp">
+      <Filter>test\app</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\app\MultiSign_test.cpp">
      <Filter>test\app</Filter>
    </ClCompile>
@@ -4956,9 +5025,6 @@
    <ClCompile Include="..\..\src\test\app\SHAMapStore_test.cpp">
      <Filter>test\app</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\test\app\SusPay_test.cpp">
-      <Filter>test\app</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\test\app\Taker_test.cpp">
      <Filter>test\app</Filter>
    </ClCompile>
@@ -4977,6 +5043,9 @@
    <ClCompile Include="..\..\src\test\app\ValidatorList_test.cpp">
      <Filter>test\app</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\app\ValidatorSite_test.cpp">
+      <Filter>test\app</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\basics\base_uint_test.cpp">
      <Filter>test\basics</Filter>
    </ClCompile>
@@ -5001,6 +5070,9 @@
    <ClCompile Include="..\..\src\test\basics\RangeSet_test.cpp">
      <Filter>test\basics</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\basics\Slice_test.cpp">
+      <Filter>test\basics</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\basics\StringUtilities_test.cpp">
      <Filter>test\basics</Filter>
    </ClCompile>
@@ -5019,6 +5091,9 @@
    <ClCompile Include="..\..\src\test\beast\beast_basic_seconds_clock_test.cpp">
      <Filter>test\beast</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\beast\beast_CurrentThreadName_test.cpp">
+      <Filter>test\beast</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\beast\beast_Debug_test.cpp">
      <Filter>test\beast</Filter>
    </ClCompile>
@@ -5055,18 +5130,9 @@
    <ClCompile Include="..\..\src\test\beast\SemanticVersion_test.cpp">
      <Filter>test\beast</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\test\conditions\Ed25519_test.cpp">
-      <Filter>test\conditions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\test\conditions\PrefixSha256_test.cpp">
-      <Filter>test\conditions</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\test\conditions\PreimageSha256_test.cpp">
      <Filter>test\conditions</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\test\conditions\RsaSha256_test.cpp">
-      <Filter>test\conditions</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\test\core\Config_test.cpp">
      <Filter>test\core</Filter>
    </ClCompile>
@@ -5082,6 +5148,9 @@
    <ClCompile Include="..\..\src\test\core\Stoppable_test.cpp">
      <Filter>test\core</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\core\TerminateHandler_test.cpp">
+      <Filter>test\core</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\core\Workers_test.cpp">
      <Filter>test\core</Filter>
    </ClCompile>
@@ -5364,9 +5433,6 @@
    <ClCompile Include="..\..\src\test\overlay\cluster_test.cpp">
      <Filter>test\overlay</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\test\overlay\manifest_test.cpp">
-      <Filter>test\overlay</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\test\overlay\short_read_test.cpp">
      <Filter>test\overlay</Filter>
    </ClCompile>
@@ -5424,6 +5490,9 @@
    <ClCompile Include="..\..\src\test\protocol\XRPAmount_test.cpp">
      <Filter>test\protocol</Filter>
    </ClCompile>
+    <ClInclude Include="..\..\src\test\quiet_reporter.h">
+      <Filter>test</Filter>
+    </ClInclude>
    <ClCompile Include="..\..\src\test\resource\Logic_test.cpp">
      <Filter>test\resource</Filter>
    </ClCompile>
@@ -5448,6 +5517,9 @@
    <ClCompile Include="..\..\src\test\rpc\GatewayBalances_test.cpp">
      <Filter>test\rpc</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\rpc\GetCounts_test.cpp">
+      <Filter>test\rpc</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\rpc\JSONRPC_test.cpp">
      <Filter>test\rpc</Filter>
    </ClCompile>
@@ -5484,6 +5556,9 @@
    <ClCompile Include="..\..\src\test\rpc\Subscribe_test.cpp">
      <Filter>test\rpc</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\test\rpc\TransactionEntry_test.cpp">
+      <Filter>test\rpc</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\test\server\ServerStatus_test.cpp">
      <Filter>test\server</Filter>
    </ClCompile>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,22 @@

 ############################################################

+#########################################################
+# CMAKE_C_COMPILER and CMAKE_CXX_COMPILER must be defined
+# before the project statement; However, the project
+# statement will clear CMAKE_BUILD_TYPE. CACHE variables,
+# along with the order of this code, are used to work
+# around these constraints.
+#
+# Don't put any code above or in this block, unless it
+# has similar constraints.
 cmake_minimum_required(VERSION 3.1.0)
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Builds/CMake")
+include(CMakeFuncs)
+set(openssl_min 1.0.2)
+parse_target()
+project(rippled)
+#########################################################

 if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
  set(dir "build")
@@ -82,22 +97,8 @@ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio" AND
    -G\"${CMAKE_GENERATOR} Win64\"")
 endif()

-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Builds/CMake")
-include(CMakeFuncs)
-
-set(openssl_min 1.0.2)
-
-parse_target()
-
-if (NOT DEFINED unity)
-  set(unity true)
-  set(nonunity false)
-endif()
-
 setup_build_cache()

-project(rippled)
-
 if(nonunity)
    get_cmake_property(allvars VARIABLES)
    string(REGEX MATCHALL "[^;]*(DEBUG|RELEASE)[^;]*" matchvars "${allvars}")
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,8 +4,215 @@ This document contains the release notes for `rippled`, the reference server
 implementation of the Ripple protocol. To learn more about how to build and
 run a `rippled` server, visit https://ripple.com/build/rippled-setup/

+If you are using Red Hat Enterprise Linux 7 or CentOS 7, you can [update using `yum`](https://ripple.com/build/rippled-setup/#updating-rippled). For other platforms, please [compile from source](https://wiki.ripple.com/Rippled_build_instructions).
+
+
 # Releases

+## Version 0.60.0
+
+The `rippled` 0.60.0 release introduces several enhancements that improve the reliability and scalability of the Ripple Consensus Ledger (RCL), including features that add ledger interoperability by improving Interledger Protocol compatibility. Ripple recommends that all server operators upgrade to version 0.60.0 by Thursday, 2017-03-30, for service continuity.
+
+Highlights of this release include:
+
+- `Escrow` (previously called `SusPay`) which permits users to cryptographically escrow XRP on RCL with an expiration date, and optionally a hashlock crypto-condition. Ripple expects Escrow to be enabled via an Amendment named [`Escrow`](https://ripple.com/build/amendments/#escrow) on Thursday, 2017-03-30. See below for details.
+- Dynamic UNL Lite, which allows `rippled` to automatically adjust which validators it trusts based on recommended lists from trusted publishers.
+
+**New and Updated Features**
+
+- Add `Escrow` support (#2039)
+- Dynamize trusted validator list and quorum (#1842)
+- Simplify fee handling during transaction submission (#1992)
+- Publish server stream when fee changes (#2016)
+- Replace manifest with validator token (#1975)
+- Add validator key revocations (#2019)
+- Add `SecretKey` comparison operator (#2004)
+- Reduce `LEDGER_MIN_CONSENSUS` (#2013)
+- Update libsecp256k1 and Beast B30 (#1983)
+- Make `Config` extensible via lambda (#1993)
+- WebSocket permessage-deflate integration (#1995)
+- Do not close socket on a foreign thread (#2014)
+- Update build scripts to support latest boost and ubuntu distros (#1997)
+- Handle protoc targets in scons ninja build (#2022)
+- Specify syntax version for ripple.proto file (#2007)
+- Eliminate protocol header dependency (#1962)
+- Use gnu gold or clang lld linkers if available (#2031)
+- Add tests for `lookupLedger` (#1989)
+- Add unit test for `get_counts` RPC method (#2011)
+- Add test for `transaction_entry` request (#2017)
+- Unit tests of RPC "sign" (#2010)
+- Add failure only unit test reporter (#2018)
+
+**Bug Fixes**
+
+- Enforce rippling constraints during payments (#2049)
+- Fix limiting step re-execute bug (#1936)
+- Make "wss" work the same as "wss2" (#2033)
+- Config test uses unique directories for each test (#1984)
+- Check for malformed public key on payment channel (#2027)
+- Send a websocket ping before timing out in server (#2035)
+
+
+## Version 0.50.3
+
+The `rippled` 0.50.3 release corrects a reported exploit that would allow a combination of trust lines and order books in a payment path to bypass the blocking effect of the [`NoRipple`](https://ripple.com/build/understanding-the-noripple-flag/) flag. Ripple recommends that all server operators immediately upgrade to version 0.50.3.
+
+**New and Updated Features**
+
+This release has no new features.
+
+**Bug Fixes**
+
+Correct a reported exploit that would allow a combination of trust lines and order books in a payment path to bypass the blocking effect of the “NoRipple” flag.
+
+
+## Version 0.50.2
+
+The `rippled` 0.50.2 release adjusts the default TLS cipher list and corrects a flaw that would not allow an SSL handshake to properly complete if the port was configured using the `wss` keyword. Ripple recommends upgrading to 0.50.2 only if server operators are running rippled servers that accept client connections over TLS.
+
+**New and Updated Features**
+
+This release has no new features.
+
+**Bug Fixes**
+
+Adjust the default cipher list and correct a flaw that would not allow an SSL handshake to properly complete if the port was configured using the `wss` keyword (#1985)
+
+
+## Version 0.50.0
+
+The `rippled` 0.50.0 release includes TickSize, which allows gateways to set a "tick size" for assets they issue to help promote faster price discovery and deeper liquidity, as well as reduce transaction spam and ledger churn on RCL. Ripple expects TickSize to be enabled via an Amendment called TickSize on Tuesday, 2017-02-21.
+
+You can [update to the new version](https://ripple.com/build/rippled-setup/#updating-rippled) on Red Hat Enterprise Linux 7 or CentOS 7 using yum. For other platforms, please [compile the new version from source](https://wiki.ripple.com/Rippled_build_instructions).
+
+**New and Updated Features**
+
+**Tick Size**
+
+Currently, offers on RCL can differ by as little as one part in a quadrillion. This means that there is essentially no value to placing an offer early, as an offer placed later at a microscopically better price gets priority over it. The [TickSize](https://ripple.com/build/amendments/#ticksize) Amendment solves this problem by introducing a minimum tick size that a price must move for an offer to be considered to be at a better price. The tick size is controlled by the issuers of the assets involved.
+
+This change lets issuers quantize the exchange rates of offers to use a specified number of significant digits. Gateways must enable a TickSize on their account for this feature to benefit them. A single AccountSet transaction may set a `TickSize` parameter. Legal values are 0 and 3-15 inclusive. Zero removes the setting. 3-15 allow that many decimal digits of precision in the pricing of offers for assets issued by this account. It will still be possible to place an offer to buy or sell any amount of an asset and the offer will still keep that amount as exactly as it does now. If an offer involves two assets that each have a tick size, the smaller number of significant figures (larger ticks) controls.
+
+For asset pairs with XRP, the tick size imposed, if any, is the tick size of the issuer of the non-XRP asset. For asset pairs without XRP, the tick size imposed, if any, is the smaller of the two issuer's configured tick sizes.
+
+The tick size is imposed by rounding the offer quality down to the nearest tick and recomputing the non-critical side of the offer. For a buy, the amount offered is rounded down. For a sell, the amount charged is rounded up.
+
+The primary expected benefit of the TickSize amendment is the reduction of bots fighting over the tip of the order book, which means:
+- Quicker price discovery as outpricing someone by a microscopic amount is made impossible (currently bots can spend hours outbidding each other with no significant price movement)
+- A reduction in offer creation and cancellation spam
+- Traders can't outbid by a microscopic amount
+- More offers left on the books as priority
+
+We also expect larger tick sizes to benefit market makers in the following ways:
+- They increase the delta between the fair market value and the trade price, ultimately reducing spreads
+- They prevent market makers from consuming each other's offers due to slight changes in perceived fair market value, which promotes liquidity
+- They promote faster price discovery by reducing the back and forths required to move the price by traders who don't want to move the price more than they need to
+- They reduce transaction spam by reducing fighting over the tip of the order book and reducing the need to change offers due to slight price changes
+- They reduce ledger churn and metadata sizes by reducing the number of indexes each order book must have
+- They allow the order book as presented to traders to better reflect the actual book since these presentations are inevitably aggregated into ticks
+
+**Hardened TLS configuration**
+
+This release updates the default TLS configuration for rippled. The new release supports only 2048-bit DH parameters and defines a new default set of modern ciphers to use, removing support for ciphers and hash functions that are no longer considered secure.
+
+Server administrators who wish to have different settings can configure custom global and per-port cipher suites in the configuration file using the `ssl_ciphers` directive.
+
+**0.50.0 Change Log**
+
+Remove websocketpp support (#1910)
+
+Increase OpenSSL requirements & harden default TLS cipher suites (#1913)
+
+Move test support sources out of ripple directory (#1916)
+
+Enhance ledger header RPC commands (#1918)
+
+Add support for tick sizes (#1922)
+
+Port discrepancy-test.coffee to c++ (#1930)
+
+Remove redundant call to `clearNeedNetworkLedger` (#1931)
+
+Port freeze-test.coffee to C++ unit test. (#1934)
+
+Fix CMake docs target to work if `BOOST_ROOT` is not set (#1937)
+
+Improve setup for account_tx paging test (#1942)
+
+Eliminate npm tests (#1943)
+
+Port uniport js test to cpp (#1944)
+
+Enable amendments in genesis ledger (#1944)
+
+Trim ledger data in Discrepancy_test (#1948)
+
+Add `current_ledger` field to `fee` result (#1949)
+
+Cleanup unit test support code (#1953)
+
+Add ledger save / load tests (#1955)
+
+Remove unused websocket files (#1957)
+
+Update RPC handler role/usage (#1966)
+
+**Bug Fixes**
+
+Validator's manifest not forwarded beyond directly connected peers (#1919)
+
+**Upcoming Features**
+
+We expect the previously announced Suspended Payments feature, which introduces new transaction types to the Ripple protocol that will permit users to cryptographically escrow XRP on RCL, to be enabled via the [SusPay](https://ripple.com/build/amendments/#suspay) Amendment on Tuesday, 2017-02-21.
+
+Also, we expect support for crypto-conditions, which are signature-like structures that can be used with suspended payments to support ILP integration, to be included in the next rippled release scheduled for March.
+
+Lastly, we do not have an update on the previously announced changes to the hash tree structure that rippled uses to represent a ledger, called [SHAMapV2](https://ripple.com/build/amendments/#shamapv2). At the time of activation, this amendment will require brief scheduled allowable unavailability while the changes to the hash tree structure are computed by the network. We will keep the community updated as we progress towards this date (TBA).
+
+
+## Version 0.40.1
+
+The `rippled` 0.40.1 release  increases SQLite database limits in all rippled servers. Ripple recommends upgrading to 0.40.1 only if server operators are running rippled servers with full-history of the ledger. There are no new or updated features in the 0.40.1 release.
+
+You can update to the new version on Red Hat Enterprise Linux 7 or CentOS 7 using yum. For other platforms, please compile the new version from source.
+
+**New and Updated Features**
+
+This release has no new features.
+
+**Bug Fixes**
+
+Increase SQLite database limits to prevent full-history servers from crashing when restarting. (#1961)
+
+## Version 0.40.0
+
+The `rippled` 0.40.0 release includes Suspended Payments, a new transaction type on the Ripple network that functions similar to an escrow service, which permits users cryptographically escrow XRP on RCL with an expiration date. Ripple expects Suspended Payments to be enabled via an Amendment named [SusPay](https://ripple.com/build/amendments/#suspay) on Tuesday, 2017-01-17.
+
+You can update to the new version on Red Hat Enterprise Linux 7 or CentOS 7 using yum. For other platforms, please compile the new version from source.
+
+**New and Updated Features**
+
+Previously, Ripple announced the introduction of Payment Channels during the release of rippled version 0.33.0, which permit scalable, off-ledger checkpoints of high volume, low value payments flowing in a single direction. This was the first step in a multi-phase effort to make RCL more scalable and to support Interledger Protocol (ILP). Ripple expects Payment Channels to be enabled via an Amendment called [PayChan](https://ripple.com/build/amendments/#paychan) on a future date to be determined.
+
+In the second phase towards making RCL more scalable and compatible with ILP, Ripple is introducing Suspended Payments, a new transaction type on the Ripple network that functions similar to an escrow service, which permits users to cryptographically escrow XRP on RCL with an expiration date. Ripple expects Suspended Payments to be enabled via an Amendment named [SusPay](https://ripple.com/build/amendments/#suspay) on Tuesday, 2017-01-17.
+
+A Suspended Payment can be created, which deducts the funds from the sending account. It can then be either fulfilled or canceled. It can only be fulfilled if the fulfillment transaction makes it into a ledger with a CloseTime lower than the expiry date of the transaction. It can be canceled with a transaction that makes it into a ledger with a CloseTime greater than the expiry date of the transaction.
+
+In the third phase towards making RCL more scalable and compatible with ILP, Ripple plans to introduce additional library support for crypto-conditions, which are distributable event descriptions written in a standard format that describe how to recognize a fulfillment message without saying exactly what the fulfillment is. Fulfillments are cryptographically verifiable messages that prove an event occurred. If you transmit a fulfillment, then everyone who has the condition can agree that the condition has been met. Fulfillment requires the submission of a signature that matches the condition (message hash and public key). This format supports multiple algorithms, including different hash functions and cryptographic signing schemes. Crypto-conditions can be nested in multiple levels, with each level possibly having multiple signatures.
+
+Lastly, we do not have an update on the previously announced changes to the hash tree structure that rippled uses to represent a ledger, called [SHAMapV2](https://ripple.com/build/amendments/#shamapv2). This will require brief scheduled allowable downtime while the changes to the hash tree structure are propagated by the network. We will keep the community updated as we progress towards this date (TBA).
+
+Consensus refactor (#1874)
+
+Bug Fixes
+
+Correct an issue in payment flow code that did not remove an unfunded offer (#1860)
+
+Sign validator manifests with both ephemeral and master keys (#1865)
+
+Correctly parse multi-buffer JSON messages (#1862)
+
+
 ## Version 0.33.0

 The `rippled` 0.33.0 release includes an improved version of the payment code, which we expect to be activated via Amendment on Wednesday, 2016-10-20 with the name [Flow](https://ripple.com/build/amendments/#flow). We are also introducing XRP Payment Channels, a new structure in the ledger designed to support [Interledger Protocol](https://interledger.org/) trust lines as balances get substantial, which we expect to be activated via Amendment on a future date (TBA) with the name [PayChan](https://ripple.com/build/amendments/#paychan). Lastly, we will be introducing changes to the hash tree structure that rippled uses to represent a ledger, which we expect to be available via Amendment on a future date (TBA) with the name [SHAMapV2](https://ripple.com/build/amendments/#shamapv2).
--- a/23
+++ b/23
@@ -392,8 +392,6 @@ def config_base(env):
            env.Prepend(LIBPATH=['%s/lib' % openssl])
        except:
            pass
-        if not 'vcxproj' in COMMAND_LINE_TARGETS:
-            env.Append(CPPDEFINES=['NO_LOG_UNHANDLED_EXCEPTIONS'])

    # handle command-line arguments
    profile_jemalloc = ARGUMENTS.get('profile-jemalloc')
@@ -554,6 +552,13 @@ def config_env(toolchain, variant, env):
        if toolchain == 'clang':
            env.Append(CCFLAGS=['-Wno-redeclared-class-member'])
            env.Append(CPPDEFINES=['BOOST_ASIO_HAS_STD_ARRAY'])
+            try:
+                ldd_ver = subprocess.check_output([env['CLANG_CXX'], '-fuse-ld=lld', '-Wl,--version'],
+                                            stderr=subprocess.STDOUT).strip()
+                # have lld
+                env.Append(LINKFLAGS=['-fuse-ld=lld'])
+            except:
+                pass

        env.Append(CXXFLAGS=[
            '-frtti',
@@ -573,7 +578,6 @@ def config_env(toolchain, variant, env):
            env.Append(CCFLAGS=[
                '-Wno-deprecated',
                '-Wno-deprecated-declarations',
-                '-Wno-unused-variable',
                '-Wno-unused-function',
                ])
        else:
@@ -586,11 +590,17 @@ def config_env(toolchain, variant, env):
                    '-D_GLIBCXX_USE_CXX11_ABI' : 0
                })
            if toolchain == 'gcc':
-
                env.Append(CCFLAGS=[
                    '-Wno-unused-but-set-variable',
                    '-Wno-deprecated',
                    ])
+                try:
+                    ldd_ver = subprocess.check_output([env['GNU_CXX'], '-fuse-ld=gold', '-Wl,--version'],
+                                                      stderr=subprocess.STDOUT).strip()
+                    # have ld.gold
+                    env.Append(LINKFLAGS=['-fuse-ld=gold'])
+                except:
+                    pass

        boost_libs = [
            # resist the temptation to alphabetize these. coroutine
@@ -965,7 +975,7 @@ def get_classic_sources(toolchain):
    append_sources(result, *list_sources('src/test/shamap', '.cpp'))
    append_sources(result, *list_sources('src/test/jtx', '.cpp'))

-    
+
    if use_shp(toolchain):
        cc_flags = {'CCFLAGS': ['--system-header-prefix=rocksdb2']}
    else:
@@ -1234,7 +1244,8 @@ for tu_style in ['classic', 'unity']:
            if should_build_ninja(tu_style, toolchain, variant):
                print('Generating ninja: {}:{}:{}'.format(tu_style, toolchain, variant))
                scons_to_ninja.GenerateNinjaFile(
-                    [object_builder.env] + object_builder.child_envs,
+                     # add base env last to ensure protoc targets are added
+                    [object_builder.env] + object_builder.child_envs + [base],
                    dest_file='build.ninja')

 for key, value in aliases.iteritems():
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -127,7 +127,7 @@ test_script:
  - ps: |
        & {
          # Run the rippled unit tests
-          & $exe --unittest
+          & $exe --unittest --quiet --unittest-log
          # https://connect.microsoft.com/PowerShell/feedback/details/751703/option-to-stop-script-if-command-line-exe-fails
          if ($LastExitCode -ne 0) { throw "Unit tests failed" }
        }
--- a/bin/ci/ubuntu/build-and-test.sh
+++ b/bin/ci/ubuntu/build-and-test.sh
@@ -43,7 +43,7 @@ rm -f build/${APP}
 ldd $APP_PATH

 if [[ ${APP} == "rippled" ]]; then
-  export APP_ARGS="--unittest"
+  export APP_ARGS="--unittest --quiet --unittest-log"
  # Only report on src/ripple files
  export LCOV_FILES="*/src/ripple/*"
  # Nothing to explicitly exclude
@@ -70,7 +70,7 @@ gdb -return-child-result -quiet -batch \
    -ex run \
    -ex "thread apply all backtrace full" \
    -ex "quit" \
-    --args $APP_PATH --unittest
+    --args $APP_PATH --unittest --quiet --unittest-log

 if [[ $TARGET == "coverage" ]]; then
  # Create test coverage data file
--- a/bin/python/ripple/util/Sign.py
+++ b/bin/python/ripple/util/Sign.py
@@ -2,7 +2,7 @@

 from __future__ import print_function

-import base64, os, random, struct, sys
+import base64, binascii, json, os, random, struct, sys
 import ed25519
 import ecdsa
 import hashlib
@@ -188,9 +188,14 @@ def perform_check(s, print=print):

 def perform_sign(
        seq, validation_pk_human, validation_sk_human, master_sk_human, print=print):
-    print('[validation_manifest]')
-    print(wrap(get_signature(
-        int(seq), validation_pk_human, validation_sk_human, master_sk_human)))
+    manifest = get_signature(
+            int(seq), validation_pk_human, validation_sk_human, master_sk_human)
+
+    print('[validator_token]')
+    print(wrap(base64.b64encode(json.dumps({
+        "validation_secret_key": binascii.b2a_hex(Base58.decode_version(validation_sk_human)[1]),
+        "manifest": manifest},
+        separators=(',', ':')))))

 def perform_verify(
        seq, validation_pk_human, master_pk_human, signature, print=print):
--- a/bin/python/ripple/util/ValidatorManifestTest.py
+++ b/bin/python/ripple/util/ValidatorManifestTest.py
@@ -104,12 +104,7 @@ n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C    RL3
 n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS    RL4
 n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA    RL5

-[validation_quorum]
-3
-
-[validation_seed]
-{validation_seed}
-#vaidation_public_key: {validation_public_key}
+#validation_public_key: {validation_public_key}

 # Other rippled's trusting this validator need this key
 [validator_keys]
@@ -122,8 +117,8 @@ n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA    RL5
 expire = 1
 auto_connect = 1

-[validation_manifest]
-{validation_manifest}
+[validator_token]
+{validator_token}

 [rpc_startup]
 {{ "command": "log_level", "severity": "debug" }}
@@ -204,7 +199,7 @@ def sign_manifest(seq, validation_pk, master_secret):
    result = []
    for l in r.splitlines():
        l.strip()
-        if not l or l == '[validation_manifest]':
+        if not l or l == '[validator_token]':
            continue
        result.append(l)
    return '\n'.join(result)
@@ -433,7 +428,7 @@ def new_config_ephemeral_key(
        if rm_dbs and os.path.exists(db_dir):
            shutil.rmtree(db_dir)
            os.makedirs(db_dir)
-        # replace the validation_manifest section with `signed`
+        # replace the validator_token section with `signed`
        bak = config_file + '.bak'
        if is_windows() and os.path.isfile(bak):
            os.remove(bak)
@@ -443,7 +438,7 @@ def new_config_ephemeral_key(
            with open(config_file, 'w') as out:
                for l in src:
                    sl = l.strip()
-                    if not in_manifest and sl == '[validation_manifest]':
+                    if not in_manifest and sl == '[validator_token]':
                        in_manifest = True
                    elif in_manifest:
                        if sl.startswith('[') or sl.startswith('#'):
@@ -542,7 +537,7 @@ def get_configs(manifest_seq):
        sibling_ip = '127.0.0.1'
        sibling_port = port_nums[sibling_index][1]
        d = {
-            'validation_manifest': s,
+            'validator_token': s,
            'all_validator_keys': all_validator_keys,
            'node_db_type': node_db_type,
            'node_db_path': node_db_path,
--- a/bin/python/ripple/util/test_ConfigFile.py
+++ b/bin/python/ripple/util/test_ConfigFile.py
@@ -45,7 +45,6 @@ RESULT = {
    'websocket_public_port': '5206',
    'peer_ip': '0.0.0.0',
    'rpc_port': '5205',
-    'validation_quorum': '3',
    'websocket_ip': '127.0.0.1'}

 FULL = """
@@ -131,10 +130,6 @@ n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C	RL3
 n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS	RL4
 n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA	RL5

-# Ditto.
-[validation_quorum]
-3
-
 [validation_seed]
 sh1T8T9yGuV7Jb6DPhqSzdU2s5LcV

--- a/bin/python/ripple/util/test_Sign.py
+++ b/bin/python/ripple/util/test_Sign.py
@@ -141,9 +141,13 @@ class test_Sign(TestCase):
        Sign.perform_sign(self.SEQUENCE, public, private, private, print=self.print)
        self.assertEquals(
            self.results,
-            [[['[validation_manifest]'], {}],
-             [['JAAAABdxIe2DIKUZd9jDjKikknxnDfWCHkSXYZReFenvsmoVCdIw6nMhAnZ2dnZ2dnZ2dnZ2\n'
-               'dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dkYwRAIgXyobHA8sDQxmDJNLE6HIaARlzvcd79/wT068\n'
-               'e113gUkCIHkI540JQT2LHwAD7/y3wFE5X3lEXMfgZRkpLZTxkpticBJAzo5VrUEr0U47sHvu\n'
-               'IjbrINLCTM6pAScA899G9kpMWexbXv1ceIbTP5JH1HyQmsZsROTeHR0irojvYgx7JLaiAA=='],
+            [[['[validator_token]'], {}],
+             [['eyJ2YWxpZGF0aW9uX3ByaXZhdGVfa2V5IjoiNmI2YjZiNmI2YjZiNmI2YjZiNmI2Yj\n'
+               'ZiNmI2YjZiNmI2YjZiNmI2YjZiNmI2YjZiNmI2YjZiNmI2YjZiNmI2YiIsIm1hbmlm\n'
+               'ZXN0IjoiSkFBQUFCZHhJZTJESUtVWmQ5akRqS2lra254bkRmV0NIa1NYWVpSZUZlbn\n'
+               'ZzbW9WQ2RJdzZuTWhBbloyZG5aMmRuWjJkbloyZG5aMmRuWjJkbloyZG5aMmRuWjJk\n'
+               'bloyZG5aMmRrWXdSQUlnWHlvYkhBOHNEUXhtREpOTEU2SElhQVJsenZjZDc5L3dUMD\n'
+               'Y4ZTExM2dVa0NJSGtJNTQwSlFUMkxId0FENy95M3dGRTVYM2xFWE1mZ1pSa3BMWlR4\n'
+               'a3B0aWNCSkF6bzVWclVFcjBVNDdzSHZ1SWpicklOTENUTTZwQVNjQTg5OUc5a3BNV2\n'
+               'V4Ylh2MWNlSWJUUDVKSDFIeVFtc1pzUk9UZUhSMGlyb2p2WWd4N0pMYWlBQT09In0='],
              {}]])
--- a/circle.yml
+++ b/circle.yml
@@ -21,4 +21,4 @@ test:
    - scons clang.debug
  override:
    # Execute unit tests under gdb
-    - gdb -return-child-result -quiet -batch -ex "set env MALLOC_CHECK_=3" -ex "set print thread-events off" -ex run -ex "thread apply all backtrace full" -ex "quit" --args build/clang.debug/rippled --unittest
+    - gdb -return-child-result -quiet -batch -ex "set env MALLOC_CHECK_=3" -ex "set print thread-events off" -ex run -ex "thread apply all backtrace full" -ex "quit" --args build/clang.debug/rippled --unittest --quiet --unittest-log
--- a/doc/manifest-tool-guide.md
+++ b/doc/manifest-tool-guide.md
@@ -8,7 +8,7 @@ Validators use two types of key pairs: *master keys* and *ephemeral
 keys*. Ephemeral keys are used to sign and verify validations. Master keys are
 used to sign and verify manifests that change ephemeral keys. The master secret
 key should be tightly controlled. The ephemeral secret key needs to be present
-in the config file.
+in the config file in the form of a token.

 ## Validator Keys

@@ -28,10 +28,9 @@ Sample output:
  paamfhAn5m1NM4UUu5mmvVaHQy8Fb65bkpbaNrvKwX3YMKdjzi2
 ```

-The first value is the master public key. Add the public key to the config
-for this validator. A one-word comment must be added after the key (for example
-*ThisServersName*). Any other rippled trusting the validator needs to add the
-master public key to its config. Only add keys received from trusted sources.
+The first value is the master public key. Any other rippled trusting the
+validator needs to add the master public key to its config. Only add keys
+received from trusted sources.

 The second value is the corresponding master secret key. **DO NOT INSTALL THIS
 IN THE CONFIG**. The master secret key will be used to sign manifests that
@@ -63,17 +62,6 @@ Sample output:
  }
 ```

-Add the `validation_seed` value (the ephemeral secret key) to this validator's
-config. It is recommended to add the ephemeral public key and the sequence
-number as a comment as well (sequence numbers are be explained below):
-
-```
-  [validation_seed]
-  sh8bLqqkGBknGcsgRTrFMxcciwytm
-  # validation_public_key: n9LtZ9haqYMbzJ92cDd3pu3Lko6uEznrXuYea3ehuhVcwDHF5coX
-  # sequence number: 1
-```
-
 A manifest is a signed message used to inform other servers of this validator's
 ephemeral public key. A manifest contains a sequence number, the new ephemeral
 public key, and it is signed with both the ephemeral and master secret keys.
@@ -95,15 +83,18 @@ For example:
 Sample output:

 ```
-  [validation_manifest]
-  JAAAAAFxIe3t8rIb4Ba8JHI97CbwpxmTq0LhN/7ZAbsNaSwrbHaypHMhAzTuu07YGOvVvB3+
-  aS0jhP+q0TVgTjGJKhx+yTY1Da3ddkYwRAIgDkmIt3dPNsfeCH3ApMZgpwqG4JwtIlKEymqK
-  S7v+VqkCIFQXg20ZMpXXT86vmLdlmPspgeUN1scWsuFoPYUUJywycBJAl93+/bZbfZ4quTeM
-  5y80/OSIcVoWPcHajwrAl68eiAW4MVFeJXvShXNfnT+XsxMjDh0VpOkhvyp971i1MgjBAA==
-```  
+  [validator_token]
+  eyJ2YWxpZGF0aW9uX3ByaXZhdGVfa2V5IjoiN2VkMWM2ZDVmMTBhOGUyYWNmZWE0OW
+  NkNzE5ZjhiZjZhMWI1Yjg2M2Q3N2QxMDE1MjVkNGQxOWU4ZWYwNjU1OSIsIm1hbmlm
+  ZXN0IjoiSkFBQUFBRnhJZTNVZ3lXb3QwdFpSTFBNbDQ1dit5YkdPanJYNkE5c1JIcU
+  lJWUlZSTZjREhuTWhBNlNqWWZnWnJsTHFXU2UrNzlWUkZnOWJEeVZKNDMvYmV6Zkxu
+  dWkxVzhQdWRrWXdSQUlnY09KWmVpdmFaOW1abmM4Y1N4bUlOVGVYSUlKOE5oTXprRD
+  lrWThseGRkc0NJRk1OU3k5Qmo4VHNQWlV4NzNwYUJ0RmxpaDZWOTlSRXNnU3V6Wlhr
+  BXMHNWTVZXR09QUnY0Ylg2dDVmYi9haUtoNkZyRVdtYk5YeXpRNmI5TGhDQT09In0=
+```

-Copy this to the config for this validator. Don't forget to update the comment
-noting the sequence number.
+Copy this to the config for this validator. It is recommended to add the
+sequence number as a comment as well.

 ## Revoking a key

--- a/doc/rippled-example.cfg
+++ b/doc/rippled-example.cfg
@@ -273,7 +273,41 @@
 #               keep rippled from connecting to other instances of rippled or
 #               prevent RPC and WebSocket clients from connecting.
 #
+# WebSocket permessage-deflate extension options
 #
+#   These settings configure the optional permessage-deflate extension
+#   options and may appear on any port configuration entry. They are meaningful
+#   only to ports which have enabled a WebSocket protocol.
+#
+#   permessage_deflate = <flag>
+#
+#       Determines if permessage_deflate extension negotiations are enabled.
+#       When enabled, clients may request the extension and the server will
+#       offer the enabled extension in response.
+#
+#   client_max_window_bits = [9..15]
+#   server_max_window_bits = [9..15]
+#   client_no_context_takeover = <flag>
+#   server_no_context_takeover = <flag>
+#
+#       These optional settings control options related to the permessage-deflate
+#       extension negotiation. For precise definitions of these fields please see
+#       the RFC 7692, "Compression Extensions for WebSocket":
+#           https://tools.ietf.org/html/rfc7692
+#   
+#   compress_level = [0..9]
+#
+#       When set, determines the amount of compression attempted, where 0 is
+#       the least amount and 9 is the most amount. Higher levels require more
+#       CPU resources. Levels 1 through 3 use a fast compression algorithm,
+#       while levels 4 through 9 use a more compact algorithm which uses more
+#       CPU resources. If unspecified, a default of 3 is used.
+#
+#   memory_level = [1..9]
+#
+#       When set, determines the relative amount of memory used to hold
+#       intermediate compression data. Higher numbers can give better compression
+#       ratios at the cost of higher memory and CPU resources.
 #
 # [rpc_startup]
 #
@@ -512,8 +546,7 @@
 #
 #   These settings affect the behavior of the server instance with respect
 #   to Ripple payment protocol level activities such as validating and
-#   closing ledgers, establishing a quorum, or adjusting fees in response
-#   to server overloads.
+#   closing ledgers or adjusting fees in response to server overloads.
 #
 #
 #
@@ -567,17 +600,42 @@
 #
 #
 #
+# [validator_token]
+#
+#   This is an alternative to [validation_seed] that allows rippled to perform
+#   validation without having to store the validator keys on the network
+#   connected server. The field should contain a single token in the form of a
+#   base64-encoded blob.
+#   An external tool is available for generating validator keys and tokens.
+#
+#
+#
+# [validator_key_revocation]
+#
+#   If a validator's secret key has been compromised, a revocation must be
+#   generated and added to this field. The revocation notifies peers that it is
+#   no longer safe to trust the revoked key. The field should contain a single
+#   revocation in the form of a base64-encoded blob.
+#   An external tool is available for generating and revoking validator keys.
+#
+#
+#
 # [validators_file]
 #
 #   Path or name of a file that contains the validation public keys of nodes
 #   to always accept as validators as well as the minimum number of validators
 #   needed to accept consensus.
 #
-#   The contents of the file should include a [validators] and a
-#   [validation_quorum] entry. [validators] should be followed by
-#   a list of validation public keys of nodes, one per line, optionally
-#   followed by a comment separated by whitespace.
-#   [validation_quorum] should be followed by a number.
+#   The contents of the file should include a [validators] and/or
+#   [validator_list_sites] and [validator_list_keys] entries.
+#   [validators] should be followed by a list of validation public keys of
+#   nodes, one per line.
+#   [validator_list_sites] should be followed by a list of URIs each serving a
+#   list of recommended validators.
+#   [validator_list_keys] should be followed by a list of keys belonging to
+#   trusted validator list publishers. Validator lists fetched from configured
+#   sites will only be considered if the list is accompanied by a valid
+#   signature from a trusted publisher key.
 #
 #   Specify the file by its name or path.
 #   Unless an absolute path is specified, it will be considered relative to
@@ -589,14 +647,12 @@
 #
 #   Example content:
 #    [validators]
-#    n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7 RL1
-#    n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj RL2
-#    n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C RL3
-#    n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS RL4
-#    n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA RL5
+#    n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7
+#    n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj
+#    n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C
+#    n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS
+#    n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA
 #
-#    [validation_quorum]
-#    3
 #
 #
 # [path_search]
@@ -987,7 +1043,7 @@ pool.ntp.org
 [ips]
 r.ripple.com 51235

-# File containing validation quorum and trusted validator keys.
+# File containing trusted validator keys or validator list publishers.
 # Unless an absolute path is specified, it will be considered relative to the
 # folder in which the rippled.cfg file is located.
 [validators_file]
--- a/doc/validators-example.txt
+++ b/doc/validators-example.txt
@@ -13,8 +13,6 @@
 # [validators]
 #
 #   List of the validation public keys of nodes to always accept as validators.
-#   A comment may, optionally, be associated with each entry, separated by
-#   whitespace from the validation public key.
 #
 #   The latest list of recommended validators can be obtained from
 #   https://ripple.com/ripple.txt
@@ -23,26 +21,34 @@
 #
 #   Examples:
 #    n9KorY8QtTdRx7TVDpwnG9NvyxsDwHUKUEeDLY3AkiGncVaSXZi5
-#    n9MqiExBcoG19UXwoLjBJnhsxEhAZMuWwJDRdkyDz1EkEkwzQTNt John Doe
+#    n9MqiExBcoG19UXwoLjBJnhsxEhAZMuWwJDRdkyDz1EkEkwzQTNt
 #
+# [validator_list_sites]
 #
+#   List of URIs serving lists of recommended validators.
 #
-# [validation_quorum]
+#   Examples:
+#    https://ripple.com/validators
+#    http://127.0.0.1:8000
 #
-#   Sets the minimum number of trusted validations a ledger must have before
-#   the server considers it fully validated. Note that if you are validating,
-#   your validation counts.
+# [validator_list_keys]
+#
+#   List of keys belonging to trusted validator list publishers.
+#   Validator lists fetched from configured sites will only be considered
+#   if the list is accompanied by a valid signature from a trusted
+#   publisher key.
+#   Validator list keys should be hex-encoded.
+#
+#   Examples:
+#    ed499d732bded01504a7407c224412ef550cc1ade638a4de4eb88af7c36cb8b282
+#    0202d3f36a801349f3be534e3f64cfa77dede6e1b6310a0b48f40f20f955cec945
+#    02dd8b7075f64d77d9d2bdb88da364f29fcd975f9ea6f21894abcc7564efda8054
 #

 # Public keys of the validators that this rippled instance trusts.
 [validators]
-n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7 RL1
-n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj RL2
-n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C RL3
-n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS RL4
-n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA RL5
-
-# The number of validators rippled needs to accept a consensus.
-# Don't change this unless you know what you're doing.
-[validation_quorum]
-3
+n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7
+n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj
+n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C
+n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS
+n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA
--- a/src/beast/.travis.yml
+++ b/src/beast/.travis.yml
@@ -13,21 +13,25 @@ env:
    - VALGRIND_ROOT=$HOME/valgrind-install
    - BOOST_ROOT=$HOME/boost_1_61_0
    - BOOST_URL='http://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.gz'
-packages: &gcc5_pkgs
-  - gcc-5
-  - g++-5
-  - python-software-properties
-  - libssl-dev
-  - libffi-dev
-  - libstdc++6
-  - binutils-gold
-  # Provides a backtrace if the unittests crash
-  - gdb
-  # Needed for installing valgrind
-  - subversion
-  - automake
-  - autotools-dev
-  - libc6-dbg
+
+addons:
+  apt:
+    sources: ['ubuntu-toolchain-r-test']
+    packages:
+      - gcc-5
+      - g++-5
+      - python-software-properties
+      - libssl-dev
+      - libffi-dev
+      - libstdc++6
+      - binutils-gold
+      # Provides a backtrace if the unittests crash
+      - gdb
+      # Needed for installing valgrind
+      - subversion
+      - automake
+      - autotools-dev
+      - libc6-dbg

 matrix:
  include:
@@ -39,10 +43,6 @@ matrix:
        - ADDRESS_MODEL=64
        - BUILD_SYSTEM=cmake
        - PATH=$PWD/cmake/bin:$PATH
-      addons: &ao_gcc5
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: *gcc5_pkgs

    # Clang/UndefinedBehaviourSanitizer
    - compiler: clang
@@ -55,7 +55,6 @@ matrix:
        - BUILD_SYSTEM=cmake
        - PATH=$PWD/cmake/bin:$PATH
        - PATH=$PWD/llvm-$LLVM_VERSION/bin:$PATH
-      addons: *ao_gcc5

    # Clang/AddressSanitizer
    - compiler: clang
@@ -65,7 +64,6 @@ matrix:
        - CLANG_VER=3.8
        - ADDRESS_MODEL=64
        - PATH=$PWD/llvm-$LLVM_VERSION/bin:$PATH
-      addons: *ao_gcc5

 cache:
  directories:
--- a/src/beast/CHANGELOG.md
+++ b/src/beast/CHANGELOG.md
@@ -1,3 +1,83 @@
+1.0.0-b30
+
+WebSocket
+
+* Fix race in pings during reads
+* Fix race in close frames during reads
+* Fix race when write suspends
+* Allow concurrent websocket async ping and writes
+
+--------------------------------------------------------------------------------
+
+1.0.0-b29
+
+* Fix compilation error in non-template class
+* Document type-pun in buffer_cat
+* Correctly check ostream modifier (/extras)
+
+HTTP
+
+* Fix Body requirements doc
+* Fix illegal HTTP characters accepted as hex zero
+* Fix Writer return value documentation
+
+WebSocket
+
+* Fix race in writes during reads
+* Fix doc link typo
+
+--------------------------------------------------------------------------------
+
+1.0.0-b28
+
+* Split out and rename test stream classes
+* Restyle async result constructions
+* Fix HTTP split parse edge case
+
+--------------------------------------------------------------------------------
+
+1.0.0-b27
+
+* Tidy up tests and docs
+* Add documentation building instructions
+
+API Changes:
+
+* Invoke callback on pings and pongs
+* Move basic_streambuf to streambuf.hpp
+
+--------------------------------------------------------------------------------
+
+1.0.0-b26
+
+* Tidy up warnings and tests
+
+--------------------------------------------------------------------------------
+
+1.0.0-b25
+
+* Fixes for WebSocket echo server
+* Fix 32-bit arm7 warnings
+* Remove unnecessary include
+* WebSocket server examples and test tidying
+* Fix deflate setup bug
+
+API Changes:
+
+* Better handler_ptr
+
+--------------------------------------------------------------------------------
+
+1.0.0-b24
+
+* bjam use clang on MACOSX
+* Simplify Travis package install specification
+* Add optional yield_to arguments
+* Make decorator copyable
+* Add WebSocket permessage-deflate extension support
+
+--------------------------------------------------------------------------------
+
 1.0.0-b23

 * Tune websocket echo server for performance
@@ -5,7 +85,7 @@
 * Better logging in async echo server
 * Add copy special members
 * Fix message constructor and special members
-* Travis CI improvements 
+* Travis CI improvements

 --------------------------------------------------------------------------------

--- a/src/beast/CMakeLists.txt
+++ b/src/beast/CMakeLists.txt
@@ -7,6 +7,7 @@ project (Beast)
 set_property (GLOBAL PROPERTY USE_FOLDERS ON)

 if (MSVC)
+    # /wd4244 /wd4127
    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /MP /W4 /wd4100 /bigobj /D _WIN32_WINNT=0x0601 /D _SCL_SECURE_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1")
    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GL /MT")
@@ -96,6 +97,29 @@ endfunction()
 include_directories (extras)
 include_directories (include)

+set(ZLIB_SOURCES
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/crc32.h
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/deflate.h
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/inffast.h
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/inffixed.h
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/inflate.h
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/inftrees.h
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/trees.h
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/zlib.h
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/zutil.h
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/adler32.c
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/compress.c
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/crc32.c
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/deflate.c
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/infback.c
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/inffast.c
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/inflate.c
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/inftrees.c
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/trees.c
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/uncompr.c
+    ${PROJECT_SOURCE_DIR}/test/zlib/zlib-1.2.8/zutil.c
+)
+
 file(GLOB_RECURSE BEAST_INCLUDES
    ${PROJECT_SOURCE_DIR}/include/beast/*.hpp
    ${PROJECT_SOURCE_DIR}/include/beast/*.ipp
--- a/src/beast/Jamroot
+++ b/src/beast/Jamroot
@@ -45,6 +45,11 @@ else
  lib crypto ;
 }

+if [ os.name ] = MACOSX
+{
+  using clang : : ;
+}
+
 variant coverage
  :
    debug
--- a/src/beast/README.md
+++ b/src/beast/README.md
@@ -8,19 +8,15 @@
 (https://img.shields.io/badge/documentation-master-brightgreen.svg)](http://vinniefalco.github.io/beast/) [![License]
 (https://img.shields.io/badge/license-boost-brightgreen.svg)](LICENSE_1_0.txt)

-# HTTP and WebSocket implementations built on Boost.Asio
+# HTTP and WebSocket built on Boost.Asio in C++11

 ---

-## Beast at CppCon 2016
+## Appearances

-Presentation
-(slides: <a href="https://raw.githubusercontent.com/vinniefalco/Beast/master/doc/images/CppCon2016.pdf">CppCon2016.pdf</a>)
-
-<a href="https://www.youtube.com/watch?v=uJZgRcvPFwI">
-<img width="320" height = "180" alt = "Beast"
-    src="https://raw.githubusercontent.com/vinniefalco/Beast/master/doc/images/CppCon2016.png">
-</a>
+| <a href="http://cppcast.com/2017/01/vinnie-falco/">CppCast 2017</a> | <a href="https://raw.githubusercontent.com/vinniefalco/Beast/master/doc/images/CppCon2016.pdf">CppCon 2016</a> |
+| ------------ | ----------- |
+| <a href="http://cppcast.com/2017/01/vinnie-falco/"><img width="180" height="180" alt="Vinnie Falco" src="https://avatars1.githubusercontent.com/u/1503976?v=3&u=76c56d989ef4c09625256662eca2775df78a16ad&s=180"></a> | <a href="https://www.youtube.com/watch?v=uJZgRcvPFwI"><img width="320" height = "180" alt="Beast" src="https://raw.githubusercontent.com/vinniefalco/Beast/master/doc/images/CppCon2016.png"></a> |

 ---

--- a/src/beast/doc/Dockerfile
+++ b/src/beast/doc/Dockerfile
@@ -0,0 +1,22 @@
+FROM ubuntu:16.04
+
+RUN apt-get update
+RUN apt-get -y install build-essential g++ git libbz2-dev wget python-dev
+
+# Install Boost
+ENV BOOST_SHA 440a59f8bc4023dbe6285c9998b0f7fa288468b889746b1ef00e8b36c559dce1
+RUN wget https://sourceforge.net/projects/boost/files/boost/1.62.0/boost_1_62_0.tar.gz
+RUN echo "$BOOST_SHA  boost_1_62_0.tar.gz" | sha256sum -c
+RUN tar xzf boost_1_62_0.tar.gz
+RUN cd boost_1_62_0 && ./bootstrap.sh --prefix=/usr/local
+RUN cd boost_1_62_0 && ./b2 install
+ENV BOOST_ROOT=/boost_1_62_0
+
+# Install dependencies
+RUN apt-get -y install doxygen
+RUN apt-get -y install xsltproc
+
+CMD cd /opt/beast/doc && \
+    chmod +x makeqbk.sh && \
+    ./makeqbk.sh && \
+    $BOOST_ROOT/b2
--- a/src/beast/doc/Jamfile.v2
+++ b/src/beast/doc/Jamfile.v2
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+# Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/README.md
+++ b/src/beast/doc/README.md
@@ -0,0 +1,72 @@
+# Building documentation
+
+## Specifying Files
+
+To specify the source files for which to build documentation, modify `INPUT`
+and its related fields in `doc/source.dox`. Note that the `INPUT` paths are
+relative to the `doc/` directory.
+
+## Install Dependencies
+
+### Windows
+
+Install these dependencies:
+
+1. Install [Doxygen](http://www.stack.nl/~dimitri/doxygen/download.html)
+2. Download the following zip files from [xsltproc](https://www.zlatkovic.com/pub/libxml/)
+  (Alternate download: ftp://ftp.zlatkovic.com/libxml/),
+  and extract the `bin\` folder contents into any folder in your path.
+  * iconv
+  * libxml2
+  * libxslt
+  * zlib
+3. Download [Boost](http://www.boost.org/users/download/)
+  1. Extract the compressed file contents to your (new) `$BOOST_ROOT` location.
+  2. Open a command prompt or shell in the `$BOOST_ROOT`.
+  3. `./bootstrap.bat`
+  4. If it is not already there, add your `$BOOST_ROOT` to your environment `$PATH`.
+
+### MacOS
+
+1. Install doxygen:
+  * Use homebrew to install: `brew install doxygen`.  The executable will be
+    installed in `/usr/local/bin` which is already in your path.
+  * Alternatively, install from here: [doxygen](http://www.stack.nl/~dimitri/doxygen/download.html).
+    You'll then need to make doxygen available to your command line.  You can
+    do this by adding a symbolic link from `/usr/local/bin` to the doxygen
+    executable.  For example, `$ ln -s /Applications/Doxygen.app/Contents/Resources/doxygen /usr/local/bin/doxygen`
+2. Install [Boost](http://www.boost.org/users/download/)
+  1. Extract the compressed file contents to your (new) `$BOOST_ROOT` location.
+  2. Open a command prompt or shell in the `$BOOST_ROOT`.
+  3. `$ ./bootstrap.bat`
+  4. If it is not already there, add your `$BOOST_ROOT` to your environment
+     `$PATH`.  This makes the `b2` command available to the command line.
+3. That should be all that's required.  In OS X 10.11, at least, libxml2 and
+   libxslt come pre-installed.
+
+### Linux
+
+1. Install [Docker](https://docs.docker.com/engine/installation/)
+2. Build Docker image. From the Beast root folder:
+```
+sudo docker build -t beast-docs doc/
+```
+
+## Do it
+
+### Windows & MacOS
+
+From the Beast root folder:
+```
+cd doc
+./makeqbk.sh && b2
+```
+The output will be in `doc/html`.
+
+### Linux
+
+From the Beast root folder:
+```
+sudo docker run -v $PWD:/opt/beast --rm beast-docs
+```
+The output will be in `doc/html`.
--- a/src/beast/doc/design.qbk
+++ b/src/beast/doc/design.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -194,15 +194,10 @@ start. Other design goals:
 [[
    What about message compression?
 ][
-    The author is currently porting ZLib 1.2.8 to modern, header-only C++11
-    that does not use macros or try to support ancient architectures. This
-    deflate implementation will be available as its own individually
-    usable interface, and also will be used to power Beast WebSocket's
-    permessage-deflate implementation, due Q1 of 2017.
-
-    However, Beast currently has sufficient functionality that users can
-    begin taking advantage of the WebSocket protocol using this library
-    immediately.
+    Beast WebSocket supports the permessage-deflate extension described in
+    [@https://tools.ietf.org/html/draft-ietf-hybi-permessage-compression-00 draft-ietf-hybi-permessage-compression-00].
+    The library comes with a header-only, C++11 port of ZLib's "deflate" codec
+    used in the implementation of the permessage-deflate extension.
 ]]

 [[
--- a/src/beast/doc/examples.qbk
+++ b/src/beast/doc/examples.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -85,6 +85,15 @@ int main()
 }
 ```

+[heading WebSocket Echo Server]
+
+This example demonstrates both synchronous and asynchronous
+WebSocket server implementations.
+
+* [@examples/websocket_async_echo_server.hpp]
+* [@examples/websocket_sync_echo_server.hpp]
+* [@examples/websocket_echo.cpp]
+
 [heading Secure WebSocket]

 Establish a WebSocket connection over an encrypted TLS connection,
--- a/src/beast/doc/http.qbk
+++ b/src/beast/doc/http.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/index.xml
+++ b/src/beast/doc/index.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "boostbook.dtd">

 <!--
-  Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+  Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

  Distributed under the Boost Software License, Version 1.0. (See accompanying
  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/makeqbk.sh
+++ b/src/beast/doc/makeqbk.sh
@@ -1,6 +1,6 @@
 #!/bin/sh

-# Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+# Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/master.qbk
+++ b/src/beast/doc/master.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -7,7 +7,7 @@

 [library Beast
    [quickbook 1.6]
-    [copyright 2013 - 2016 Vinnie Falco]
+    [copyright 2013 - 2017 Vinnie Falco]
    [purpose Networking Protocol Library]
    [license
        Distributed under the Boost Software License, Version 1.0.
@@ -29,15 +29,16 @@

 [def __asio_handler_invoke__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/asio_handler_invoke.html `asio_handler_invoke`]]
 [def __asio_handler_allocate__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/asio_handler_allocate.html `asio_handler_allocate`]]
-[def __void_or_deduced__ [@http://www.boost.org/doc/libs/1_60_0/doc/html/boost_asio/reference/asynchronous_operations.html#boost_asio.reference.asynchronous_operations.return_type_of_an_initiating_function ['void-or-deduced]]]
+[def __void_or_deduced__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/asynchronous_operations.html#boost_asio.reference.asynchronous_operations.return_type_of_an_initiating_function ['void-or-deduced]]]

 [def __AsyncReadStream__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/AsyncReadStream.html [*AsyncReadStream]]]
 [def __AsyncWriteStream__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/AsyncWriteStream.html [*AsyncWriteStream]]]
-[def __CompletionHandler__ [@http://www.boost.org/doc/libs/1_60_0/doc/html/boost_asio/reference/CompletionHandler.html [*CompletionHandler]]]
+[def __CompletionHandler__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/CompletionHandler.html [*CompletionHandler]]]
 [def __ConstBufferSequence__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/ConstBufferSequence.html [*ConstBufferSequence]]]
+[def __Handler__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/Handler.html [*Handler]]]
 [def __MutableBufferSequence__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/MutableBufferSequence.html [*MutableBufferSequence]]]
 [def __SyncReadStream__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/SyncReadStream.html [*SyncReadStream]]]
-[def __SyncWriteStream__ [@http://www.boost.org/doc/libs/1_60_0/doc/html/boost_asio/reference/SyncWriteStream.html [*SyncWriteStream]]]
+[def __SyncWriteStream__ [@http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/reference/SyncWriteStream.html [*SyncWriteStream]]]

 [def __Body__             [link beast.ref.Body [*`Body`]]]
 [def __DynamicBuffer__    [link beast.ref.DynamicBuffer [*DynamicBuffer]]]
--- a/src/beast/doc/overview.qbk
+++ b/src/beast/doc/overview.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -59,7 +59,7 @@ your particular build system.

 [heading Motivation]

-Beast is built on Boost.Asio A proposal to add networking functionality to the
+Beast is built on Boost.Asio. A proposal to add networking functionality to the
 C++ standard library, based on Boost.Asio, is under consideration by the
 committee and on track for standardization. Since the final approved networking
 interface for the C++ standard library will likely closely resemble the current
--- a/src/beast/doc/quickref.xml
+++ b/src/beast/doc/quickref.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "boostbook.dtd">

 <!--
-  Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+  Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

  Distributed under the Boost Software License, Version 1.0. (See accompanying
  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -128,7 +128,8 @@
            <member><link linkend="beast.ref.websocket__decorate">decorate</link></member>
            <member><link linkend="beast.ref.websocket__keep_alive">keep_alive</link></member>
            <member><link linkend="beast.ref.websocket__message_type">message_type</link></member>
-            <member><link linkend="beast.ref.websocket__pong_callback">pong_callback</link></member>
+            <member><link linkend="beast.ref.websocket__permessage_deflate">permessage_deflate</link></member>
+            <member><link linkend="beast.ref.websocket__ping_callback">ping_callback</link></member>
            <member><link linkend="beast.ref.websocket__read_buffer_size">read_buffer_size</link></member>
            <member><link linkend="beast.ref.websocket__read_message_max">read_message_max</link></member>
            <member><link linkend="beast.ref.websocket__write_buffer_size">write_buffer_size</link></member>
--- a/src/beast/doc/reference.xsl
+++ b/src/beast/doc/reference.xsl
@@ -25,7 +25,7 @@
 -->
 <xsl:template match="/doxygen">
 <xsl:text>[/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -1580,6 +1580,9 @@
    <xsl:when test="declname = 'DynamicBuffer' or type = 'class DynamicBuffer'">
      <xsl:text>class ``[link beast.ref.DynamicBuffer [*DynamicBuffer]]``</xsl:text>
    </xsl:when>
+    <xsl:when test="declname = 'Handler' or type = 'class Handler'">
+      <xsl:text>class __Handler__</xsl:text>
+    </xsl:when>
    <xsl:when test="declname = 'MutableBufferSequence' or type = 'class MutableBufferSequence'">
      <xsl:text>class __MutableBufferSequence__</xsl:text>
    </xsl:when>
--- a/src/beast/doc/types/Body.qbk
+++ b/src/beast/doc/types/Body.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -27,7 +27,7 @@ In this table:
    ]
 ]
 [
-    [`Body::reader`]
+    [`X::reader`]
    []
    [
        If present, a type meeting the requirements of
@@ -36,7 +36,7 @@ In this table:
    ]
 ]
 [
-    [`Body::writer`]
+    [`X::writer`]
    []
    [
        If present, a type meeting the requirements of
--- a/src/beast/doc/types/BufferSequence.qbk
+++ b/src/beast/doc/types/BufferSequence.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/types/DynamicBuffer.qbk
+++ b/src/beast/doc/types/DynamicBuffer.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/types/Field.qbk
+++ b/src/beast/doc/types/Field.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/types/FieldSequence.qbk
+++ b/src/beast/doc/types/FieldSequence.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/types/Parser.qbk
+++ b/src/beast/doc/types/Parser.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/types/Reader.qbk
+++ b/src/beast/doc/types/Reader.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/types/Streams.qbk
+++ b/src/beast/doc/types/Streams.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/doc/types/Writer.qbk
+++ b/src/beast/doc/types/Writer.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -167,7 +167,8 @@ public:
        the writer must guarantee that the buffers remain valid until the
        next member function is invoked, which may be the destructor.

-        @return `true` if there is data, `false` when done,
+        @return `true` if there is no more data to send, 
+                `false` when there may be more data,
                boost::indeterminate to suspend.

        @note Undefined behavior if the callee takes ownership
--- a/src/beast/doc/websocket.qbk
+++ b/src/beast/doc/websocket.qbk
@@ -1,5 +1,5 @@
 [/
-    Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+    Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)

    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -309,9 +309,9 @@ and received a close frame.

 During read operations, Beast automatically reads and processes control
 frames. Pings are replied to as soon as possible with a pong, received
-pongs are delivered to the pong callback. The receipt of a close frame
-initiates the WebSocket close procedure, eventually resulting in the error
-code [link beast.ref.websocket__error `error::closed`] being delivered
+ping and pongs are delivered to the ping callback. The receipt of a close
+frame initiates the WebSocket close procedure, eventually resulting in the
+error code [link beast.ref.websocket__error `error::closed`] being delivered
 to the caller in a subsequent read operation, assuming no other error
 takes place.

@@ -320,8 +320,8 @@ operations can cause socket writes. However, these writes will not
 compete with caller-initiated write operations. For the purposes of
 correctness with respect to the stream invariants, caller-initiated
 read operations still only count as a read. This means that callers can
-have a simultaneous active read and write operation in progress, while
-the implementation also automatically handles control frames.
+have a simultaneously active read, write, and ping operation in progress,
+while the implementation also automatically handles control frames.

 [heading Ping and Pong Frames]

@@ -331,29 +331,33 @@ using the functions
    [link beast.ref.websocket__stream.ping `ping`] and
    [link beast.ref.websocket__stream.pong `pong`].

-To receive pong control frames, callers may register a "pong callback" using
-[link beast.ref.websocket__stream.set_option `set_option`]. The object provided
-with this option should be callable with the following signature:
+To be notified of ping and pong control frames, callers may register a
+"ping callback" using [link beast.ref.websocket__stream.set_option `set_option`].
+The object provided with this option should be callable with the following
+signature:
 ```
-    void on_pong(ping_data const& payload);
+    void on_ping(bool is_pong, ping_data const& payload);
    ...
-    ws.set_option(pong_callback{&on_pong});
+    ws.set_option(ping_callback{&on_ping});
 ```

-When a pong callback is registered, any pongs received through either
-synchronous read functions or asynchronous read functions will invoke the
-pong callback, passing the payload in the pong message as the argument.
+When a ping callback is registered, all pings and pongs received through
+either synchronous read functions or asynchronous read functions will
+invoke the ping callback, with the value of `is_pong` set to `true` if a
+pong was received else `false` if a ping was received. The payload of
+the ping or pong control frame is passed in the payload argument.

 Unlike regular completion handlers used in calls to asynchronous initiation
-functions, the pong callback only needs to be set once. The callback is not
-reset when a pong is received. The same callback is used for both synchronous
-and asynchronous reads. The pong callback is passive; in order to receive
-pongs, a synchronous or asynchronous stream read function must be active.
+functions, the ping callback only needs to be set once. The callback is not
+reset when a ping or pong is received. The same callback is used for both
+synchronous and asynchronous reads. The ping callback is passive; in order
+to receive pings and pongs, a synchronous or asynchronous stream read
+function must be active.

 [note
-    When an asynchronous read function receives a pong, the the pong
-    callback is invoked in the same manner as that used to invoke the
-    final completion handler of the corresponding read function.
+    When an asynchronous read function receives a ping or pong, the
+    ping callback is invoked in the same manner as that used to invoke
+    the final completion handler of the corresponding read function.
 ]

 [heading Close Frames]
--- a/src/beast/examples/CMakeLists.txt
+++ b/src/beast/examples/CMakeLists.txt
@@ -41,6 +41,17 @@ if (NOT WIN32)
    target_link_libraries(http-example ${Boost_LIBRARIES} Threads::Threads)
 endif()

+add_executable (websocket-echo
+    ${BEAST_INCLUDES}
+    websocket_async_echo_server.hpp
+    websocket_sync_echo_server.hpp
+    websocket_echo.cpp
+)
+
+if (NOT WIN32)
+    target_link_libraries(websocket-echo ${Boost_LIBRARIES} Threads::Threads)
+endif()
+
 add_executable (websocket-example
    ${BEAST_INCLUDES}
    ${EXTRAS_INCLUDES}
--- a/src/beast/examples/Jamfile.v2
+++ b/src/beast/examples/Jamfile.v2
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+# Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,6 +18,10 @@ exe http-example :
    http_example.cpp
    ;

+exe websocket-echo :
+    websocket_echo.cpp
+    ;
+
 exe websocket-example :
    websocket_example.cpp
    ;
--- a/src/beast/examples/file_body.hpp
+++ b/src/beast/examples/file_body.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/http_async_server.hpp
+++ b/src/beast/examples/http_async_server.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -114,9 +114,8 @@ private:

        template<class DeducedHandler, class... Args>
        write_op(DeducedHandler&& h, Stream& s, Args&&... args)
-            : d_(make_handler_ptr<data, Handler>(
-                std::forward<DeducedHandler>(h), s,
-                    std::forward<Args>(args)...))
+            : d_(std::forward<DeducedHandler>(h),
+                s, std::forward<Args>(args)...)
        {
            (*this)(error_code{}, false);
        }
--- a/src/beast/examples/http_crawl.cpp
+++ b/src/beast/examples/http_crawl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/http_example.cpp
+++ b/src/beast/examples/http_example.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/http_server.cpp
+++ b/src/beast/examples/http_server.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/http_sync_server.hpp
+++ b/src/beast/examples/http_sync_server.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/mime_type.hpp
+++ b/src/beast/examples/mime_type.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/ssl/Jamfile.v2
+++ b/src/beast/examples/ssl/Jamfile.v2
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+# Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/ssl/http_ssl_example.cpp
+++ b/src/beast/examples/ssl/http_ssl_example.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/ssl/websocket_ssl_example.cpp
+++ b/src/beast/examples/ssl/websocket_ssl_example.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/urls_large_data.cpp
+++ b/src/beast/examples/urls_large_data.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/urls_large_data.hpp
+++ b/src/beast/examples/urls_large_data.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/websocket_async_echo_server.hpp
+++ b/src/beast/examples/websocket_async_echo_server.hpp
@@ -0,0 +1,375 @@
+//
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef WEBSOCKET_ASYNC_ECHO_SERVER_HPP
+#define WEBSOCKET_ASYNC_ECHO_SERVER_HPP
+
+#include <beast/core/placeholders.hpp>
+#include <beast/core/streambuf.hpp>
+#include <beast/websocket/stream.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/optional.hpp>
+#include <atomic>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <ostream>
+#include <string>
+#include <thread>
+#include <type_traits>
+#include <typeindex>
+#include <unordered_map>
+#include <utility>
+
+namespace websocket {
+
+/** Asynchronous WebSocket echo client/server
+*/
+class async_echo_server
+{
+public:
+    using error_code = beast::error_code;
+    using address_type = boost::asio::ip::address;
+    using socket_type = boost::asio::ip::tcp::socket;
+    using endpoint_type = boost::asio::ip::tcp::endpoint;
+
+private:
+    struct identity
+    {
+        template<class Body, class Fields>
+        void
+        operator()(beast::http::message<
+            true, Body, Fields>& req) const
+        {
+            req.fields.replace("User-Agent", "async_echo_client");
+        }
+
+        template<class Body, class Fields>
+        void
+        operator()(beast::http::message<
+            false, Body, Fields>& resp) const
+        {
+            resp.fields.replace("Server", "async_echo_server");
+        }
+    };
+
+    /** A container of type-erased option setters.
+    */
+    template<class NextLayer>
+    class options_set
+    {
+        // workaround for std::function bug in msvc
+        struct callable
+        {
+            virtual ~callable() = default;
+            virtual void operator()(
+                beast::websocket::stream<NextLayer>&) = 0;
+        };
+
+        template<class T>
+        class callable_impl : public callable
+        {
+            T t_;
+
+        public:
+            template<class U>
+            callable_impl(U&& u)
+                : t_(std::forward<U>(u))
+            {
+            }
+
+            void
+            operator()(beast::websocket::stream<NextLayer>& ws)
+            {
+                t_(ws);
+            }
+        };
+
+        template<class Opt>
+        class lambda
+        {
+            Opt opt_;
+
+        public:
+            lambda(lambda&&) = default;
+            lambda(lambda const&) = default;
+
+            lambda(Opt const& opt)
+                : opt_(opt)
+            {
+            }
+
+            void
+            operator()(beast::websocket::stream<NextLayer>& ws) const
+            {
+                ws.set_option(opt_);
+            }
+        };
+
+        std::unordered_map<std::type_index,
+            std::unique_ptr<callable>> list_;
+
+    public:
+        template<class Opt>
+        void
+        set_option(Opt const& opt)
+        {
+            std::unique_ptr<callable> p;
+            p.reset(new callable_impl<lambda<Opt>>{opt});
+            list_[std::type_index{
+                typeid(Opt)}] = std::move(p);
+        }
+
+        void
+        set_options(beast::websocket::stream<NextLayer>& ws)
+        {
+            for(auto const& op : list_)
+                (*op.second)(ws);
+        }
+    };
+
+    std::ostream* log_;
+    boost::asio::io_service ios_;
+    socket_type sock_;
+    endpoint_type ep_;
+    boost::asio::ip::tcp::acceptor acceptor_;
+    std::vector<std::thread> thread_;
+    boost::optional<boost::asio::io_service::work> work_;
+    options_set<socket_type> opts_;
+
+public:
+    async_echo_server(async_echo_server const&) = delete;
+    async_echo_server& operator=(async_echo_server const&) = delete;
+
+    /** Constructor.
+
+        @param log A pointer to a stream to log to, or `nullptr`
+        to disable logging.
+
+        @param threads The number of threads in the io_service.
+    */
+    async_echo_server(std::ostream* log,
+            std::size_t threads)
+        : log_(log)
+        , sock_(ios_)
+        , acceptor_(ios_)
+        , work_(ios_)
+    {
+        opts_.set_option(
+            beast::websocket::decorate(identity{}));
+        thread_.reserve(threads);
+        for(std::size_t i = 0; i < threads; ++i)
+            thread_.emplace_back(
+                [&]{ ios_.run(); });
+    }
+
+    /** Destructor.
+    */
+    ~async_echo_server()
+    {
+        work_ = boost::none;
+        error_code ec;
+        ios_.dispatch(
+            [&]{ acceptor_.close(ec); });
+        for(auto& t : thread_)
+            t.join();
+    }
+
+    /** Return the listening endpoint.
+    */
+    endpoint_type
+    local_endpoint() const
+    {
+        return acceptor_.local_endpoint();
+    }
+
+    /** Set a websocket option.
+
+        The option will be applied to all new connections.
+
+        @param opt The option to apply.
+    */
+    template<class Opt>
+    void
+    set_option(Opt const& opt)
+    {
+        opts_.set_option(opt);
+    }
+
+    /** Open a listening port.
+
+        @param ep The address and port to bind to.
+
+        @param ec Set to the error, if any occurred.
+    */
+    void
+    open(endpoint_type const& ep, error_code& ec)
+    {
+        acceptor_.open(ep.protocol(), ec);
+        if(ec)
+            return fail("open", ec);
+        acceptor_.set_option(
+            boost::asio::socket_base::reuse_address{true});
+        acceptor_.bind(ep, ec);
+        if(ec)
+            return fail("bind", ec);
+        acceptor_.listen(
+            boost::asio::socket_base::max_connections, ec);
+        if(ec)
+            return fail("listen", ec);
+        acceptor_.async_accept(sock_, ep_,
+            std::bind(&async_echo_server::on_accept, this,
+                beast::asio::placeholders::error));
+    }
+
+private:
+    class peer
+    {
+        struct data
+        {
+            async_echo_server& server;
+            endpoint_type ep;
+            int state = 0;
+            beast::websocket::stream<socket_type> ws;
+            boost::asio::io_service::strand strand;
+            beast::websocket::opcode op;
+            beast::streambuf db;
+            std::size_t id;
+
+            data(async_echo_server& server_,
+                endpoint_type const& ep_,
+                    socket_type&& sock_)
+                : server(server_)
+                , ep(ep_)
+                , ws(std::move(sock_))
+                , strand(ws.get_io_service())
+                , id([]
+                    {
+                        static std::atomic<std::size_t> n{0};
+                        return ++n;
+                    }())
+            {
+            }
+        };
+
+        // VFALCO This could be unique_ptr in [Net.TS]
+        std::shared_ptr<data> d_;
+
+    public:
+        peer(peer&&) = default;
+        peer(peer const&) = default;
+        peer& operator=(peer&&) = delete;
+        peer& operator=(peer const&) = delete;
+
+        template<class... Args>
+        explicit
+        peer(async_echo_server& server,
+            endpoint_type const& ep, socket_type&& sock,
+                Args&&... args)
+            : d_(std::make_shared<data>(server, ep,
+                std::forward<socket_type>(sock),
+                    std::forward<Args>(args)...))
+        {
+            auto& d = *d_;
+            d.server.opts_.set_options(d.ws);
+            run();
+        }
+
+        void run()
+        {
+            auto& d = *d_;
+            d.ws.async_accept(std::move(*this));
+        }
+
+        void operator()(error_code ec, std::size_t)
+        {
+            (*this)(ec);
+        }
+
+        void operator()(error_code ec)
+        {
+            using boost::asio::buffer;
+            using boost::asio::buffer_copy;
+            auto& d = *d_;
+            switch(d.state)
+            {
+            // did accept
+            case 0:
+                if(ec)
+                    return fail("async_accept", ec);
+
+            // start
+            case 1:
+                if(ec)
+                    return fail("async_handshake", ec);
+                d.db.consume(d.db.size());
+                // read message
+                d.state = 2;
+                d.ws.async_read(d.op, d.db,
+                    d.strand.wrap(std::move(*this)));
+                return;
+
+            // got message
+            case 2:
+                if(ec == beast::websocket::error::closed)
+                    return;
+                if(ec)
+                    return fail("async_read", ec);
+                // write message
+                d.state = 1;
+                d.ws.set_option(
+                    beast::websocket::message_type(d.op));
+                d.ws.async_write(d.db.data(),
+                    d.strand.wrap(std::move(*this)));
+                return;
+            }
+        }
+
+    private:
+        void
+        fail(std::string what, error_code ec)
+        {
+            auto& d = *d_;
+            if(d.server.log_)
+                if(ec != beast::websocket::error::closed)
+                    d.server.fail("[#" + std::to_string(d.id) +
+                        " " + boost::lexical_cast<std::string>(d.ep) +
+                            "] " + what, ec);
+        }
+    };
+
+    void
+    fail(std::string what, error_code ec)
+    {
+        if(log_)
+        {
+            static std::mutex m;
+            std::lock_guard<std::mutex> lock{m};
+            (*log_) << what << ": " <<
+                ec.message() << std::endl;
+        }
+    }
+
+    void
+    on_accept(error_code ec)
+    {
+        if(! acceptor_.is_open())
+            return;
+        if(ec == boost::asio::error::operation_aborted)
+            return;
+        if(ec)
+            fail("accept", ec);
+        peer{*this, ep_, std::move(sock_)};
+        acceptor_.async_accept(sock_, ep_,
+            std::bind(&async_echo_server::on_accept, this,
+                beast::asio::placeholders::error));
+    }
+};
+
+} // websocket
+
+#endif
--- a/src/beast/examples/websocket_echo.cpp
+++ b/src/beast/examples/websocket_echo.cpp
@@ -0,0 +1,56 @@
+//
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include "websocket_async_echo_server.hpp"
+#include "websocket_sync_echo_server.hpp"
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/signal_set.hpp>
+#include <iostream>
+
+/// Block until SIGINT or SIGTERM is received.
+void
+sig_wait()
+{
+    boost::asio::io_service ios;
+    boost::asio::signal_set signals(
+        ios, SIGINT, SIGTERM);
+    signals.async_wait(
+        [&](boost::system::error_code const&, int)
+        {
+        });
+    ios.run();
+}
+
+int main()
+{
+    using namespace beast::websocket;
+    using endpoint_type = boost::asio::ip::tcp::endpoint;
+    using address_type = boost::asio::ip::address;
+
+    beast::error_code ec;
+
+    permessage_deflate pmd;
+    pmd.client_enable = true;
+    pmd.server_enable = true;
+    pmd.compLevel = 3;
+
+    websocket::async_echo_server s1{&std::cout, 1};
+    s1.set_option(read_message_max{64 * 1024 * 1024});
+    s1.set_option(auto_fragment{false});
+    s1.set_option(pmd);
+    s1.open(endpoint_type{
+        address_type::from_string("127.0.0.1"), 6000 }, ec);
+
+    websocket::sync_echo_server s2{&std::cout};
+    s2.set_option(read_message_max{64 * 1024 * 1024});
+    s2.set_option(auto_fragment{false});
+    s2.set_option(pmd);
+    s2.open(endpoint_type{
+        address_type::from_string("127.0.0.1"), 6001 }, ec);
+
+    sig_wait();
+}
--- a/src/beast/examples/websocket_example.cpp
+++ b/src/beast/examples/websocket_example.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/examples/websocket_sync_echo_server.hpp
+++ b/src/beast/examples/websocket_sync_echo_server.hpp
@@ -0,0 +1,326 @@
+//
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef WEBSOCKET_SYNC_ECHO_SERVER_HPP
+#define WEBSOCKET_SYNC_ECHO_SERVER_HPP
+
+#include <beast/core/placeholders.hpp>
+#include <beast/core/streambuf.hpp>
+#include <beast/websocket.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/optional.hpp>
+#include <atomic>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <ostream>
+#include <string>
+#include <thread>
+#include <type_traits>
+#include <typeindex>
+#include <unordered_map>
+#include <utility>
+
+namespace websocket {
+
+/** Synchronous WebSocket echo client/server
+*/
+class sync_echo_server
+{
+public:
+    using error_code = beast::error_code;
+    using endpoint_type = boost::asio::ip::tcp::endpoint;
+    using address_type = boost::asio::ip::address;
+    using socket_type = boost::asio::ip::tcp::socket;
+
+private:
+    struct identity
+    {
+        template<class Body, class Fields>
+        void
+        operator()(beast::http::message<
+            true, Body, Fields>& req) const
+        {
+            req.fields.replace("User-Agent", "sync_echo_client");
+        }
+
+        template<class Body, class Fields>
+        void
+        operator()(beast::http::message<
+            false, Body, Fields>& resp) const
+        {
+            resp.fields.replace("Server", "sync_echo_server");
+        }
+    };
+
+    /** A container of type-erased option setters.
+    */
+    template<class NextLayer>
+    class options_set
+    {
+        // workaround for std::function bug in msvc
+        struct callable
+        {
+            virtual ~callable() = default;
+            virtual void operator()(
+                beast::websocket::stream<NextLayer>&) = 0;
+        };
+
+        template<class T>
+        class callable_impl : public callable
+        {
+            T t_;
+
+        public:
+            template<class U>
+            callable_impl(U&& u)
+                : t_(std::forward<U>(u))
+            {
+            }
+
+            void
+            operator()(beast::websocket::stream<NextLayer>& ws)
+            {
+                t_(ws);
+            }
+        };
+
+        template<class Opt>
+        class lambda
+        {
+            Opt opt_;
+
+        public:
+            lambda(lambda&&) = default;
+            lambda(lambda const&) = default;
+
+            lambda(Opt const& opt)
+                : opt_(opt)
+            {
+            }
+
+            void
+            operator()(beast::websocket::stream<NextLayer>& ws) const
+            {
+                ws.set_option(opt_);
+            }
+        };
+
+        std::unordered_map<std::type_index,
+            std::unique_ptr<callable>> list_;
+
+    public:
+        template<class Opt>
+        void
+        set_option(Opt const& opt)
+        {
+            std::unique_ptr<callable> p;
+            p.reset(new callable_impl<lambda<Opt>>{opt});
+            list_[std::type_index{
+                typeid(Opt)}] = std::move(p);
+        }
+
+        void
+        set_options(beast::websocket::stream<NextLayer>& ws)
+        {
+            for(auto const& op : list_)
+                (*op.second)(ws);
+        }
+    };
+
+    std::ostream* log_;
+    boost::asio::io_service ios_;
+    socket_type sock_;
+    endpoint_type ep_;
+    boost::asio::ip::tcp::acceptor acceptor_;
+    std::thread thread_;
+    options_set<socket_type> opts_;
+
+public:
+    /** Constructor.
+
+        @param log A pointer to a stream to log to, or `nullptr`
+        to disable logging.
+    */
+    sync_echo_server(std::ostream* log)
+        : log_(log)
+        , sock_(ios_)
+        , acceptor_(ios_)
+    {
+        opts_.set_option(
+            beast::websocket::decorate(identity{}));
+    }
+
+    /** Destructor.
+    */
+    ~sync_echo_server()
+    {
+        if(thread_.joinable())
+        {
+            error_code ec;
+            ios_.dispatch(
+                [&]{ acceptor_.close(ec); });
+            thread_.join();
+        }
+    }
+
+    /** Return the listening endpoint.
+    */
+    endpoint_type
+    local_endpoint() const
+    {
+        return acceptor_.local_endpoint();
+    }
+
+    /** Set a websocket option.
+
+        The option will be applied to all new connections.
+
+        @param opt The option to apply.
+    */
+    template<class Opt>
+    void
+    set_option(Opt const& opt)
+    {
+        opts_.set_option(opt);
+    }
+
+    /** Open a listening port.
+
+        @param ep The address and port to bind to.
+
+        @param ec Set to the error, if any occurred.
+    */
+    void
+    open(endpoint_type const& ep, error_code& ec)
+    {
+        acceptor_.open(ep.protocol(), ec);
+        if(ec)
+            return fail("open", ec);
+        acceptor_.set_option(
+            boost::asio::socket_base::reuse_address{true});
+        acceptor_.bind(ep, ec);
+        if(ec)
+            return fail("bind", ec);
+        acceptor_.listen(
+            boost::asio::socket_base::max_connections, ec);
+        if(ec)
+            return fail("listen", ec);
+        acceptor_.async_accept(sock_, ep_,
+            std::bind(&sync_echo_server::on_accept, this,
+                beast::asio::placeholders::error));
+        thread_ = std::thread{[&]{ ios_.run(); }};
+    }
+
+private:
+    void
+    fail(std::string what, error_code ec)
+    {
+        if(log_)
+        {
+            static std::mutex m;
+            std::lock_guard<std::mutex> lock{m};
+            (*log_) << what << ": " <<
+                ec.message() << std::endl;
+        }
+    }
+
+    void
+    fail(std::string what, error_code ec,
+        int id, endpoint_type const& ep)
+    {
+        if(log_)
+            if(ec != beast::websocket::error::closed)
+                fail("[#" + std::to_string(id) + " " +
+                    boost::lexical_cast<std::string>(ep) +
+                        "] " + what, ec);
+    }
+
+    void
+    on_accept(error_code ec)
+    {
+        if(ec == boost::asio::error::operation_aborted)
+            return;
+        if(ec)
+            return fail("accept", ec);
+        struct lambda
+        {
+            std::size_t id;
+            endpoint_type ep;
+            sync_echo_server& self;
+            boost::asio::io_service::work work;
+            // Must be destroyed before work otherwise the
+            // io_service could be destroyed before the socket.
+            socket_type sock;
+
+            lambda(sync_echo_server& self_,
+                endpoint_type const& ep_,
+                    socket_type&& sock_)
+                : id([]
+                    {
+                        static std::atomic<std::size_t> n{0};
+                        return ++n;
+                    }())
+                , ep(ep_)
+                , self(self_)
+                , work(sock_.get_io_service())
+                , sock(std::move(sock_))
+            {
+            }
+
+            void operator()()
+            {
+                self.do_peer(id, ep, std::move(sock));
+            }
+        };
+        std::thread{lambda{*this, ep_, std::move(sock_)}}.detach();
+        acceptor_.async_accept(sock_, ep_,
+            std::bind(&sync_echo_server::on_accept, this,
+                beast::asio::placeholders::error));
+    }
+
+    void
+    do_peer(std::size_t id,
+        endpoint_type const& ep, socket_type&& sock)
+    {
+        using boost::asio::buffer;
+        using boost::asio::buffer_copy;
+        beast::websocket::stream<
+            socket_type> ws{std::move(sock)};
+        opts_.set_options(ws);
+        error_code ec;
+        ws.accept(ec);
+        if(ec)
+        {
+            fail("accept", ec, id, ep);
+            return;
+        }
+        for(;;)
+        {
+            beast::websocket::opcode op;
+            beast::streambuf sb;
+            ws.read(op, sb, ec);
+            if(ec)
+            {
+                auto const s = ec.message();
+                break;
+            }
+            ws.set_option(beast::websocket::message_type{op});
+            ws.write(sb.data(), ec);
+            if(ec)
+                break;
+        }
+        if(ec && ec != beast::websocket::error::closed)
+        {
+            fail("read", ec, id, ep);
+        }
+    }
+};
+
+} // websocket
+
+#endif
--- a/src/beast/extras/beast/doc_debug.hpp
+++ b/src/beast/extras/beast/doc_debug.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/test/fail_counter.hpp
+++ b/src/beast/extras/beast/test/fail_counter.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/test/fail_stream.hpp
+++ b/src/beast/extras/beast/test/fail_stream.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -113,7 +113,7 @@ public:
        {
            async_completion<
                ReadHandler, void(error_code, std::size_t)
-                    > completion(handler);
+                    > completion{handler};
            next_layer_.get_io_service().post(
                bind_handler(completion.handler, ec, 0));
            return completion.result.get();
@@ -150,7 +150,7 @@ public:
        {
            async_completion<
                WriteHandler, void(error_code, std::size_t)
-                    > completion(handler);
+                    > completion{handler};
            next_layer_.get_io_service().post(
                bind_handler(completion.handler, ec, 0));
            return completion.result.get();
--- a/src/beast/extras/beast/test/sig_wait.hpp
+++ b/src/beast/extras/beast/test/sig_wait.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -9,8 +9,6 @@
 #define BEAST_TEST_SIG_WAIT_HPP

 #include <boost/asio.hpp>
-#include <condition_variable>
-#include <mutex>

 namespace beast {
 namespace test {
--- a/src/beast/extras/beast/test/string_istream.hpp
+++ b/src/beast/extras/beast/test/string_istream.hpp
@@ -1,16 +1,17 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //

-#ifndef BEAST_TEST_STRING_STREAM_HPP
-#define BEAST_TEST_STRING_STREAM_HPP
+#ifndef BEAST_TEST_STRING_ISTREAM_HPP
+#define BEAST_TEST_STRING_ISTREAM_HPP

 #include <beast/core/async_completion.hpp>
 #include <beast/core/bind_handler.hpp>
 #include <beast/core/error.hpp>
+#include <beast/core/prepare_buffer.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <string>
@@ -24,16 +25,21 @@ namespace test {
    discarded, and when data is read it comes from a string provided
    at construction.
 */
-class string_stream
+class string_istream
 {
    std::string s_;
+    boost::asio::const_buffer cb_;
    boost::asio::io_service& ios_;
+    std::size_t read_max_;

 public:
-    string_stream(boost::asio::io_service& ios,
-            std::string s)
+    string_istream(boost::asio::io_service& ios,
+            std::string s, std::size_t read_max =
+                (std::numeric_limits<std::size_t>::max)())
        : s_(std::move(s))
+        , cb_(boost::asio::buffer(s_))
        , ios_(ios)
+        , read_max_(read_max)
    {
    }

@@ -60,9 +66,9 @@ public:
        error_code& ec)
    {
        auto const n = boost::asio::buffer_copy(
-            buffers, boost::asio::buffer(s_));
+            buffers, prepare_buffer(read_max_, cb_));
        if(n > 0)
-            s_.erase(0, n);
+            cb_ = cb_ + n;
        else
            ec = boost::asio::error::eof;
        return n;
@@ -82,7 +88,7 @@ public:
        else
            ec = boost::asio::error::eof;
        async_completion<ReadHandler,
-            void(error_code, std::size_t)> completion(handler);
+            void(error_code, std::size_t)> completion{handler};
        ios_.post(bind_handler(
            completion.handler, ec, n));
        return completion.result.get();
@@ -114,7 +120,7 @@ public:
        WriteHandler&& handler)
    {
        async_completion<WriteHandler,
-            void(error_code, std::size_t)> completion(handler);
+            void(error_code, std::size_t)> completion{handler};
        ios_.post(bind_handler(completion.handler,
            error_code{}, boost::asio::buffer_size(buffers)));
        return completion.result.get();
--- a/src/beast/extras/beast/test/string_ostream.hpp
+++ b/src/beast/extras/beast/test/string_ostream.hpp
@@ -0,0 +1,118 @@
+//
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BEAST_TEST_STRING_OSTREAM_HPP
+#define BEAST_TEST_STRING_OSTREAM_HPP
+
+#include <beast/core/async_completion.hpp>
+#include <beast/core/bind_handler.hpp>
+#include <beast/core/error.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/io_service.hpp>
+#include <string>
+
+namespace beast {
+namespace test {
+
+class string_ostream
+{
+    boost::asio::io_service& ios_;
+
+public:
+    std::string str;
+
+    explicit
+    string_ostream(boost::asio::io_service& ios)
+        : ios_(ios)
+    {
+    }
+
+    boost::asio::io_service&
+    get_io_service()
+    {
+        return ios_;
+    }
+
+    template<class MutableBufferSequence>
+    std::size_t
+    read_some(MutableBufferSequence const& buffers)
+    {
+        error_code ec;
+        auto const n = read_some(buffers, ec);
+        if(ec)
+            throw system_error{ec};
+        return n;
+    }
+
+    template<class MutableBufferSequence>
+    std::size_t
+    read_some(MutableBufferSequence const& buffers,
+        error_code& ec)
+    {
+        return 0;
+    }
+
+    template<class MutableBufferSequence, class ReadHandler>
+    typename async_completion<ReadHandler,
+        void(error_code, std::size_t)>::result_type
+    async_read_some(MutableBufferSequence const& buffers,
+        ReadHandler&& handler)
+    {
+        async_completion<ReadHandler,
+            void(error_code, std::size_t)> completion{handler};
+        ios_.post(bind_handler(completion.handler,
+            error_code{}, 0));
+        return completion.result.get();
+    }
+
+    template<class ConstBufferSequence>
+    std::size_t
+    write_some(ConstBufferSequence const& buffers)
+    {
+        error_code ec;
+        auto const n = write_some(buffers, ec);
+        if(ec)
+            throw system_error{ec};
+        return n;
+    }
+
+    template<class ConstBufferSequence>
+    std::size_t
+    write_some(
+        ConstBufferSequence const& buffers, error_code&)
+    {
+        auto const n = buffer_size(buffers);
+        using boost::asio::buffer_size;
+        using boost::asio::buffer_cast;
+        str.reserve(str.size() + n);
+        for(auto const& buffer : buffers)
+            str.append(buffer_cast<char const*>(buffer),
+                buffer_size(buffer));
+        return n;
+    }
+
+    template<class ConstBufferSequence, class WriteHandler>
+    typename async_completion<
+        WriteHandler, void(error_code)>::result_type
+    async_write_some(ConstBufferSequence const& buffers,
+        WriteHandler&& handler)
+    {
+        error_code ec;
+        auto const bytes_transferred = write_some(buffers, ec);
+        async_completion<
+            WriteHandler, void(error_code, std::size_t)
+                > completion{handler};
+        get_io_service().post(
+            bind_handler(completion.handler, ec, bytes_transferred));
+        return completion.result.get();
+    }
+};
+
+} // test
+} // beast
+
+#endif
--- a/src/beast/extras/beast/test/yield_to.hpp
+++ b/src/beast/extras/beast/test/yield_to.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -21,9 +21,9 @@ namespace test {

 /** Mix-in to support tests using asio coroutines.

-    Derive from this class and use yield_to to launch test functions
-    inside coroutines. This is handy for testing asynchronous asio
-    code.
+    Derive from this class and use yield_to to launch test
+    functions inside coroutines. This is handy for testing
+    asynchronous asio code.
 */
 class enable_yield_to
 {
@@ -72,12 +72,32 @@ public:
        Function will be called with this signature:

        @code
-            void f(yield_context);
+            void f(args..., yield_context);
        @endcode
+
+        @param f The Callable object to invoke.
+
+        @param args Optional arguments forwarded to the callable object.
    */
-    template<class Function>
+#if GENERATING_DOCS
+    template<class F, class... Args>
    void
-    yield_to(Function&& f);
+    yield_to(F&& f, Args&&... args);
+#else
+    template<class F>
+    void
+    yield_to(F&& f);
+
+    template<class Function, class Arg, class... Args>
+    void
+    yield_to(Function&& f, Arg&& arg, Args&&... args)
+    {
+        yield_to(std::bind(f,
+            std::forward<Arg>(arg),
+                std::forward<Args>(args)...,
+                    std::placeholders::_1));
+    }
+#endif
 };

 template<class Function>
--- a/src/beast/extras/beast/unit_test/amount.hpp
+++ b/src/beast/extras/beast/unit_test/amount.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/unit_test/detail/const_container.hpp
+++ b/src/beast/extras/beast/unit_test/detail/const_container.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/unit_test/dstream.hpp
+++ b/src/beast/extras/beast/unit_test/dstream.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -111,7 +111,7 @@ public:
        : std::basic_ostream<CharT, Traits>(&buf_)
        , buf_(os)
    {
-        if(os.flags() && std::ios::unitbuf)
+        if(os.flags() & std::ios::unitbuf)
            std::unitbuf(*this);
    }
 };
--- a/src/beast/extras/beast/unit_test/global_suites.hpp
+++ b/src/beast/extras/beast/unit_test/global_suites.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/unit_test/main.cpp
+++ b/src/beast/extras/beast/unit_test/main.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/unit_test/match.hpp
+++ b/src/beast/extras/beast/unit_test/match.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/unit_test/recorder.hpp
+++ b/src/beast/extras/beast/unit_test/recorder.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/unit_test/reporter.hpp
+++ b/src/beast/extras/beast/unit_test/reporter.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -245,7 +245,7 @@ on_case_begin(std::string const& name)
 {
    case_results_ = case_results(name);
    os_ << suite_results_.name <<
-        (case_results_.name.empty() ? "" : 
+        (case_results_.name.empty() ? "" :
            (" " + case_results_.name)) << std::endl;
 }

@@ -283,7 +283,6 @@ reporter<_>::
 on_log(std::string const& s)
 {
    os_ << s;
-    os_.flush();
 }

 } // detail
--- a/src/beast/extras/beast/unit_test/results.hpp
+++ b/src/beast/extras/beast/unit_test/results.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/unit_test/runner.hpp
+++ b/src/beast/extras/beast/unit_test/runner.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/unit_test/suite.hpp
+++ b/src/beast/extras/beast/unit_test/suite.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -134,7 +134,7 @@ private:
        }

        /** Open a new testcase.
-        
+
            A testcase is a series of evaluated test conditions. A test
            suite may have multiple test cases. A test is associated with
            the last opened testcase. When the test first runs, a default
@@ -352,10 +352,7 @@ public:
    {
        auto const& name = ss_.str();
        if(! name.empty())
-        {
-            suite_.log.flush();
            suite_.runner_->testcase(name);
-        }
    }

    scoped_testcase(suite& self, std::stringstream& ss)
@@ -394,7 +391,6 @@ suite::testcase_t::operator()(
    std::string const& name, abort_t abort)
 {
    suite_.abort_ = abort == abort_on_fail;
-    suite_.log.flush();
    suite_.runner_->testcase(name);
 }

--- a/src/beast/extras/beast/unit_test/suite_info.hpp
+++ b/src/beast/extras/beast/unit_test/suite_info.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/unit_test/suite_list.hpp
+++ b/src/beast/extras/beast/unit_test/suite_list.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/extras/beast/unit_test/thread.hpp
+++ b/src/beast/extras/beast/unit_test/thread.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/include/beast/core.hpp
+++ b/src/beast/include/beast/core.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -9,7 +9,6 @@
 #define BEAST_CORE_HPP

 #include <beast/core/async_completion.hpp>
-#include <beast/core/basic_streambuf.hpp>
 #include <beast/core/bind_handler.hpp>
 #include <beast/core/buffer_cat.hpp>
 #include <beast/core/buffer_concepts.hpp>
--- a/src/beast/include/beast/core/async_completion.hpp
+++ b/src/beast/include/beast/core/async_completion.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -38,7 +38,7 @@ namespace beast {
    async_initfn(..., CompletionHandler&& handler)
    {
        async_completion<CompletionHandler,
-            void(error_code)> completion(handler);
+            void(error_code)> completion{handler};
        ...
        return completion.result.get();
    }
--- a/src/beast/include/beast/core/basic_streambuf.hpp
+++ b/src/beast/include/beast/core/basic_streambuf.hpp
@@ -1,333 +0,0 @@
-//
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef BEAST_BASIC_STREAMBUF_HPP
-#define BEAST_BASIC_STREAMBUF_HPP
-
-#include <beast/core/detail/empty_base_optimization.hpp>
-#include <boost/asio/buffer.hpp>
-#include <boost/intrusive/list.hpp>
-#include <iterator>
-#include <limits>
-#include <memory>
-#include <type_traits>
-
-namespace beast {
-
-/** A @b `DynamicBuffer` that uses multiple buffers internally.
-
-    The implementation uses a sequence of one or more character arrays
-    of varying sizes. Additional character array objects are appended to
-    the sequence to accommodate changes in the size of the character
-    sequence.
-
-    @note Meets the requirements of @b DynamicBuffer.
-
-    @tparam Allocator The allocator to use for managing memory.
-*/
-template<class Allocator>
-class basic_streambuf
-#if ! GENERATING_DOCS
-    : private detail::empty_base_optimization<
-        typename std::allocator_traits<Allocator>::
-            template rebind_alloc<std::uint8_t>>
-#endif
-{
-public:
-#if GENERATING_DOCS
-    /// The type of allocator used.
-    using allocator_type = Allocator;
-#else
-    using allocator_type = typename
-        std::allocator_traits<Allocator>::
-            template rebind_alloc<std::uint8_t>;
-#endif
-
-private:
-    // Storage for the list of buffers representing the input
-    // and output sequences. The allocation for each element
-    // contains `element` followed by raw storage bytes.
-    class element;
-
-    using alloc_traits = std::allocator_traits<allocator_type>;
-    using list_type = typename boost::intrusive::make_list<element,
-        boost::intrusive::constant_time_size<true>>::type;
-    using iterator = typename list_type::iterator;
-    using const_iterator = typename list_type::const_iterator;
-
-    using size_type = typename std::allocator_traits<Allocator>::size_type;
-    using const_buffer = boost::asio::const_buffer;
-    using mutable_buffer = boost::asio::mutable_buffer;
-
-    static_assert(std::is_base_of<std::bidirectional_iterator_tag,
-        typename std::iterator_traits<iterator>::iterator_category>::value,
-            "BidirectionalIterator requirements not met");
-
-    static_assert(std::is_base_of<std::bidirectional_iterator_tag,
-        typename std::iterator_traits<const_iterator>::iterator_category>::value,
-            "BidirectionalIterator requirements not met");
-
-    list_type list_;        // list of allocated buffers
-    iterator out_;          // element that contains out_pos_
-    size_type alloc_size_;  // min amount to allocate
-    size_type in_size_ = 0; // size of the input sequence
-    size_type in_pos_ = 0;  // input offset in list_.front()
-    size_type out_pos_ = 0; // output offset in *out_
-    size_type out_end_ = 0; // output end offset in list_.back()
-
-public:
-#if GENERATING_DOCS
-    /// The type used to represent the input sequence as a list of buffers.
-    using const_buffers_type = implementation_defined;
-
-    /// The type used to represent the output sequence as a list of buffers.
-    using mutable_buffers_type = implementation_defined;
-
-#else
-    class const_buffers_type;
-
-    class mutable_buffers_type;
-
-#endif
-
-    /// Destructor.
-    ~basic_streambuf();
-
-    /** Move constructor.
-
-        The new object will have the input sequence of
-        the other stream buffer, and an empty output sequence.
-
-        @note After the move, the moved-from object will have
-        an empty input and output sequence, with no internal
-        buffers allocated.
-    */
-    basic_streambuf(basic_streambuf&&);
-
-    /** Move constructor.
-
-        The new object will have the input sequence of
-        the other stream buffer, and an empty output sequence.
-
-        @note After the move, the moved-from object will have
-        an empty input and output sequence, with no internal
-        buffers allocated.
-
-        @param alloc The allocator to associate with the
-        stream buffer.
-    */
-    basic_streambuf(basic_streambuf&&,
-        allocator_type const& alloc);
-
-    /** Move assignment.
-
-        This object will have the input sequence of
-        the other stream buffer, and an empty output sequence.
-
-        @note After the move, the moved-from object will have
-        an empty input and output sequence, with no internal
-        buffers allocated.
-    */
-    basic_streambuf&
-    operator=(basic_streambuf&&);
-
-    /** Copy constructor.
-
-        This object will have a copy of the other stream
-        buffer's input sequence, and an empty output sequence.
-    */
-    basic_streambuf(basic_streambuf const&);
-
-    /** Copy constructor.
-
-        This object will have a copy of the other stream
-        buffer's input sequence, and an empty output sequence.
-
-        @param alloc The allocator to associate with the
-        stream buffer.
-    */
-    basic_streambuf(basic_streambuf const&,
-        allocator_type const& alloc);
-
-    /** Copy assignment.
-
-        This object will have a copy of the other stream
-        buffer's input sequence, and an empty output sequence.
-    */
-    basic_streambuf& operator=(basic_streambuf const&);
-
-    /** Copy constructor.
-
-        This object will have a copy of the other stream
-        buffer's input sequence, and an empty output sequence.
-    */
-    template<class OtherAlloc>
-    basic_streambuf(basic_streambuf<OtherAlloc> const&);
-
-    /** Copy constructor.
-
-        This object will have a copy of the other stream
-        buffer's input sequence, and an empty output sequence.
-
-        @param alloc The allocator to associate with the
-        stream buffer.
-    */
-    template<class OtherAlloc>
-    basic_streambuf(basic_streambuf<OtherAlloc> const&,
-        allocator_type const& alloc);
-
-    /** Copy assignment.
-
-        This object will have a copy of the other stream
-        buffer's input sequence, and an empty output sequence.
-    */
-    template<class OtherAlloc>
-    basic_streambuf& operator=(basic_streambuf<OtherAlloc> const&);
-
-    /** Construct a stream buffer.
-
-        @param alloc_size The size of buffer to allocate. This is a
-        soft limit, calls to prepare for buffers exceeding this size
-        will allocate the larger size. The default allocation size
-        is 1KB (1024 bytes).
-
-        @param alloc The allocator to use. If this parameter is
-        unspecified, a default constructed allocator will be used.
-    */
-    explicit
-    basic_streambuf(std::size_t alloc_size = 1024,
-        Allocator const& alloc = allocator_type{});
-
-    /// Returns a copy of the associated allocator.
-    allocator_type
-    get_allocator() const
-    {
-        return this->member();
-    }
-
-    /** Returns the default allocation size.
-
-        This is the smallest size that the stream buffer will allocate.
-        The size of the allocation can influence capacity, which will
-        affect algorithms that use capacity to efficiently read from
-        streams.
-    */
-    std::size_t
-    alloc_size() const
-    {
-        return alloc_size_;
-    }
-
-    /** Set the default allocation size.
-
-        This is the smallest size that the stream buffer will allocate.
-        The size of the allocation can influence capacity, which will
-        affect algorithms that use capacity to efficiently read from
-        streams.
-
-        @note This will not affect any already-existing allocations.
-
-        @param n The number of bytes.
-    */
-    void
-    alloc_size(std::size_t n)
-    {
-        alloc_size_ = n;
-    }
-
-    /// Returns the size of the input sequence.
-    size_type
-    size() const
-    {
-        return in_size_;
-    }
-
-    /// Returns the permitted maximum sum of the sizes of the input and output sequence.
-    size_type
-    max_size() const
-    {
-        return (std::numeric_limits<std::size_t>::max)();
-    }
-
-    /// Returns the maximum sum of the sizes of the input sequence and output sequence the buffer can hold without requiring reallocation.
-    std::size_t
-    capacity() const;
-
-    /** Get a list of buffers that represents the input sequence.
-
-        @note These buffers remain valid across subsequent calls to `prepare`.
-    */
-    const_buffers_type
-    data() const;
-
-    /** Get a list of buffers that represents the output sequence, with the given size.
-
-        @note Buffers representing the input sequence acquired prior to
-        this call remain valid.
-    */
-    mutable_buffers_type
-    prepare(size_type n);
-
-    /** Move bytes from the output sequence to the input sequence.
-
-        @note Buffers representing the input sequence acquired prior to
-        this call remain valid.
-    */
-    void
-    commit(size_type n);
-
-    /// Remove bytes from the input sequence.
-    void
-    consume(size_type n);
-
-    // Helper for boost::asio::read_until
-    template<class OtherAllocator>
-    friend
-    std::size_t
-    read_size_helper(basic_streambuf<
-        OtherAllocator> const& streambuf, std::size_t max_size);
-
-private:
-    void
-    clear();
-
-    void
-    move_assign(basic_streambuf& other, std::false_type);
-
-    void
-    move_assign(basic_streambuf& other, std::true_type);
-
-    void
-    copy_assign(basic_streambuf const& other, std::false_type);
-
-    void
-    copy_assign(basic_streambuf const& other, std::true_type);
-
-    void
-    delete_list();
-
-    void
-    debug_check() const;
-};
-
-/** Format output to a @ref basic_streambuf.
-
-    @param streambuf The @ref basic_streambuf to write to.
-
-    @param t The object to write.
-
-    @return A reference to the @ref basic_streambuf.
-*/
-template<class Allocator, class T>
-basic_streambuf<Allocator>&
-operator<<(basic_streambuf<Allocator>& streambuf, T const& t);
-
-} // beast
-
-#include <beast/core/impl/basic_streambuf.ipp>
-
-#endif
--- a/src/beast/include/beast/core/bind_handler.hpp
+++ b/src/beast/include/beast/core/bind_handler.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -15,21 +15,23 @@

 namespace beast {

-/** Bind parameters to a completion handler, creating a wrapped handler.
+/** Bind parameters to a completion handler, creating a new handler.

    This function creates a new handler which, when invoked with no
-    parameters, calls the original handler with the list of bound arguments.
-    The passed handler and arguments are forwarded into the returned handler,
-    which provides the same `io_service` execution guarantees as the original
-    handler.
+    parameters, calls the original handler with the list of bound
+    arguments. The passed handler and arguments are forwarded into
+    the returned handler, which provides the same `io_service`
+    execution guarantees as the original handler.

-    Unlike `io_service::wrap`, the returned handler can be used in a
-    subsequent call to `io_service::post` instead of `io_service::dispatch`,
-    to ensure that the handler will not be invoked immediately by the
-    calling function.
+    Unlike `io_service::wrap`, the returned handler can be used in
+    a subsequent call to `io_service::post` instead of
+    `io_service::dispatch`, to ensure that the handler will not be
+    invoked immediately by the calling function.

    Example:
+
    @code
+
    template<class AsyncReadStream, class ReadHandler>
    void
    do_cancel(AsyncReadStream& stream, ReadHandler&& handler)
@@ -38,6 +40,7 @@ namespace beast {
            bind_handler(std::forward<ReadHandler>(handler),
                boost::asio::error::operation_aborted, 0));
    }
+
    @endcode

    @param handler The handler to wrap.
@@ -45,22 +48,21 @@ namespace beast {
    @param args A list of arguments to bind to the handler. The
    arguments are forwarded into the returned object.
 */
-template<class CompletionHandler, class... Args>
+template<class Handler, class... Args>
 #if GENERATING_DOCS
 implementation_defined
 #else
 detail::bound_handler<
-    typename std::decay<CompletionHandler>::type, Args...>
+    typename std::decay<Handler>::type, Args...>
 #endif
-bind_handler(CompletionHandler&& handler, Args&&... args)
+bind_handler(Handler&& handler, Args&&... args)
 {
    static_assert(is_CompletionHandler<
-        CompletionHandler, void(Args...)>::value,
-            "CompletionHandler requirements not met");
+        Handler, void(Args...)>::value,
+            "Handler requirements not met");
    return detail::bound_handler<typename std::decay<
-        CompletionHandler>::type, Args...>(std::forward<
-            CompletionHandler>(handler),
-                std::forward<Args>(args)...);
+        Handler>::type, Args...>(std::forward<
+            Handler>(handler), std::forward<Args>(args)...);
 }

 } // beast
--- a/src/beast/include/beast/core/buffer_cat.hpp
+++ b/src/beast/include/beast/core/buffer_cat.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -24,8 +24,9 @@ namespace beast {
    This function returns a constant or mutable buffer sequence which,
    when iterated, efficiently concatenates the input buffer sequences.
    Copies of the arguments passed will be made; however, the returned
-    object does not take ownership of the underlying memory. The application
-    is still responsible for managing the lifetime of the referenced memory.
+    object does not take ownership of the underlying memory. The
+    application is still responsible for managing the lifetime of the
+    referenced memory.

    @param buffers The list of buffer sequences to concatenate.

--- a/src/beast/include/beast/core/buffer_concepts.hpp
+++ b/src/beast/include/beast/core/buffer_concepts.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/include/beast/core/buffers_adapter.hpp
+++ b/src/beast/include/beast/core/buffers_adapter.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/include/beast/core/consuming_buffers.hpp
+++ b/src/beast/include/beast/core/consuming_buffers.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -30,12 +30,6 @@ namespace beast {
    is still responsible for managing its lifetime.

    @tparam BufferSequence The buffer sequence to wrap.
-
-    @tparam ValueType The type of buffer of the final buffer sequence. This
-    can be different from the buffer type of the wrapped sequence. For
-    example, a `MutableBufferSequence` can be transformed into a
-    consumable `ConstBufferSequence`. Violations of buffer const safety
-    are not permitted, and will result in a compile error.
 */
 template<class BufferSequence>
 class consuming_buffers
@@ -45,6 +39,7 @@ class consuming_buffers

    BufferSequence bs_;
    iter_type begin_;
+    iter_type end_;
    std::size_t skip_ = 0;

    template<class Deduced>
@@ -56,13 +51,23 @@ class consuming_buffers
    }

 public:
-    /// The type for each element in the list of buffers.
+    /** The type for each element in the list of buffers.
+
+        If the buffers in the underlying sequence are convertible to
+        `boost::asio::mutable_buffer`, then this type will be
+        `boost::asio::mutable_buffer`, else this type will be
+        `boost::asio::const_buffer`.
+    */
+#if GENERATING_DOCS
+    using value_type = ...;
+#else
    using value_type = typename std::conditional<
        std::is_convertible<typename
            std::iterator_traits<iter_type>::value_type,
                boost::asio::mutable_buffer>::value,
                    boost::asio::mutable_buffer,
                        boost::asio::const_buffer>::type;
+#endif

 #if GENERATING_DOCS
    /// A bidirectional iterator type that may be used to read elements.
--- a/src/beast/include/beast/core/detail/base64.hpp
+++ b/src/beast/include/beast/core/detail/base64.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/include/beast/core/detail/bind_handler.hpp
+++ b/src/beast/include/beast/core/detail/bind_handler.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -42,7 +42,8 @@ public:

    template<class DeducedHandler>
    explicit
-    bound_handler(DeducedHandler&& handler, Args&&... args)
+    bound_handler(
+            DeducedHandler&& handler, Args&&... args)
        : h_(std::forward<DeducedHandler>(handler))
        , args_(std::forward<Args>(args)...)
    {
@@ -102,9 +103,11 @@ public:
 } // beast

 #include <functional>
+
 namespace std {
 template<class Handler, class... Args>
-void bind(beast::detail::bound_handler<
+void
+bind(beast::detail::bound_handler<
    Handler, Args...>, ...) = delete;
 } // std

--- a/src/beast/include/beast/core/detail/buffer_cat.hpp
+++ b/src/beast/include/beast/core/detail/buffer_cat.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -82,16 +82,20 @@ class buffer_cat_helper<Bn...>::const_iterator
    iter_t<I>&
    iter()
    {
+        // type-pun
        return *reinterpret_cast<
-            iter_t<I>*>(buf_.data());
+            iter_t<I>*>(static_cast<void*>(
+                buf_.data()));
    }

    template<std::size_t I>
    iter_t<I> const&
    iter() const
    {
+        // type-pun
        return *reinterpret_cast<
-            iter_t<I> const*>(buf_.data());
+            iter_t<I> const*>(static_cast<
+                void const*>(buf_.data()));
    }

 public:
--- a/src/beast/include/beast/core/detail/buffer_concepts.hpp
+++ b/src/beast/include/beast/core/detail/buffer_concepts.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/include/beast/core/detail/ci_char_traits.hpp
+++ b/src/beast/include/beast/core/detail/ci_char_traits.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/include/beast/core/detail/clamp.hpp
+++ b/src/beast/include/beast/core/detail/clamp.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/src/beast/include/beast/core/detail/empty_base_optimization.hpp
+++ b/src/beast/include/beast/core/detail/empty_base_optimization.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/Show More
+++ b/Show More