Boost prep

2025-07-30 04:47:29 +02:00 · 2017-07-20 13:40:34 -07:00
parent 3777cb8b9c
commit 7139dd639a
375 changed files with 5253 additions and 3884 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -11,8 +11,6 @@ env:
    # to boost's .tar.gz.
    - LCOV_ROOT=$HOME/lcov
    - VALGRIND_ROOT=$HOME/valgrind-install
-    - BOOST_ROOT=$HOME/boost_1_58_0
-    - BOOST_URL='http://sourceforge.net/projects/boost/files/boost/1.58.0/boost_1_58_0.tar.gz'

 addons:
  apt:
@ -36,11 +34,14 @@ matrix:
    # gcc coverage
    - compiler: gcc
      env:
+        - TOOLSET=gcc
+        - COMPILER=g++-6
+        - CXXSTD=c++11
        - GCC_VER=6
        - VARIANT=coverage
        - ADDRESS_MODEL=64
        - DO_VALGRIND=false
-        - BUILD_SYSTEM=cmake
+        #- BUILD_SYSTEM=cmake
        - PATH=$PWD/cmake/bin:$PATH
      addons:
        apt:
@ -55,6 +56,9 @@ matrix:
    # older GCC, release
    - compiler: gcc
      env:
+        - TOOLSET=gcc
+        - COMPILER=g++-4.8
+        - CXXSTD=c++11
        - GCC_VER=4.8
        - VARIANT=release
        - DO_VALGRIND=false
@ -71,11 +75,14 @@ matrix:
    # later GCC
    - compiler: gcc
      env:
+        - TOOLSET=gcc
+        - COMPILER=g++-5
+        - CXXSTD=c++11
        - GCC_VER=5
        - VARIANT=release
        - DO_VALGRIND=true
        - ADDRESS_MODEL=64
-        - BUILD_SYSTEM=cmake
+        #- BUILD_SYSTEM=cmake
        - PATH=$PWD/cmake/bin:$PATH
      addons:
        apt:
@ -90,13 +97,16 @@ matrix:
    # clang ubsan+asan
    - compiler: clang
      env:
+        - TOOLSET=clang
+        - COMPILER=clang++
+        - CXXSTD=c++11
        - GCC_VER=5
        - VARIANT=ubasan
        - CLANG_VER=3.8
        - DO_VALGRIND=false
        - ADDRESS_MODEL=64
        - UBSAN_OPTIONS='print_stacktrace=1'
-        - BUILD_SYSTEM=cmake
+        #- BUILD_SYSTEM=cmake
        - PATH=$PWD/cmake/bin:$PATH
        - PATH=$PWD/llvm-$LLVM_VERSION/bin:$PATH
      addons:
@ -111,7 +121,6 @@ matrix:

 cache:
  directories:
-  - $BOOST_ROOT
  - $VALGRIND_ROOT
  - llvm-$LLVM_VERSION
  - cmake
@ -119,8 +128,88 @@ cache:
 before_install: &base_before_install
  - scripts/install-dependencies.sh

+install:
+  - export BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
+  - cd ..
+  - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - export BOOST_ROOT="`pwd`"
+  - export PATH="`pwd`":$PATH
+  - git submodule update --init tools/build
+  - git submodule update --init tools/boostdep
+  - git submodule update --init libs/config
+  - git submodule update --init libs/any
+  - git submodule update --init libs/asio
+  - git submodule update --init libs/algorithm
+  - git submodule update --init libs/array
+  - git submodule update --init libs/assert
+  - git submodule update --init libs/atomic
+  - git submodule update --init libs/bind
+  - git submodule update --init libs/chrono
+  - git submodule update --init libs/concept_check
+  - git submodule update --init libs/config
+  - git submodule update --init libs/container
+  - git submodule update --init libs/context
+  - git submodule update --init libs/conversion
+  - git submodule update --init libs/core
+  - git submodule update --init libs/coroutine
+  - git submodule update --init libs/date_time
+  - git submodule update --init libs/detail
+  - git submodule update --init libs/endian
+  - git submodule update --init libs/exception
+  - git submodule update --init libs/filesystem
+  - git submodule update --init libs/foreach
+  - git submodule update --init libs/function
+  - git submodule update --init libs/function_types
+  - git submodule update --init libs/functional
+  - git submodule update --init libs/fusion
+  - git submodule update --init libs/integer
+  - git submodule update --init libs/intrusive
+  - git submodule update --init libs/io
+  - git submodule update --init libs/iostreams
+  - git submodule update --init libs/iterator
+  - git submodule update --init libs/lambda
+  - git submodule update --init libs/lexical_cast
+  - git submodule update --init libs/locale
+  - git submodule update --init libs/logic
+  - git submodule update --init libs/math
+  - git submodule update --init libs/move
+  - git submodule update --init libs/mpl
+  - git submodule update --init libs/numeric/conversion
+  - git submodule update --init libs/optional
+  - git submodule update --init libs/pool
+  - git submodule update --init libs/predef
+  - git submodule update --init libs/preprocessor
+  - git submodule update --init libs/program_options
+  - git submodule update --init libs/proto
+  - git submodule update --init libs/random
+  - git submodule update --init libs/range
+  - git submodule update --init libs/ratio
+  - git submodule update --init libs/rational
+  - git submodule update --init libs/regex
+  - git submodule update --init libs/serialization
+  - git submodule update --init libs/smart_ptr
+  - git submodule update --init libs/static_assert
+  - git submodule update --init libs/system
+  - git submodule update --init libs/thread
+  - git submodule update --init libs/throw_exception
+  - git submodule update --init libs/tokenizer
+  - git submodule update --init libs/tti
+  - git submodule update --init libs/tuple
+  - git submodule update --init libs/type_index
+  - git submodule update --init libs/type_traits
+  - git submodule update --init libs/typeof
+  - git submodule update --init libs/unordered
+  - git submodule update --init libs/utility
+  - git submodule update --init libs/variant
+  - git submodule update --init libs/winapi
+  - rm -rf libs/beast
+  - mkdir libs/beast
+  - cp -r $TRAVIS_BUILD_DIR/* libs/beast
+  - ./bootstrap.sh
+
 script:
-  - travis_retry scripts/build-and-test.sh
+  - travis_retry libs/beast/scripts/build-and-test.sh

 after_script:
  - cat nohup.out || echo "nohup.out already deleted"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,9 @@
+Version 86:
+
+* Boost prep
+
+--------------------------------------------------------------------------------
+
 Version 85:

 * Fix test failure
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,4 +1,11 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

 cmake_minimum_required (VERSION 3.5.2)

@ -53,6 +60,11 @@ endif()

 option (Boost_USE_STATIC_LIBS "Use static libraries for boost" ON)

+add_definitions (-DBOOST_ASIO_DISABLE_BOOST_ARRAY=1)
+add_definitions (-DBOOST_ASIO_DISABLE_BOOST_BIND=1)
+add_definitions (-DBOOST_ASIO_DISABLE_BOOST_DATE_TIME=1)
+add_definitions (-DBOOST_ASIO_DISABLE_BOOST_REGEX=1)
+
 set(BOOST_COMPONENTS system)
 if (Beast_BUILD_EXAMPLES OR Beast_BUILD_TESTS)
    list(APPEND BOOST_COMPONENTS coroutine context filesystem program_options thread)
@ -82,10 +94,10 @@ endif()
 find_package(OpenSSL)

 if (OPENSSL_FOUND)
-    add_definitions (-DBEAST_USE_OPENSSL=1)
+    add_definitions (-DBOOST_BEAST_USE_OPENSSL=1)

 else()
-    add_definitions (-DBEAST_USE_OPENSSL=0)
+    add_definitions (-DBOOST_BEAST_USE_OPENSSL=0)
    message("OpenSSL not found.")
 endif()

@ -116,18 +128,18 @@ endfunction()
 if ("${VARIANT}" STREQUAL "coverage")
    if (MSVC)
    else()
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -fprofile-arcs -ftest-coverage")
-        set (CMAKE_BUILD_TYPE RELWITHDEBINFO)
-        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov")
+        set (CMAKE_BUILD_TYPE DEBUG)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 --coverage")
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
    endif()

 elseif ("${VARIANT}" STREQUAL "ubasan")
    if (MSVC)
    else()
-        set (CMAKE_CXX_FLAGS
-          "${CMAKE_CXX_FLAGS} -DBEAST_NO_SLOW_TESTS=1 -msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/scripts/blacklist.supp")
-        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address,undefined")
        set (CMAKE_BUILD_TYPE RELWITHDEBINFO)
+        set (CMAKE_CXX_FLAGS
+          "${CMAKE_CXX_FLAGS} -DBOOST_BEAST_NO_SLOW_TESTS=1 -msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/scripts/blacklist.supp")
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address,undefined")
    endif()

 elseif ("${VARIANT}" STREQUAL "debug")
@ -165,9 +177,9 @@ if (OPENSSL_FOUND)
    include_directories (${OPENSSL_INCLUDE_DIR})
 endif()

-file(GLOB_RECURSE BEAST_INCLUDES
-    ${PROJECT_SOURCE_DIR}/include/beast/*.hpp
-    ${PROJECT_SOURCE_DIR}/include/beast/*.ipp
+file(GLOB_RECURSE BOOST_BEAST_INCLUDES
+    ${PROJECT_SOURCE_DIR}/include/boost/beast/*.hpp
+    ${PROJECT_SOURCE_DIR}/include/boost/beast/*.ipp
 )

 file(GLOB_RECURSE COMMON_INCLUDES
@ -179,8 +191,8 @@ file(GLOB_RECURSE EXAMPLE_INCLUDES
  )

 file(GLOB_RECURSE EXTRAS_INCLUDES
-    ${PROJECT_SOURCE_DIR}/extras/beast/*.hpp
-    ${PROJECT_SOURCE_DIR}/extras/beast/*.ipp
+    ${PROJECT_SOURCE_DIR}/extras/boost/beast/*.hpp
+    ${PROJECT_SOURCE_DIR}/extras/boost/beast/*.ipp
 )

 if (Beast_BUILD_TESTS)
--- a/21
+++ b/21
@ -1,9 +1,11 @@
 #
-# 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 import os ;
 import feature ;
@ -53,17 +55,17 @@ if [ os.name ] = MACOSX
 }

 variant coverage :
-    release
+    debug
    :
-    <cxxflags>"-msse4.2 -fprofile-arcs -ftest-coverage"
-    <linkflags>"-lgcov"
+    <cxxflags>"-msse4.2 --coverage"
+    <linkflags>"--coverage"
    ;

 variant ubasan
  :
    release
  :
-    <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=scripts/blacklist.supp"
+    <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=libs/beast/scripts/blacklist.supp"
    <linkflags>"-fsanitize=address,undefined"
  ;

@ -72,7 +74,6 @@ project beast
    <implicit-dependency>/boost//headers
    <include>.
    <include>./extras
-    <include>./include
    #<use>/boost//headers
    <library>/boost/system//boost_system
    <library>/boost/coroutine//boost_coroutine
@ -83,6 +84,10 @@ project beast
    <threading>multi
    <runtime-link>shared
    <debug-symbols>on
+    <define>BOOST_ASIO_DISABLE_BOOST_ARRAY=1
+    <define>BOOST_ASIO_DISABLE_BOOST_BIND=1
+    <define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1
+    <define>BOOST_ASIO_DISABLE_BOOST_REGEX=1
    <toolset>gcc:<cxxflags>-std=c++11
    <toolset>gcc:<cxxflags>-Wno-unused-parameter
    <toolset>gcc:<cxxflags>-Wno-unused-variable # Temporary until we can figure out -isystem
@ -108,8 +113,4 @@ project beast
    <os>NT,<toolset>gcc-cygwin:<define>__USE_W32_SOCKETS
  : usage-requirements
  :
-    build-dir bin
  ;
-
-build-project test ;
-build-project example ;
--- a/appveyor.yml
+++ b/appveyor.yml
@ -22,9 +22,8 @@ install:
 #  - git checkout boost-1.64.0
  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\beast\
  - git submodule update --init tools/build
-  - git submodule update --init libs/config
  - git submodule update --init tools/boostdep
-#  - python tools/boostdep/depinst/depinst.py beast
+  - git submodule update --init libs/config
  - git submodule update --init libs/any
  - git submodule update --init libs/asio
  - git submodule update --init libs/algorithm
@ -64,7 +63,6 @@ install:
  - git submodule update --init libs/mpl
  - git submodule update --init libs/numeric/conversion
  - git submodule update --init libs/optional
-#  - git submodule update --init libs/phoenix
  - git submodule update --init libs/pool
  - git submodule update --init libs/predef
  - git submodule update --init libs/preprocessor
@ -77,7 +75,6 @@ install:
  - git submodule update --init libs/regex
  - git submodule update --init libs/serialization
  - git submodule update --init libs/smart_ptr
-#  - git submodule update --init libs/spirit
  - git submodule update --init libs/static_assert
  - git submodule update --init libs/system
  - git submodule update --init libs/thread
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@ -1,4 +1,11 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

 add_subdirectory (echo-op)
 add_subdirectory (http-client)
--- a/example/Jamfile
+++ b/example/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 build-project echo-op ;
 build-project http-client ;
--- a/example/common/detect_ssl.hpp
+++ b/example/common/detect_ssl.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_COMMON_DETECT_SSL_HPP
-#define BEAST_EXAMPLE_COMMON_DETECT_SSL_HPP
+#ifndef BOOST_BEAST_EXAMPLE_COMMON_DETECT_SSL_HPP
+#define BOOST_BEAST_EXAMPLE_COMMON_DETECT_SSL_HPP

 #include <boost/assert.hpp>
 #include <boost/config.hpp>
@ -19,7 +21,7 @@

 //[example_core_detect_ssl_1

-#include <beast.hpp>
+#include <boost/beast.hpp>
 #include <boost/logic/tribool.hpp>

 /** Return `true` if a buffer contains a TLS/SSL client handshake.
@ -50,7 +52,7 @@ is_ssl_handshake(ConstBufferSequence const& buffers);

 //]

-using namespace beast;
+using namespace boost::beast;

 //[example_core_detect_ssl_2

@ -263,8 +265,8 @@ async_detect_ssl(
    // uses the result and handler specializations associated with
    // the completion token to help customize the return value.
    //
-    beast::async_completion<
-        CompletionToken, void(beast::error_code, boost::tribool)> init{token};
+    boost::beast::async_completion<
+        CompletionToken, void(boost::beast::error_code, boost::tribool)> init{token};

    // Create the composed operation and launch it. This is a constructor
    // call followed by invocation of operator(). We use handler_type
@ -275,7 +277,7 @@ async_detect_ssl(
    detect_ssl_op<AsyncReadStream, DynamicBuffer, handler_type<
        CompletionToken, void(error_code, boost::tribool)>>{
            stream, buffer, init.completion_handler}(
-                beast::error_code{}, 0);
+                boost::beast::error_code{}, 0);

    // This hook lets the caller see a return value when appropriate.
    // For example this might return std::future<error_code, boost::tribool> if
@ -381,7 +383,7 @@ public:
    // Our main entry point. This will get called as our
    // intermediate operations complete. Definition below.
    //
-    void operator()(beast::error_code ec, std::size_t bytes_transferred);
+    void operator()(boost::beast::error_code ec, std::size_t bytes_transferred);
 };

 //]
@ -398,7 +400,7 @@ template<
    class Handler>
 void
 detect_ssl_op<AsyncStream, DynamicBuffer, Handler>::
-operator()(beast::error_code ec, std::size_t bytes_transferred)
+operator()(boost::beast::error_code ec, std::size_t bytes_transferred)
 {
    // Execute the state machine
    switch(step_)
--- a/example/common/helpers.hpp
+++ b/example/common/helpers.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_COMMON_HELPERS_HPP
-#define BEAST_EXAMPLE_COMMON_HELPERS_HPP
+#ifndef BOOST_BEAST_EXAMPLE_COMMON_HELPERS_HPP
+#define BOOST_BEAST_EXAMPLE_COMMON_HELPERS_HPP

 #include <boost/asio/io_service.hpp>
 #include <boost/asio/signal_set.hpp>
--- a/example/common/mime_types.hpp
+++ b/example/common/mime_types.hpp
@ -4,20 +4,22 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_COMMON_MIME_TYPES_HPP
-#define BEAST_EXAMPLE_COMMON_MIME_TYPES_HPP
+#ifndef BOOST_BEAST_EXAMPLE_COMMON_MIME_TYPES_HPP
+#define BOOST_BEAST_EXAMPLE_COMMON_MIME_TYPES_HPP

-#include <beast/core/string.hpp>
+#include <boost/beast/core/string.hpp>
 #include <boost/filesystem/path.hpp>

 // Return a reasonable mime type based on the extension of a file.
 //
 template<class = void>
-beast::string_view
+boost::beast::string_view
 mime_type(boost::filesystem::path const& path)
 {
-    using beast::iequals;
+    using boost::beast::iequals;
    auto const ext = path.extension().string();
    if(iequals(ext, ".txt"))  return "text/plain";
    if(iequals(ext, ".htm"))  return "text/html";
--- a/example/common/rfc7231.hpp
+++ b/example/common/rfc7231.hpp
@ -4,12 +4,14 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_COMMON_RFC7231_HPP
-#define BEAST_EXAMPLE_COMMON_RFC7231_HPP
+#ifndef BOOST_BEAST_EXAMPLE_COMMON_RFC7231_HPP
+#define BOOST_BEAST_EXAMPLE_COMMON_RFC7231_HPP

-#include <beast/core/string.hpp>
-#include <beast/http/message.hpp>
+#include <boost/beast/core/string.hpp>
+#include <boost/beast/http/message.hpp>

 namespace rfc7231 {

@ -27,11 +29,11 @@ namespace rfc7231 {
 */
 template<class Body, class Allocator>
 bool
-is_expect_100_continue(beast::http::request<
-    Body, beast::http::basic_fields<Allocator>> const& req)
+is_expect_100_continue(boost::beast::http::request<
+    Body, boost::beast::http::basic_fields<Allocator>> const& req)
 {
-    return beast::iequals(
-        req[beast::http::field::expect], "100-continue");
+    return boost::beast::iequals(
+        req[boost::beast::http::field::expect], "100-continue");
 }

 } // rfc7231
--- a/example/common/root_certificates.hpp
+++ b/example/common/root_certificates.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_COMMON_ROOT_CERTIFICATES_HPP
-#define BEAST_EXAMPLE_COMMON_ROOT_CERTIFICATES_HPP
+#ifndef BOOST_BEAST_EXAMPLE_COMMON_ROOT_CERTIFICATES_HPP
+#define BOOST_BEAST_EXAMPLE_COMMON_ROOT_CERTIFICATES_HPP

 #include <boost/asio/ssl.hpp>
 #include <string>
--- a/example/common/session_alloc.hpp
+++ b/example/common/session_alloc.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_COMMON_SESSION_ALLOC_HPP
-#define BEAST_EXAMPLE_COMMON_SESSION_ALLOC_HPP
+#ifndef BOOST_BEAST_EXAMPLE_COMMON_SESSION_ALLOC_HPP
+#define BOOST_BEAST_EXAMPLE_COMMON_SESSION_ALLOC_HPP

 #include <boost/asio/handler_alloc_hook.hpp>
 #include <boost/asio/handler_continuation_hook.hpp>
@ -18,7 +20,7 @@
 #include <utility>

 #if 1
-#include "extras/beast/unit_test/dstream.hpp"
+#include "extras/boost/beast/unit_test/dstream.hpp"
 #endif

 template<class Context>
--- a/example/common/ssl_stream.hpp
+++ b/example/common/ssl_stream.hpp
@ -4,12 +4,14 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_COMMON_SSL_STREAM_HPP
-#define BEAST_EXAMPLE_COMMON_SSL_STREAM_HPP
+#ifndef BOOST_BEAST_EXAMPLE_COMMON_SSL_STREAM_HPP
+#define BOOST_BEAST_EXAMPLE_COMMON_SSL_STREAM_HPP

-// This include is necessary to work with `ssl::stream` and `beast::websocket::stream`
-#include <beast/websocket/ssl.hpp>
+// This include is necessary to work with `ssl::stream` and `boost::beast::websocket::stream`
+#include <boost/beast/websocket/ssl.hpp>

 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>
@ -292,42 +294,42 @@ public:
    template<class SyncStream>
    friend
    void
-    teardown(beast::websocket::teardown_tag,
+    teardown(boost::beast::websocket::teardown_tag,
        ssl_stream<SyncStream>& stream,
            boost::system::error_code& ec);

    template<class AsyncStream, class TeardownHandler>
    friend
    void
-    async_teardown(beast::websocket::teardown_tag,
+    async_teardown(boost::beast::websocket::teardown_tag,
        ssl_stream<AsyncStream>& stream, TeardownHandler&& handler);
 };

-// These hooks are used to inform beast::websocket::stream on
+// These hooks are used to inform boost::beast::websocket::stream on
 // how to tear down the connection as part of the WebSocket
 // protocol specifications

 template<class SyncStream>
 inline
 void
-teardown(beast::websocket::teardown_tag,
+teardown(boost::beast::websocket::teardown_tag,
    ssl_stream<SyncStream>& stream,
        boost::system::error_code& ec)
 {
    // Just forward it to the wrapped ssl::stream
-    using beast::websocket::teardown;
-    teardown(beast::websocket::teardown_tag{}, *stream.p_, ec);
+    using boost::beast::websocket::teardown;
+    teardown(boost::beast::websocket::teardown_tag{}, *stream.p_, ec);
 }

 template<class AsyncStream, class TeardownHandler>
 inline
 void
-async_teardown(beast::websocket::teardown_tag,
+async_teardown(boost::beast::websocket::teardown_tag,
    ssl_stream<AsyncStream>& stream, TeardownHandler&& handler)
 {
    // Just forward it to the wrapped ssl::stream
-    using beast::websocket::async_teardown;
-    async_teardown(beast::websocket::teardown_tag{},
+    using boost::beast::websocket::async_teardown;
+    async_teardown(boost::beast::websocket::teardown_tag{},
        *stream.p_, std::forward<TeardownHandler>(handler));
 }

--- a/example/common/write_msg.hpp
+++ b/example/common/write_msg.hpp
@ -4,16 +4,18 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_COMMON_WRITE_MSG_HPP
-#define BEAST_EXAMPLE_COMMON_WRITE_MSG_HPP
+#ifndef BOOST_BEAST_EXAMPLE_COMMON_WRITE_MSG_HPP
+#define BOOST_BEAST_EXAMPLE_COMMON_WRITE_MSG_HPP

-#include <beast/core/async_result.hpp>
-#include <beast/core/handler_ptr.hpp>
-#include <beast/core/type_traits.hpp>
-#include <beast/http/message.hpp>
-#include <beast/http/write.hpp>
-#include <beast/http/type_traits.hpp>
+#include <boost/beast/core/async_result.hpp>
+#include <boost/beast/core/handler_ptr.hpp>
+#include <boost/beast/core/type_traits.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/write.hpp>
+#include <boost/beast/http/type_traits.hpp>
 #include <boost/asio/handler_alloc_hook.hpp>
 #include <boost/asio/handler_continuation_hook.hpp>
 #include <boost/asio/handler_invoke_hook.hpp>
@ -44,15 +46,15 @@ class write_msg_op
        // operation takes ownership of the message and destroys
        // it when it is done.
        //
-        beast::http::message<isRequest, Body, Fields> msg;
+        boost::beast::http::message<isRequest, Body, Fields> msg;

        // Serializer for the message
-        beast::http::serializer<isRequest, Body, Fields> sr;
+        boost::beast::http::serializer<isRequest, Body, Fields> sr;

        data(
            Handler& handler,
            AsyncWriteStream& stream_,
-            beast::http::message<isRequest, Body, Fields>&& msg_)
+            boost::beast::http::message<isRequest, Body, Fields>&& msg_)
            : stream(stream_)
            , msg(std::move(msg_))
            , sr(msg)
@ -67,7 +69,7 @@ class write_msg_op
    // and it also helps to meet Asio's deallocate-before-invocation
    // guarantee.
    //
-    beast::handler_ptr<data, Handler> d_;
+    boost::beast::handler_ptr<data, Handler> d_;

 public:
    // Asio can move and copy the handler, we support both
@ -99,16 +101,16 @@ public:
    operator()()
    {
        auto& d = *d_;
-        beast::http::async_write(
+        boost::beast::http::async_write(
            d.stream, d.sr, std::move(*this));
    }

    // Completion handler
    //
-    // This gets called when beast::http::async_write completes
+    // This gets called when boost::beast::http::async_write completes
    //
    void
-    operator()(beast::error_code ec)
+    operator()(boost::beast::error_code ec)
    {
        d_.invoke(ec);
    }
@ -196,27 +198,27 @@ template<
    class AsyncWriteStream,
    bool isRequest, class Body, class Fields,
    class WriteHandler>
-beast::async_return_type<WriteHandler, void(beast::error_code)>
+boost::beast::async_return_type<WriteHandler, void(boost::beast::error_code)>
 async_write_msg(
    AsyncWriteStream& stream,
-    beast::http::message<isRequest, Body, Fields>&& msg,
+    boost::beast::http::message<isRequest, Body, Fields>&& msg,
    WriteHandler&& handler)
 {
    static_assert(
-        beast::is_async_write_stream<AsyncWriteStream>::value,
+        boost::beast::is_async_write_stream<AsyncWriteStream>::value,
        "AsyncWriteStream requirements not met");

-    static_assert(beast::http::is_body<Body>::value,
+    static_assert(boost::beast::http::is_body<Body>::value,
        "Body requirements not met");

-    static_assert(beast::http::is_body_reader<Body>::value,
+    static_assert(boost::beast::http::is_body_reader<Body>::value,
        "BodyReader requirements not met");

-    beast::async_completion<WriteHandler, void(beast::error_code)> init{handler};
+    boost::beast::async_completion<WriteHandler, void(boost::beast::error_code)> init{handler};

    ::detail::write_msg_op<
        AsyncWriteStream,
-        beast::handler_type<WriteHandler, void(beast::error_code)>,
+        boost::beast::handler_type<WriteHandler, void(boost::beast::error_code)>,
        isRequest, Body, Fields>{
            init.completion_handler,
            stream,
--- a/example/doc/http_examples.hpp
+++ b/example/doc/http_examples.hpp
@ -4,8 +4,10 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#include <beast.hpp>
+#include <boost/beast.hpp>
 #include <iostream>

 /*  This file contains the functions and classes found in the documentation
@ -15,7 +17,8 @@
    building a network application.
 */

-// The documentation assumes the beast::http namespace
+// The documentation assumes the boost::beast::http namespace
+namespace boost {
 namespace beast {
 namespace http {

@ -1234,3 +1237,4 @@ print_chunked_body(

 } // http
 } // beast
+} // boost
--- a/example/echo-op/CMakeLists.txt
+++ b/example/echo-op/CMakeLists.txt
@ -1,11 +1,19 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)

 GroupSources(example/echo-op "/")

 add_executable (echo-op
-    ${BEAST_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
+    Jamfile
    echo_op.cpp
 )

--- a/example/echo-op/Jamfile
+++ b/example/echo-op/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 exe echo-op :
    echo_op.cpp
--- a/example/echo-op/echo_op.cpp
+++ b/example/echo-op/echo_op.cpp
@ -4,8 +4,10 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#include <beast/core.hpp>
+#include <boost/beast/core.hpp>
 #include <boost/asio.hpp>
 #include <cstddef>
 #include <iostream>
@ -21,7 +23,7 @@ auto
 async_echo(AsyncStream& stream, CompletionToken&& token)

 //]
-    -> beast::async_return_type<CompletionToken, void(beast::error_code)>;
+    -> boost::beast::async_return_type<CompletionToken, void(boost::beast::error_code)>;

 //[example_core_echo_op_2

@ -64,9 +66,9 @@ async_echo(AsyncStream& stream, CompletionToken&& token)
 template<
    class AsyncStream,
    class CompletionToken>
-beast::async_return_type<       /*< The [link beast.ref.beast__async_return_type `async_return_type`] customizes the return value based on the completion token >*/
+boost::beast::async_return_type<       /*< The [link beast.ref.beast__async_return_type `async_return_type`] customizes the return value based on the completion token >*/
    CompletionToken,
-    void(beast::error_code)>    /*< This is the signature for the completion handler >*/
+    void(boost::beast::error_code)>    /*< This is the signature for the completion handler >*/
 async_echo(
    AsyncStream& stream,
    CompletionToken&& token);
@ -97,7 +99,7 @@ class echo_op
        // re-use of memory allocated by composed operations during
        // a continuation.
        //
-        boost::asio::basic_streambuf<beast::handler_alloc<char, Handler>> buffer;
+        boost::asio::basic_streambuf<boost::beast::handler_alloc<char, Handler>> buffer;

        // handler_ptr requires that the first parameter to the
        // contained object constructor is a reference to the
@ -106,7 +108,7 @@ class echo_op
        explicit state(Handler& handler, AsyncStream& stream_)
            : stream(stream_)
            , buffer((std::numeric_limits<std::size_t>::max)(),
-                beast::handler_alloc<char, Handler>{handler})
+                boost::beast::handler_alloc<char, Handler>{handler})
        {
        }
    };
@ -123,7 +125,7 @@ class echo_op
    //      asio_handler_allocate
    //      asio_handler_deallocate
    //
-    beast::handler_ptr<state, Handler> p_;
+    boost::beast::handler_ptr<state, Handler> p_;

 public:
    // Boost.Asio requires that handlers are CopyConstructible.
@ -145,7 +147,7 @@ public:
    // The entry point for this handler. This will get called
    // as our intermediate operations complete. Definition below.
    //
-    void operator()(beast::error_code ec, std::size_t bytes_transferred);
+    void operator()(boost::beast::error_code ec, std::size_t bytes_transferred);

    // The next four functions are required for our class
    // to meet the requirements for composed operations.
@ -177,7 +179,7 @@ public:
 //
 template<class AsyncStream, class Handler>
 void echo_op<AsyncStream, Handler>::
-operator()(beast::error_code ec, std::size_t bytes_transferred)
+operator()(boost::beast::error_code ec, std::size_t bytes_transferred)
 {
    // Store a reference to our state. The address of the state won't
    // change, and this solves the problem where dereferencing the
@ -199,7 +201,7 @@ operator()(beast::error_code ec, std::size_t bytes_transferred)
            // async_read_until could have read past the newline,
            // use buffer_prefix to make sure we only send one line
            return boost::asio::async_write(p.stream,
-                beast::buffer_prefix(bytes_transferred, p.buffer.data()), std::move(*this));
+                boost::beast::buffer_prefix(bytes_transferred, p.buffer.data()), std::move(*this));

        case 2:
            p.buffer.consume(bytes_transferred);
@ -295,20 +297,20 @@ class echo_op;
 // Read a line and echo it back
 //
 template<class AsyncStream, class CompletionToken>
-beast::async_return_type<CompletionToken, void(beast::error_code)>
+boost::beast::async_return_type<CompletionToken, void(boost::beast::error_code)>
 async_echo(AsyncStream& stream, CompletionToken&& token)
 {
    // Make sure stream meets the requirements. We use static_assert
    // to cause a friendly message instead of an error novel.
    //
-    static_assert(beast::is_async_stream<AsyncStream>::value,
+    static_assert(boost::beast::is_async_stream<AsyncStream>::value,
        "AsyncStream requirements not met");

    // This helper manages some of the handler's lifetime and
    // uses the result and handler specializations associated with
    // the completion token to help customize the return value.
    //
-    beast::async_completion<CompletionToken, void(beast::error_code)> init{token};
+    boost::beast::async_completion<CompletionToken, void(boost::beast::error_code)> init{token};

    // Create the composed operation and launch it. This is a constructor
    // call followed by invocation of operator(). We use handler_type
@ -316,8 +318,8 @@ async_echo(AsyncStream& stream, CompletionToken&& token)
    // allowing user-defined specializations of the async_result template
    // to be used.
    //
-    echo_op<AsyncStream, beast::handler_type<CompletionToken, void(beast::error_code)>>{
-        stream, init.completion_handler}(beast::error_code{}, 0);
+    echo_op<AsyncStream, boost::beast::handler_type<CompletionToken, void(boost::beast::error_code)>>{
+        stream, init.completion_handler}(boost::beast::error_code{}, 0);

    // This hook lets the caller see a return value when appropriate.
    // For example this might return std::future<error_code> if
@ -346,7 +348,7 @@ int main(int, char** argv)
    acceptor.listen();
    acceptor.accept(sock);
    async_echo(sock,
-        [&](beast::error_code ec)
+        [&](boost::beast::error_code ec)
        {
            if(ec)
                std::cerr << argv[0] << ": " << ec.message() << std::endl;
--- a/example/http-client-ssl/CMakeLists.txt
+++ b/example/http-client-ssl/CMakeLists.txt
@ -1,12 +1,20 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)
 GroupSources(example/common common)
 GroupSources(example/http-client-ssl "/")

 add_executable (http-client-ssl
-    ${BEAST_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
    ${COMMON_INCLUDES}
+    Jamfile
    http_client_ssl.cpp
 )

--- a/example/http-client-ssl/Jamfile
+++ b/example/http-client-ssl/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 import os ;

--- a/example/http-client-ssl/http_client_ssl.cpp
+++ b/example/http-client-ssl/http_client_ssl.cpp
@ -4,12 +4,14 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

 #include "../common/root_certificates.hpp"

-#include <beast/core.hpp>
-#include <beast/http.hpp>
-#include <beast/version.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/http.hpp>
+#include <boost/beast/version.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 #include <iostream>
@ -17,13 +19,13 @@

 using tcp = boost::asio::ip::tcp;       // from <boost/asio.hpp>
 namespace ssl = boost::asio::ssl;       // from <boost/asio/ssl.hpp>
-namespace http = beast::http; // from <beast/http.hpp>
+namespace http = boost::beast::http;    // from <boost/beast/http.hpp>

 int main()
 {
    // A helper for reporting errors
    auto const fail =
-        [](std::string what, beast::error_code ec)
+        [](std::string what, boost::beast::error_code ec)
        {
            std::cerr << what << ": " << ec.message() << std::endl;
            std::cerr.flush();
@ -72,7 +74,7 @@ int main()
    req.version = 11;
    req.set(http::field::host, host + ":" +
        std::to_string(sock.remote_endpoint().port()));
-    req.set(http::field::user_agent, BEAST_VERSION_STRING);
+    req.set(http::field::user_agent, BOOST_BEAST_VERSION_STRING);
    req.prepare_payload();

    // Write the HTTP request to the remote host
@ -81,7 +83,7 @@ int main()
        return fail("write", ec);

    // This buffer is used for reading and must be persisted
-    beast::flat_buffer b;
+    boost::beast::flat_buffer b;

    // Declare a container to hold the response
    http::response<http::dynamic_body> res;
--- a/example/http-client/CMakeLists.txt
+++ b/example/http-client/CMakeLists.txt
@ -1,12 +1,19 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)

 GroupSources(example/http-client "/")

 add_executable (http-client
-    ${BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
+    Jamfile
    http_client.cpp
 )

--- a/example/http-client/Jamfile
+++ b/example/http-client/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 exe http-client :
    http_client.cpp
--- a/example/http-client/http_client.cpp
+++ b/example/http-client/http_client.cpp
@ -4,31 +4,32 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast

 //[example_http_client

-#include <beast/core.hpp>
-#include <beast/http.hpp>
-#include <beast/version.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/http.hpp>
+#include <boost/beast/version.hpp>
 #include <boost/asio.hpp>
 #include <cstdlib>
 #include <iostream>
 #include <string>

 using tcp = boost::asio::ip::tcp;       // from <boost/asio.hpp>
-namespace http = beast::http; // from <beast/http.hpp>
+namespace http = boost::beast::http;    // from <boost/beast/http.hpp>

 int main()
 {
    // A helper for reporting errors
    auto const fail =
-        [](std::string what, beast::error_code ec)
+        [](std::string what, boost::beast::error_code ec)
        {
            std::cerr << what << ": " << ec.message() << std::endl;
            return EXIT_FAILURE;
        };

-    beast::error_code ec;
+    boost::beast::error_code ec;

    // Set up an asio socket
    boost::asio::io_service ios;
@ -50,7 +51,7 @@ int main()
    http::request<http::string_body> req{http::verb::get, "/", 11};
    req.set(http::field::host, host + ":" +
        std::to_string(sock.remote_endpoint().port()));
-    req.set(http::field::user_agent, BEAST_VERSION_STRING);
+    req.set(http::field::user_agent, BOOST_BEAST_VERSION_STRING);
    req.prepare_payload();

    // Write the HTTP request to the remote host
@ -59,7 +60,7 @@ int main()
        return fail("write", ec);

    // This buffer is used for reading and must be persisted
-    beast::flat_buffer b;
+    boost::beast::flat_buffer b;

    // Declare a container to hold the response
    http::response<http::dynamic_body> res;
@ -78,7 +79,7 @@ int main()
    // not_connected happens sometimes
    // so don't bother reporting it.
    //
-    if(ec && ec != beast::errc::not_connected)
+    if(ec && ec != boost::beast::errc::not_connected)
        return fail("shutdown", ec);

    // If we get here then the connection is closed gracefully
--- a/example/http-crawl/CMakeLists.txt
+++ b/example/http-crawl/CMakeLists.txt
@ -1,12 +1,19 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)

 GroupSources(example/http-crawl "/")

 add_executable (http-crawl
-    ${BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
+    Jamfile
    urls_large_data.hpp
    urls_large_data.cpp
    http_crawl.cpp
--- a/example/http-crawl/Jamfile
+++ b/example/http-crawl/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 exe http-crawl :
    http_crawl.cpp
--- a/example/http-crawl/http_crawl.cpp
+++ b/example/http-crawl/http_crawl.cpp
@ -4,22 +4,24 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

 #include "urls_large_data.hpp"

-#include <beast/core/multi_buffer.hpp>
-#include <beast/http.hpp>
-#include <beast/version.hpp>
+#include <boost/beast/core/multi_buffer.hpp>
+#include <boost/beast/http.hpp>
+#include <boost/beast/version.hpp>
 #include <boost/asio.hpp>
 #include <cstdlib>
 #include <iostream>

 using tcp = boost::asio::ip::tcp;       // from <boost/asio.hpp>
-namespace http = beast::http; // from <beast/http.hpp>
+namespace http = boost::beast::http;    // from <boost/beast/http.hpp>

 template<class String>
 void
-err(beast::error_code const& ec, String const& what)
+err(boost::beast::error_code const& ec, String const& what)
 {
    std::cerr << what << ": " << ec.message() << std::endl;
 }
@ -33,7 +35,7 @@ main(int, char const*[])
 {
    // A helper for reporting errors
    auto const fail =
-        [](std::string what, beast::error_code ec)
+        [](std::string what, boost::beast::error_code ec)
        {
            std::cerr << what << ": " << ec.message() << std::endl;
            std::cerr.flush();
@ -46,7 +48,7 @@ main(int, char const*[])
    // Loop over all the URLs
    for(auto const& host : urls_large_data())
    {
-        beast::error_code ec;
+        boost::beast::error_code ec;

        // Look up the domain name
        tcp::resolver r(ios);
@ -77,7 +79,7 @@ main(int, char const*[])
        // Set up an HTTP GET request
        http::request<http::string_body> req{http::verb::get, "/", 11};
        req.set(http::field::host, host + std::string(":") + std::to_string(ep.port()));
-        req.set(http::field::user_agent, BEAST_VERSION_STRING);
+        req.set(http::field::user_agent, BOOST_BEAST_VERSION_STRING);

        // Set the Connection: close field, this way the server will close
        // the connection. This consumes less resources (no TIME_WAIT) because
@ -95,7 +97,7 @@ main(int, char const*[])
            // "half-close" here to shut down our end.
            //
            sock.shutdown(tcp::socket::shutdown_send, ec);
-            if(ec && ec != beast::errc::not_connected)
+            if(ec && ec != boost::beast::errc::not_connected)
                return fail("shutdown", ec);
        }
        if(ec)
@ -105,7 +107,7 @@ main(int, char const*[])
        }

        // This buffer is needed for reading
-        beast::multi_buffer b;
+        boost::beast::multi_buffer b;

        // The response will go into this object
        http::response<http::string_body> res;
@ -129,7 +131,7 @@ main(int, char const*[])
        // Now we do the other half of the close,
        // which is to shut down the receiver. 
        sock.shutdown(tcp::socket::shutdown_receive, ec);
-        if(ec && ec != beast::errc::not_connected)
+        if(ec && ec != boost::beast::errc::not_connected)
            return fail("shutdown", ec);

        std::cout << res << std::endl;
--- a/example/http-crawl/urls_large_data.cpp
+++ b/example/http-crawl/urls_large_data.cpp
@ -4,6 +4,8 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

 #include "urls_large_data.hpp"

--- a/example/http-crawl/urls_large_data.hpp
+++ b/example/http-crawl/urls_large_data.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_HTTP_CRAWL_URLS_LARGE_DATA_HPP
-#define BEAST_EXAMPLE_HTTP_CRAWL_URLS_LARGE_DATA_HPP
+#ifndef BOOST_BEAST_EXAMPLE_HTTP_CRAWL_URLS_LARGE_DATA_HPP
+#define BOOST_BEAST_EXAMPLE_HTTP_CRAWL_URLS_LARGE_DATA_HPP

 #include <vector>

--- a/example/http-server-fast/CMakeLists.txt
+++ b/example/http-server-fast/CMakeLists.txt
@ -1,12 +1,20 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)
 GroupSources(example/common common)
 GroupSources(example/http-server-fast "/")

 add_executable (http-server-fast
-    ${BEAST_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
    ${COMMON_INCLUDES}
+    Jamfile
    fields_alloc.hpp
    http_server_fast.cpp
 )
--- a/example/http-server-fast/Jamfile
+++ b/example/http-server-fast/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 exe http-server-fast :
    http_server_fast.cpp
--- a/example/http-server-fast/fields_alloc.hpp
+++ b/example/http-server-fast/fields_alloc.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_FIELDS_ALLOC_HPP
-#define BEAST_EXAMPLE_FIELDS_ALLOC_HPP
+#ifndef BOOST_BEAST_EXAMPLE_FIELDS_ALLOC_HPP
+#define BOOST_BEAST_EXAMPLE_FIELDS_ALLOC_HPP

 #include <boost/throw_exception.hpp>
 #include <cstdlib>
--- a/example/http-server-fast/http_server_fast.cpp
+++ b/example/http-server-fast/http_server_fast.cpp
@ -4,14 +4,16 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

 #include "fields_alloc.hpp"

 #include "../common/mime_types.hpp"

-#include <beast/core.hpp>
-#include <beast/http.hpp>
-#include <beast/version.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/http.hpp>
+#include <boost/beast/version.hpp>
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
 #include <chrono>
@ -25,7 +27,7 @@

 namespace ip = boost::asio::ip;         // from <boost/asio.hpp>
 using tcp = boost::asio::ip::tcp;       // from <boost/asio.hpp>
-namespace http = beast::http; // from <beast/http.hpp>
+namespace http = boost::beast::http;    // from <boost/beast/http.hpp>

 class http_worker
 {
@ -47,7 +49,7 @@ public:

 private:
    using alloc_t = fields_alloc<char>;
-    using request_body_t = http::basic_dynamic_body<beast::flat_static_buffer<1024 * 1024>>;
+    using request_body_t = http::basic_dynamic_body<boost::beast::flat_static_buffer<1024 * 1024>>;

    // The acceptor used to listen for incoming connections.
    tcp::acceptor& acceptor_;
@ -59,7 +61,7 @@ private:
    tcp::socket socket_{acceptor_.get_io_service()};

    // The buffer for performing reads
-    beast::flat_static_buffer<8192> buffer_;
+    boost::beast::flat_static_buffer<8192> buffer_;

    // The allocator used for the fields in the request and reply.
    alloc_t alloc_{8192};
@ -86,13 +88,13 @@ private:
    void accept()
    {
        // Clean up any previous connection.
-        beast::error_code ec;
+        boost::beast::error_code ec;
        socket_.close(ec);
        buffer_.consume(buffer_.size());

        acceptor_.async_accept(
            socket_,
-            [this](beast::error_code ec)
+            [this](boost::beast::error_code ec)
            {
                if (ec)
                {
@ -131,7 +133,7 @@ private:
            socket_,
            buffer_,
            *parser_,
-            [this](beast::error_code ec)
+            [this](boost::beast::error_code ec)
            {
                if (ec)
                    accept();
@ -179,7 +181,7 @@ private:
        http::async_write(
            socket_,
            *string_serializer_,
-            [this](beast::error_code ec)
+            [this](boost::beast::error_code ec)
            {
                socket_.shutdown(tcp::socket::shutdown_send, ec);
                string_serializer_.reset();
@ -188,7 +190,7 @@ private:
            });
    }

-    void send_file(beast::string_view target)
+    void send_file(boost::beast::string_view target)
    {
        // Request path must be absolute and not contain "..".
        if (target.empty() || target[0] != '/' || target.find("..") != std::string::npos)
@ -205,10 +207,10 @@ private:
            target.size());

        http::file_body::value_type file;
-        beast::error_code ec;
+        boost::beast::error_code ec;
        file.open(
            full_path.c_str(),
-            beast::file_mode::read,
+            boost::beast::file_mode::read,
            ec);
        if(ec)
        {
@ -235,7 +237,7 @@ private:
        http::async_write(
            socket_,
            *file_serializer_,
-            [this](beast::error_code ec)
+            [this](boost::beast::error_code ec)
            {
                socket_.shutdown(tcp::socket::shutdown_send, ec);
                file_serializer_.reset();
@ -250,7 +252,7 @@ private:
        if (request_deadline_.expires_at() <= std::chrono::steady_clock::now())
        {
            // Close socket to cancel any outstanding operation.
-            beast::error_code ec;
+            boost::beast::error_code ec;
            socket_.close();

            // Sleep indefinitely until we're given a new deadline.
@ -259,7 +261,7 @@ private:
        }

        request_deadline_.async_wait(
-            [this](beast::error_code)
+            [this](boost::beast::error_code)
            {
                check_deadline();
            });
--- a/example/http-server-small/CMakeLists.txt
+++ b/example/http-server-small/CMakeLists.txt
@ -1,11 +1,19 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)

 GroupSources(example/http-server-small "/")

 add_executable (http-server-small
-    ${BEAST_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
+    Jamfile
    http_server_small.cpp
 )

--- a/example/http-server-small/Jamfile
+++ b/example/http-server-small/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 exe http-server-small :
    http_server_small.cpp
--- a/example/http-server-small/http_server_small.cpp
+++ b/example/http-server-small/http_server_small.cpp
@ -4,10 +4,12 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#include <beast/core.hpp>
-#include <beast/http.hpp>
-#include <beast/version.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/http.hpp>
+#include <boost/beast/version.hpp>
 #include <boost/asio.hpp>
 #include <chrono>
 #include <cstdlib>
@ -18,7 +20,7 @@

 namespace ip = boost::asio::ip;         // from <boost/asio.hpp>
 using tcp = boost::asio::ip::tcp;       // from <boost/asio.hpp>
-namespace http = beast::http; // from <beast/http.hpp>
+namespace http = boost::beast::http;    // from <boost/beast/http.hpp>

 namespace my_program_state
 {
@ -57,7 +59,7 @@ private:
    tcp::socket socket_;

    // The buffer for performing reads.
-    beast::flat_buffer buffer_{8192};
+    boost::beast::flat_buffer buffer_{8192};

    // The request message.
    http::request<http::dynamic_body> request_;
@ -79,7 +81,7 @@ private:
            socket_,
            buffer_,
            request_,
-            [self](beast::error_code ec)
+            [self](boost::beast::error_code ec)
            {
                if(!ec)
                    self->process_request();
@ -106,7 +108,7 @@ private:
            // we do not recognize the request method.
            response_.result(http::status::bad_request);
            response_.set(http::field::content_type, "text/plain");
-            beast::ostream(response_.body)
+            boost::beast::ostream(response_.body)
                << "Invalid request-method '"
                << request_.method_string().to_string()
                << "'";
@ -123,7 +125,7 @@ private:
        if(request_.target() == "/count")
        {
            response_.set(http::field::content_type, "text/html");
-            beast::ostream(response_.body)
+            boost::beast::ostream(response_.body)
                << "<html>\n"
                <<  "<head><title>Request count</title></head>\n"
                <<  "<body>\n"
@ -137,7 +139,7 @@ private:
        else if(request_.target() == "/time")
        {
            response_.set(http::field::content_type, "text/html");
-            beast::ostream(response_.body)
+            boost::beast::ostream(response_.body)
                <<  "<html>\n"
                <<  "<head><title>Current time</title></head>\n"
                <<  "<body>\n"
@ -152,7 +154,7 @@ private:
        {
            response_.result(http::status::not_found);
            response_.set(http::field::content_type, "text/plain");
-            beast::ostream(response_.body) << "File not found\r\n";
+            boost::beast::ostream(response_.body) << "File not found\r\n";
        }
    }

@ -167,7 +169,7 @@ private:
        http::async_write(
            socket_,
            response_,
-            [self](beast::error_code ec)
+            [self](boost::beast::error_code ec)
            {
                self->socket_.shutdown(tcp::socket::shutdown_send, ec);
                self->deadline_.cancel();
@ -181,7 +183,7 @@ private:
        auto self = shared_from_this();

        deadline_.async_wait(
-            [self](beast::error_code ec)
+            [self](boost::beast::error_code ec)
            {
                if(!ec)
                {
@ -197,7 +199,7 @@ void
 http_server(tcp::acceptor& acceptor, tcp::socket& socket)
 {
  acceptor.async_accept(socket,
-      [&](beast::error_code ec)
+      [&](boost::beast::error_code ec)
      {
          if(!ec)
              std::make_shared<http_connection>(std::move(socket))->start();
--- a/example/http-server-threaded/CMakeLists.txt
+++ b/example/http-server-threaded/CMakeLists.txt
@ -1,12 +1,20 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)
 GroupSources(example/common common)
 GroupSources(example/http-server-threaded "/")

 add_executable (http-server-threaded
-    ${BEAST_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
    ${COMMON_INCLUDES}
+    Jamfile
    http_server_threaded.cpp
 )

--- a/example/http-server-threaded/Jamfile
+++ b/example/http-server-threaded/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 exe http-server-threaded :
    http_server_threaded.cpp
--- a/example/http-server-threaded/http_server_threaded.cpp
+++ b/example/http-server-threaded/http_server_threaded.cpp
@ -4,12 +4,14 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

 #include "../common/mime_types.hpp"

-#include <beast/core.hpp>
-#include <beast/http.hpp>
-#include <beast/version.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/http.hpp>
+#include <boost/beast/version.hpp>
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
 #include <chrono>
@ -28,17 +30,17 @@

 namespace ip = boost::asio::ip;         // from <boost/asio.hpp>
 using tcp = boost::asio::ip::tcp;       // from <boost/asio.hpp>
-namespace http = beast::http;       // from <beast/http.hpp>
+namespace http = boost::beast::http;    // from <boost/beast/http.hpp>

 class connection
    : public std::enable_shared_from_this<connection>
 {
    tcp::socket sock_;
-    beast::string_view root_;
+    boost::beast::string_view root_;

 public:
    explicit
-    connection(tcp::socket&& sock, beast::string_view root)
+    connection(tcp::socket&& sock, boost::beast::string_view root)
        : sock_(std::move(sock))
        , root_(root)
    {
@ -57,10 +59,10 @@ public:
 private:
    // Send a client error response
    http::response<http::span_body<char const>>
-    client_error(http::status result, beast::string_view text)
+    client_error(http::status result, boost::beast::string_view text)
    {
        http::response<http::span_body<char const>> res{result, 11};
-        res.set(http::field::server, BEAST_VERSION_STRING);
+        res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
        res.set(http::field::content_type, "text/plain");
        res.set(http::field::connection, "close");
        res.body = text;
@ -74,7 +76,7 @@ private:
    not_found() const
    {
        http::response<http::string_body> res{http::status::not_found, 11};
-        res.set(http::field::server, BEAST_VERSION_STRING);
+        res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
        res.set(http::field::content_type, "text/html");
        res.set(http::field::connection, "close");
        res.body = "The file was not found";
@ -85,10 +87,10 @@ private:
    // Return an HTTP Server Error
    //
    http::response<http::string_body>
-    server_error(beast::error_code const& ec) const
+    server_error(boost::beast::error_code const& ec) const
    {
        http::response<http::string_body> res{http::status::internal_server_error, 11};
-        res.set(http::field::server, BEAST_VERSION_STRING);
+        res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
        res.set(http::field::content_type, "text/html");
        res.set(http::field::connection, "close");
        res.body = "Error: " + ec.message();
@ -98,15 +100,15 @@ private:

    // Return a file response to an HTTP GET request
    //
-    http::response<beast::http::file_body>
+    http::response<boost::beast::http::file_body>
    get(boost::filesystem::path const& full_path,
-        beast::error_code& ec) const
+        boost::beast::error_code& ec) const
    {
        http::response<http::file_body> res;
-        res.set(http::field::server, BEAST_VERSION_STRING);
+        res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
        res.set(http::field::content_type, mime_type(full_path));
        res.set(http::field::connection, "close");
-        res.body.open(full_path.string<std::string>().c_str(), beast::file_mode::scan, ec);
+        res.body.open(full_path.string<std::string>().c_str(), boost::beast::file_mode::scan, ec);
        if(ec)
            return res;
        res.set(http::field::content_length, res.body.size());
@ -116,7 +118,7 @@ private:
    // Handle a request
    template<class Body>
    void
-    do_request(http::request<Body> const& req, beast::error_code& ec)
+    do_request(http::request<Body> const& req, boost::beast::error_code& ec)
    {
        // verb must be get
        if(req.method() != http::verb::get)
@ -137,10 +139,10 @@ private:
        auto full_path = root_.to_string();
        full_path.append(req.target().data(), req.target().size());

-        beast::error_code file_ec;
+        boost::beast::error_code file_ec;
        auto res = get(full_path, file_ec);

-        if(file_ec == beast::errc::no_such_file_or_directory)
+        if(file_ec == boost::beast::errc::no_such_file_or_directory)
        {
            http::write(sock_, not_found(), ec);
        }
@ -160,8 +162,8 @@ private:
    {
        try
        {
-            beast::error_code ec;
-            beast::flat_buffer buffer;
+            boost::beast::error_code ec;
+            boost::beast::flat_buffer buffer;
            for(;;)
            {
                http::request_parser<http::string_body> parser;
@ -171,18 +173,18 @@ private:
                if(ec == http::error::end_of_stream)
                    break;
                if(ec)
-                    throw beast::system_error{ec};
+                    throw boost::beast::system_error{ec};
                do_request(parser.get(), ec);
                if(ec)
                {
                    if(ec != http::error::end_of_stream)
-                        throw beast::system_error{ec};
+                        throw boost::beast::system_error{ec};
                    break;
                }
            }
            sock_.shutdown(tcp::socket::shutdown_both, ec);
            if(ec && ec != boost::asio::error::not_connected)
-                throw beast::system_error{ec};
+                throw boost::beast::system_error{ec};
        }
        catch (const std::exception& e)
        {
--- a/example/server-framework/CMakeLists.txt
+++ b/example/server-framework/CMakeLists.txt
@ -1,6 +1,13 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)

 GroupSources(example/server-framework "/")
 GroupSources(example/common "common")
@ -10,9 +17,10 @@ file(GLOB_RECURSE SERVER_INCLUDES
  )

 add_executable (server-framework
-    ${BEAST_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
    ${COMMON_INCLUDES}
    ${SERVER_INCLUDES}
+    Jamfile
    main.cpp
 )

--- a/example/server-framework/Jamfile
+++ b/example/server-framework/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 exe server-framework :
    main.cpp
--- a/example/server-framework/README.md
+++ b/example/server-framework/README.md
@ -1,5 +1,5 @@
 <img width="880" height = "80" alt = "Beast"
-    src="https://raw.githubusercontent.com/vinniefalco/Beast/master/doc/images/readme.png">
+    src="https://raw.githubusercontent.com/boostorg/beast/master/doc/images/readme.png">

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

@ -67,7 +67,7 @@ ports created in the example program, and the HTTP services contained by
 the HTTP ports:

 <img width="880" height = "344" alt = "ServerFramework"
-    src="https://raw.githubusercontent.com/vinniefalco/Beast/master/doc/images/server.png">
+    src="https://raw.githubusercontent.com/boostorg/beast/master/doc/images/server.png">

 ## PortHandler Requirements
 ```C++
--- a/example/server-framework/file_service.hpp
+++ b/example/server-framework/file_service.hpp
@ -4,18 +4,20 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_FILE_SERVICE_HPP
-#define BEAST_EXAMPLE_SERVER_FILE_SERVICE_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_FILE_SERVICE_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_FILE_SERVICE_HPP

 #include "framework.hpp"
 #include "../common/mime_types.hpp"

-#include <beast/core/string.hpp>
-#include <beast/http/empty_body.hpp>
-#include <beast/http/file_body.hpp>
-#include <beast/http/message.hpp>
-#include <beast/http/string_body.hpp>
+#include <boost/beast/core/string.hpp>
+#include <boost/beast/http/empty_body.hpp>
+#include <boost/beast/http/file_body.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/string_body.hpp>

 #include <boost/filesystem/path.hpp>

@ -51,7 +53,7 @@ public:
    explicit
    file_service(
        boost::filesystem::path const& root,
-        beast::string_view server)
+        boost::beast::string_view server)
        : root_(root)
        , server_(server)
    {
@ -109,7 +111,7 @@ public:
    respond(
        Stream&&,
        endpoint_type const& ep,
-        beast::http::request<Body, Fields>&& req,
+        boost::beast::http::request<Body, Fields>&& req,
        Send const& send) const
    {
        boost::ignore_unused(ep);
@ -117,7 +119,7 @@ public:
        // Determine our action based on the method
        switch(req.method())
        {
-        case beast::http::verb::get:
+        case boost::beast::http::verb::get:
        {
            // For GET requests we deliver the actual file 
            boost::filesystem::path rel_path(req.target().to_string());
@ -129,10 +131,10 @@ public:
            // Calculate full path from root
            boost::filesystem::path full_path = root_ / rel_path;

-            beast::error_code ec;
+            boost::beast::error_code ec;
            auto res = get(req, full_path, ec);

-            if(ec == beast::errc::no_such_file_or_directory)
+            if(ec == boost::beast::errc::no_such_file_or_directory)
            {
                send(not_found(req, rel_path));
            }
@ -149,7 +151,7 @@ public:
            return true;
        }

-        case beast::http::verb::head:
+        case boost::beast::http::verb::head:
        {
            // We are just going to give them the headers they
            // would otherwise get, but without the body.
@ -160,10 +162,10 @@ public:
            // Calculate full path from root
            boost::filesystem::path full_path = root_ / rel_path;

-            beast::error_code ec;
+            boost::beast::error_code ec;
            auto res = head(req, full_path, ec);

-            if(ec == beast::errc::no_such_file_or_directory)
+            if(ec == boost::beast::errc::no_such_file_or_directory)
            {
                send(not_found(req, rel_path));
            }
@ -194,17 +196,17 @@ private:
    // Return an HTTP Not Found response
    //
    template<class Body, class Fields>
-    beast::http::response<beast::http::string_body>
+    boost::beast::http::response<boost::beast::http::string_body>
    not_found(
-        beast::http::request<Body, Fields> const& req,
+        boost::beast::http::request<Body, Fields> const& req,
        boost::filesystem::path const& rel_path) const
    {
        boost::ignore_unused(rel_path);
-        beast::http::response<beast::http::string_body> res;
+        boost::beast::http::response<boost::beast::http::string_body> res;
        res.version = req.version;
-        res.result(beast::http::status::not_found);
-        res.set(beast::http::field::server, server_);
-        res.set(beast::http::field::content_type, "text/html");
+        res.result(boost::beast::http::status::not_found);
+        res.set(boost::beast::http::field::server, server_);
+        res.set(boost::beast::http::field::content_type, "text/html");
        res.body = "The file was not found"; // VFALCO append rel_path
        res.prepare_payload();
        return res;
@ -213,18 +215,18 @@ private:
    // Return an HTTP Server Error
    //
    template<class Body, class Fields>
-    beast::http::response<beast::http::string_body>
+    boost::beast::http::response<boost::beast::http::string_body>
    server_error(
-        beast::http::request<Body, Fields> const& req,
+        boost::beast::http::request<Body, Fields> const& req,
        boost::filesystem::path const& rel_path,
        error_code const& ec) const
    {
        boost::ignore_unused(rel_path);
-        beast::http::response<beast::http::string_body> res;
+        boost::beast::http::response<boost::beast::http::string_body> res;
        res.version = req.version;
-        res.result(beast::http::status::internal_server_error);
-        res.set(beast::http::field::server, server_);
-        res.set(beast::http::field::content_type, "text/html");
+        res.result(boost::beast::http::status::internal_server_error);
+        res.set(boost::beast::http::field::server, server_);
+        res.set(boost::beast::http::field::content_type, "text/html");
        res.body = "Error: " + ec.message();
        res.prepare_payload();
        return res;
@ -233,43 +235,43 @@ private:
    // Return a file response to an HTTP GET request
    //
    template<class Body, class Fields>
-    boost::optional<beast::http::response<beast::http::file_body>>
+    boost::optional<boost::beast::http::response<boost::beast::http::file_body>>
    get(
-        beast::http::request<Body, Fields> const& req,
+        boost::beast::http::request<Body, Fields> const& req,
        boost::filesystem::path const& full_path,
-        beast::error_code& ec) const
+        boost::beast::error_code& ec) const
    {
-        beast::http::response<beast::http::file_body> res;
+        boost::beast::http::response<boost::beast::http::file_body> res;
        res.version = req.version;
-        res.set(beast::http::field::server, server_);
-        res.set(beast::http::field::content_type, mime_type(full_path));
-        res.body.open(full_path.string<std::string>().c_str(),  beast::file_mode::scan, ec);
+        res.set(boost::beast::http::field::server, server_);
+        res.set(boost::beast::http::field::content_type, mime_type(full_path));
+        res.body.open(full_path.string<std::string>().c_str(),  boost::beast::file_mode::scan, ec);
        if(ec)
            return boost::none;
-        res.set(beast::http::field::content_length, res.body.size());
+        res.set(boost::beast::http::field::content_length, res.body.size());
        return {std::move(res)};
    }

    // Return a response to an HTTP HEAD request
    //
    template<class Body, class Fields>
-    boost::optional<beast::http::response<beast::http::empty_body>>
+    boost::optional<boost::beast::http::response<boost::beast::http::empty_body>>
    head(
-        beast::http::request<Body, Fields> const& req,
+        boost::beast::http::request<Body, Fields> const& req,
        boost::filesystem::path const& full_path,
-        beast::error_code& ec) const
+        boost::beast::error_code& ec) const
    {
-        beast::http::response<beast::http::empty_body> res;
+        boost::beast::http::response<boost::beast::http::empty_body> res;
        res.version = req.version;
-        res.set(beast::http::field::server, server_);
-        res.set(beast::http::field::content_type, mime_type(full_path));
+        res.set(boost::beast::http::field::server, server_);
+        res.set(boost::beast::http::field::content_type, mime_type(full_path));

        // Use a manual file body here
-        beast::http::file_body::value_type body;
-        body.open(full_path.string<std::string>().c_str(), beast::file_mode::scan, ec);
+        boost::beast::http::file_body::value_type body;
+        body.open(full_path.string<std::string>().c_str(), boost::beast::file_mode::scan, ec);
        if(ec)
            return boost::none;
-        res.set(beast::http::field::content_length, body.size());
+        res.set(boost::beast::http::field::content_length, body.size());
        return {std::move(res)};
    }
 };
--- a/example/server-framework/framework.hpp
+++ b/example/server-framework/framework.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_FRAMEWORK_HPP
-#define BEAST_EXAMPLE_SERVER_FRAMEWORK_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_FRAMEWORK_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_FRAMEWORK_HPP

 #include <boost/asio/io_service.hpp>
 #include <boost/asio/strand.hpp>
--- a/example/server-framework/http_async_port.hpp
+++ b/example/server-framework/http_async_port.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_HTTP_ASYNC_PORT_HPP
-#define BEAST_EXAMPLE_SERVER_HTTP_ASYNC_PORT_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_HTTP_ASYNC_PORT_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_HTTP_ASYNC_PORT_HPP

 #include "server.hpp"

@ -16,12 +18,12 @@
 #include "../common/rfc7231.hpp"
 #include "../common/write_msg.hpp"

-#include <beast/core/flat_buffer.hpp>
-#include <beast/http/dynamic_body.hpp>
-#include <beast/http/parser.hpp>
-#include <beast/http/read.hpp>
-#include <beast/http/string_body.hpp>
-#include <beast/http/write.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/http/dynamic_body.hpp>
+#include <boost/beast/http/parser.hpp>
+#include <boost/beast/http/read.hpp>
+#include <boost/beast/http/string_body.hpp>
+#include <boost/beast/http/write.hpp>
 #include <memory>
 #include <utility>
 #include <ostream>
@ -57,7 +59,7 @@ class queued_http_write_impl : public queued_http_write
    Stream& stream_;

    // The message to send, which we acquire by move or copy
-    beast::http::message<isRequest, Body, Fields> msg_;
+    boost::beast::http::message<isRequest, Body, Fields> msg_;

    // The handler to invoke when the send completes.
    Handler handler_;
@ -70,7 +72,7 @@ public:
    template<class DeducedHandler>
    queued_http_write_impl(
        Stream& stream,
-        beast::http::message<isRequest, Body, Fields>&& msg,
+        boost::beast::http::message<isRequest, Body, Fields>&& msg,
        DeducedHandler&& handler)
        : stream_(stream)
        , msg_(std::move(msg))
@ -105,7 +107,7 @@ template<
 std::unique_ptr<queued_http_write>
 make_queued_http_write(
    Stream& stream,
-    beast::http::message<isRequest, Body, Fields>&& msg,
+    boost::beast::http::message<isRequest, Body, Fields>&& msg,
    Handler&& handler)
 {
    return std::unique_ptr<queued_http_write>{
@ -158,10 +160,10 @@ protected:
    endpoint_type ep_;

    // The buffer for performing reads
-    beast::flat_buffer buffer_;
+    boost::beast::flat_buffer buffer_;

    // The parser for reading the requests
-    boost::optional<beast::http::request_parser<beast::http::dynamic_body>> parser_;
+    boost::optional<boost::beast::http::request_parser<boost::beast::http::dynamic_body>> parser_;

    // This is the queue of outgoing messages
    std::vector<std::unique_ptr<queued_http_write>> queue_;
@ -177,7 +179,7 @@ protected:
 public:
    // Constructor
    async_http_con_base(
-        beast::string_view server_name,
+        boost::beast::string_view server_name,
        std::ostream& log,
        service_list<Services...> const& services,
        std::size_t id,
@ -267,7 +269,7 @@ protected:
        parser_.emplace(std::piecewise_construct, std::make_tuple(1024 * 1024));

        // Read just the header
-        beast::http::async_read_header(
+        boost::beast::http::async_read_header(
            impl().stream(),
            buffer_,
            *parser_,
@ -299,7 +301,7 @@ protected:
        // sends a message
        template<class Body, class Fields>
        void
-        operator()(beast::http::response<Body, Fields>&& res) const
+        operator()(boost::beast::http::response<Body, Fields>&& res) const
        {
            self_.do_write(std::move(res));
        }
@ -311,7 +313,7 @@ protected:
    {
        // This happens when the other end closes gracefully
        //
-        if(ec == beast::http::error::end_of_stream)
+        if(ec == boost::beast::http::error::end_of_stream)
        {
            // VFALCO what about the write queue?
            return impl().do_shutdown();
@ -342,7 +344,7 @@ protected:

        // Read the rest of the message, if any.
        //
-        beast::http::async_read(
+        boost::beast::http::async_read(
            impl().stream(),
            buffer_,
            *parser_,
@ -413,7 +415,7 @@ protected:
    //
    template<class Body, class Fields>
    void
-    do_write(beast::http::response<Body, Fields>&& res)
+    do_write(boost::beast::http::response<Body, Fields>&& res)
    {
        // See if a write is in progress
        if(! writing_)
@ -459,7 +461,7 @@ protected:
        // should be closed afterwards. For example if
        // we send a Connection: close.
        //
-        if(ec == beast::http::error::end_of_stream)
+        if(ec == boost::beast::http::error::end_of_stream)
            return impl().do_shutdown();

        // On failure just log and return
@ -565,7 +567,7 @@ private:
        // not_connected happens under normal
        // circumstances so don't bother reporting it.
        //
-        if(ec && ec != beast::errc::not_connected)
+        if(ec && ec != boost::beast::errc::not_connected)
            return this->fail("shutdown", ec);
    }
 };
--- a/example/server-framework/http_base.hpp
+++ b/example/server-framework/http_base.hpp
@ -4,14 +4,16 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_HTTP_BASE_HPP
-#define BEAST_EXAMPLE_SERVER_HTTP_BASE_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_HTTP_BASE_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_HTTP_BASE_HPP

-#include <beast/core/string.hpp>
-#include <beast/http/empty_body.hpp>
-#include <beast/http/message.hpp>
-#include <beast/http/string_body.hpp>
+#include <boost/beast/core/string.hpp>
+#include <boost/beast/http/empty_body.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/string_body.hpp>
 #include <memory>
 #include <utility>
 #include <ostream>
@ -25,11 +27,11 @@ namespace framework {
 */
 class http_base
 {
-    beast::string_view server_name_;
+    boost::beast::string_view server_name_;

 public:
    explicit
-    http_base(beast::string_view server_name)
+    http_base(boost::beast::string_view server_name)
        : server_name_(server_name)
    {
    }
@ -38,17 +40,17 @@ protected:
    // Returns a bad request result response
    //
    template<class Body, class Fields>
-    beast::http::response<beast::http::string_body>
-    bad_request(beast::http::request<Body, Fields> const& req) const
+    boost::beast::http::response<boost::beast::http::string_body>
+    bad_request(boost::beast::http::request<Body, Fields> const& req) const
    {
-        beast::http::response<beast::http::string_body> res;
+        boost::beast::http::response<boost::beast::http::string_body> res;

        // Match the version to the request
        res.version = req.version;

-        res.result(beast::http::status::bad_request);
-        res.set(beast::http::field::server, server_name_);
-        res.set(beast::http::field::content_type, "text/html");
+        res.result(boost::beast::http::status::bad_request);
+        res.set(boost::beast::http::field::server, server_name_);
+        res.set(boost::beast::http::field::content_type, "text/html");
        res.body = "Bad request";
        res.prepare_payload();
        return res;
@ -57,16 +59,16 @@ protected:
    // Returns a 100 Continue result response
    //
    template<class Body, class Fields>
-    beast::http::response<beast::http::empty_body>
-    continue_100(beast::http::request<Body, Fields> const& req) const
+    boost::beast::http::response<boost::beast::http::empty_body>
+    continue_100(boost::beast::http::request<Body, Fields> const& req) const
    {
-        beast::http::response<beast::http::empty_body> res;
+        boost::beast::http::response<boost::beast::http::empty_body> res;

        // Match the version to the request
        res.version = req.version;

-        res.result(beast::http::status::continue_);
-        res.set(beast::http::field::server, server_name_);
+        res.result(boost::beast::http::status::continue_);
+        res.set(boost::beast::http::field::server, server_name_);

        return res;
    }
--- a/example/server-framework/http_sync_port.hpp
+++ b/example/server-framework/http_sync_port.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_HTTP_SYNC_PORT_HPP
-#define BEAST_EXAMPLE_SERVER_HTTP_SYNC_PORT_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_HTTP_SYNC_PORT_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_HTTP_SYNC_PORT_HPP

 #include "server.hpp"

@ -16,13 +18,13 @@
 #include "../common/rfc7231.hpp"
 #include "../common/write_msg.hpp"

-#include <beast/core/flat_buffer.hpp>
-#include <beast/core/handler_ptr.hpp>
-#include <beast/http/dynamic_body.hpp>
-#include <beast/http/parser.hpp>
-#include <beast/http/read.hpp>
-#include <beast/http/string_body.hpp>
-#include <beast/http/write.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/handler_ptr.hpp>
+#include <boost/beast/http/dynamic_body.hpp>
+#include <boost/beast/http/parser.hpp>
+#include <boost/beast/http/read.hpp>
+#include <boost/beast/http/string_body.hpp>
+#include <boost/beast/http/write.hpp>
 #include <memory>
 #include <utility>
 #include <ostream>
@ -68,12 +70,12 @@ class sync_http_con_base
    endpoint_type ep_;

    // The buffer for performing reads
-    beast::flat_buffer buffer_;
+    boost::beast::flat_buffer buffer_;

 public:
    /// Constructor
    sync_http_con_base(
-        beast::string_view server_name,
+        boost::beast::string_view server_name,
        std::ostream& log,
        service_list<Services...> const& services,
        std::size_t id,
@ -155,10 +157,10 @@ private:
        template<class Body, class Fields>
        void
        operator()(
-            beast::http::response<Body, Fields>&& res) const
+            boost::beast::http::response<Body, Fields>&& res) const
        {
-            beast::http::serializer<false, Body, Fields> sr{res};
-            beast::http::write(self_.impl().stream(), sr, ec_);
+            boost::beast::http::serializer<false, Body, Fields> sr{res};
+            boost::beast::http::write(self_.impl().stream(), sr, ec_);
        }
    };

@ -189,19 +191,19 @@ private:
            // We construct the dynamic body with a 1MB limit
            // to prevent vulnerability to buffer attacks.
            //
-            beast::http::request_parser<beast::http::dynamic_body> parser(
+            boost::beast::http::request_parser<boost::beast::http::dynamic_body> parser(
                std::piecewise_construct, std::make_tuple(1024* 1024));

            // Read the header first
-            beast::http::read_header(impl().stream(), buffer_, parser, ec);
+            boost::beast::http::read_header(impl().stream(), buffer_, parser, ec);

            // This happens when the other end closes gracefully
            //
-            if(ec == beast::http::error::end_of_stream)
+            if(ec == boost::beast::http::error::end_of_stream)
            {
                // Give the derived class a chance to do stuff
                impl().do_shutdown(ec);
-                if(ec && ec != beast::errc::not_connected)
+                if(ec && ec != boost::beast::errc::not_connected)
                    return fail("shutdown", ec);
                return;
            }
@ -228,11 +230,11 @@ private:
                // should be closed afterwards. For example if
                // we send a Connection: close.
                //
-                if(ec == beast::http::error::end_of_stream)
+                if(ec == boost::beast::http::error::end_of_stream)
                {
                    // Give the derived class a chance to do stuff
                    impl().do_shutdown(ec);
-                    if(ec && ec != beast::errc::not_connected)
+                    if(ec && ec != boost::beast::errc::not_connected)
                        return fail("shutdown", ec);
                    return;
                }
@ -245,7 +247,7 @@ private:

            // Read the rest of the message, if any.
            //
-            beast::http::read(impl().stream(), buffer_, parser, ec);
+            boost::beast::http::read(impl().stream(), buffer_, parser, ec);

            // Shouldn't be getting end_of_stream here;
            // that would mean that we got an incomplete
@ -272,11 +274,11 @@ private:
                // should be closed afterwards. For example if
                // we send a Connection: close.
                //
-                if(ec == beast::http::error::end_of_stream)
+                if(ec == boost::beast::http::error::end_of_stream)
                {
                    // Give the derived class a chance to do stuff
                    impl().do_shutdown(ec);
-                    if(ec && ec != beast::errc::not_connected)
+                    if(ec && ec != boost::beast::errc::not_connected)
                        return fail("shutdown", ec);
                    return;
                }
@ -293,10 +295,10 @@ private:
                // should be closed afterwards. For example if
                // we send a Connection: close.
                //
-                if(ec == beast::http::error::end_of_stream)
+                if(ec == boost::beast::http::error::end_of_stream)
                {
                    // Give the derived class a chance to do stuff
-                    if(ec && ec != beast::errc::not_connected)
+                    if(ec && ec != boost::beast::errc::not_connected)
                        return fail("shutdown", ec);
                    return;
                }
--- a/example/server-framework/https_ports.hpp
+++ b/example/server-framework/https_ports.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_HTTPS_PORTS_HPP
-#define BEAST_EXAMPLE_SERVER_HTTPS_PORTS_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_HTTPS_PORTS_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_HTTPS_PORTS_HPP

 #include "http_sync_port.hpp"
 #include "http_async_port.hpp"
--- a/example/server-framework/main.cpp
+++ b/example/server-framework/main.cpp
@ -4,6 +4,8 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

 #include "server.hpp"

@ -12,7 +14,7 @@
 #include "ws_async_port.hpp"
 #include "ws_sync_port.hpp"

-#if BEAST_USE_OPENSSL
+#if BOOST_BEAST_USE_OPENSSL
 #include "https_ports.hpp"
 #include "multi_port.hpp"
 #include "wss_ports.hpp"
@ -58,17 +60,17 @@ sig_wait()
 */
 class set_ws_options
 {
-    beast::websocket::permessage_deflate pmd_;
+    boost::beast::websocket::permessage_deflate pmd_;

 public:
-    set_ws_options(beast::websocket::permessage_deflate const& pmd)
+    set_ws_options(boost::beast::websocket::permessage_deflate const& pmd)
        : pmd_(pmd)
    {
    }

    template<class NextLayer>
    void
-    operator()(beast::websocket::stream<NextLayer>& ws) const
+    operator()(boost::beast::websocket::stream<NextLayer>& ws) const
    {
        ws.auto_fragment(false);
        ws.set_option(pmd_);
@ -82,7 +84,7 @@ main(
    char const* av[])
 {
    using namespace framework;
-    using namespace beast::http;
+    using namespace boost::beast::http;

    // Helper for reporting failures
    //
@ -131,7 +133,7 @@ main(
    boost::filesystem::path const root =  vm["root"].as<std::string>();

    // These settings will be applied to all new websocket connections
-    beast::websocket::permessage_deflate pmd;
+    boost::beast::websocket::permessage_deflate pmd;
    pmd.client_enable = true;
    pmd.server_enable = true;
    pmd.compLevel = 3;
@ -263,7 +265,7 @@ main(
    // an installed and configured OpenSSL as part of the build.
    //

-#if BEAST_USE_OPENSSL
+#if BOOST_BEAST_USE_OPENSSL

    ssl_certificate cert;

--- a/example/server-framework/multi_port.hpp
+++ b/example/server-framework/multi_port.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_MULTI_PORT_HPP
-#define BEAST_EXAMPLE_SERVER_MULTI_PORT_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_MULTI_PORT_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_MULTI_PORT_HPP

 #include "ws_async_port.hpp"
 #include "http_async_port.hpp"
@ -15,7 +17,7 @@

 #include "../common/detect_ssl.hpp"

-#include <beast/core.hpp>
+#include <boost/beast/core.hpp>

 #include <boost/function.hpp>

@ -54,7 +56,7 @@ class multi_con
    boost::asio::ssl::context& ctx_;

    // Holds the data we read during ssl detection
-    beast::flat_static_buffer<6> buffer_;
+    boost::beast::flat_static_buffer<6> buffer_;

 public:
    // Constructor
@ -181,7 +183,7 @@ private:
        // not_connected happens under normal
        // circumstances so don't bother reporting it.
        //
-        if(ec && ec != beast::errc::not_connected)
+        if(ec && ec != boost::beast::errc::not_connected)
            return this->fail("shutdown", ec);
    }
 };
@ -213,8 +215,8 @@ protected:
    //        crash with gcc and clang using libstdc++

    // The types of the on_stream callback
-    using on_new_stream_cb1 = boost::function<void(beast::websocket::stream<socket_type>&)>;
-    using on_new_stream_cb2 = boost::function<void(beast::websocket::stream<ssl_stream<socket_type>>&)>;
+    using on_new_stream_cb1 = boost::function<void(boost::beast::websocket::stream<socket_type>&)>;
+    using on_new_stream_cb2 = boost::function<void(boost::beast::websocket::stream<ssl_stream<socket_type>>&)>;

    // Reference to the server instance that made us
    server& instance_;
@ -244,7 +246,7 @@ public:
        should have this equivalent signature:
        @code
        template<class NextLayer>
-        void callback(beast::websocket::stream<NextLayer>&);
+        void callback(boost::beast::websocket::stream<NextLayer>&);
        @endcode
        In C++14 this can be accomplished with a generic lambda. In
        C++11 it will be necessary to write out a lambda manually,
@ -280,7 +282,7 @@ public:
    on_upgrade(
        socket_type&& sock,
        endpoint_type ep,
-        beast::http::request<Body>&& req)
+        boost::beast::http::request<Body>&& req)
    {
        // Create the connection and call the version of
        // run that takes the request since we have it already
@ -311,7 +313,7 @@ public:
    on_upgrade(
        ssl_stream<socket_type>&& stream,
        endpoint_type ep,
-        beast::http::request<Body>&& req)
+        boost::beast::http::request<Body>&& req)
    {
        std::make_shared<async_wss_con>(
            std::move(stream),
--- a/example/server-framework/server.hpp
+++ b/example/server-framework/server.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_FRAMEWORK_SERVER_HPP
-#define BEAST_EXAMPLE_FRAMEWORK_SERVER_HPP
+#ifndef BOOST_BEAST_EXAMPLE_FRAMEWORK_SERVER_HPP
+#define BOOST_BEAST_EXAMPLE_FRAMEWORK_SERVER_HPP

 #include "framework.hpp"

--- a/example/server-framework/service_list.hpp
+++ b/example/server-framework/service_list.hpp
@ -4,13 +4,15 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_SERVICE_LIST_HPP
-#define BEAST_EXAMPLE_SERVER_SERVICE_LIST_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_SERVICE_LIST_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_SERVICE_LIST_HPP

 #include "framework.hpp"

-#include <beast/http/message.hpp>
+#include <boost/beast/http/message.hpp>
 #include <boost/optional.hpp>
 #include <utility>

@ -118,7 +120,7 @@ public:
    respond(
        Stream&& stream,
        endpoint_type const& ep,
-        beast::http::request<Body>&& req,
+        boost::beast::http::request<Body>&& req,
        Send const& send) const
    {
        return try_respond(
@ -141,7 +143,7 @@ private:
    try_respond(
        Stream&&,
        endpoint_type const&,
-        beast::http::request<Body>&&,
+        boost::beast::http::request<Body>&&,
        Send const&,
        C<sizeof...(Services)> const&) const
    {
@ -162,7 +164,7 @@ private:
    try_respond(
        Stream&& stream,
        endpoint_type const& ep,
-        beast::http::request<Body>&& req,
+        boost::beast::http::request<Body>&& req,
        Send const& send,
        C<I> const&) const
    {
--- a/example/server-framework/ssl_certificate.hpp
+++ b/example/server-framework/ssl_certificate.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_SSL_CERTIFICATE_HPP
-#define BEAST_EXAMPLE_SERVER_SSL_CERTIFICATE_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_SSL_CERTIFICATE_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_SSL_CERTIFICATE_HPP

 #include <boost/asio/buffer.hpp>
 #include <boost/asio/ssl/context.hpp>
--- a/example/server-framework/ws_async_port.hpp
+++ b/example/server-framework/ws_async_port.hpp
@ -4,14 +4,16 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_WS_ASYNC_PORT_HPP
-#define BEAST_EXAMPLE_SERVER_WS_ASYNC_PORT_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_WS_ASYNC_PORT_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_WS_ASYNC_PORT_HPP

 #include "server.hpp"

-#include <beast/core/multi_buffer.hpp>
-#include <beast/websocket/stream.hpp>
+#include <boost/beast/core/multi_buffer.hpp>
+#include <boost/beast/websocket/stream.hpp>
 #include <boost/function.hpp>
 #include <memory>
 #include <ostream>
@ -47,7 +49,7 @@ class async_ws_con_base
    endpoint_type ep_;

    // This is used to hold the message data
-    beast::multi_buffer buffer_;
+    boost::beast::multi_buffer buffer_;

 protected:
    // The strand makes sure that our data is
@ -59,7 +61,7 @@ public:
    // Constructor
    template<class Callback>
    async_ws_con_base(
-        beast::string_view server_name,
+        boost::beast::string_view server_name,
        std::ostream& log,
        std::size_t id,
        endpoint_type const& ep,
@ -92,16 +94,16 @@ public:
    //
    template<class Body>
    void
-    run(beast::http::request<Body> const& req)
+    run(boost::beast::http::request<Body> const& req)
    {
        // Call the overload of accept() which takes
        // the request by parameter, instead of reading
        // it from the network.
        //
        impl().stream().async_accept_ex(req,
-            [&](beast::websocket::response_type& res)
+            [&](boost::beast::websocket::response_type& res)
            {
-                res.set(beast::http::field::server, server_name_);
+                res.set(boost::beast::http::field::server, server_name_);
            },
            strand_.wrap(std::bind(
                &async_ws_con_base::on_accept,
@ -118,9 +120,9 @@ protected:
        // to send back the response.
        //
        impl().stream().async_accept_ex(
-            [&](beast::websocket::response_type& res)
+            [&](boost::beast::websocket::response_type& res)
            {
-                res.set(beast::http::field::server, server_name_);
+                res.set(boost::beast::http::field::server, server_name_);
            },
            strand_.wrap(std::bind(
                &async_ws_con_base::on_accept,
@ -133,7 +135,7 @@ protected:
    void
    fail(std::string what, error_code ec)
    {
-        if(ec != beast::websocket::error::closed)
+        if(ec != boost::beast::websocket::error::closed)
            log_ <<
                "[#" << id_ << " " << ep_ << "] " <<
            what << ": " << ec.message() << std::endl;
@ -224,7 +226,7 @@ class async_ws_con
    // The stream should be created before the base class so
    // use the "base from member" idiom.
    //
-    , public base_from_member<beast::websocket::stream<socket_type>>
+    , public base_from_member<boost::beast::websocket::stream<socket_type>>

    // Constructs last, destroys first
    //
@ -240,7 +242,7 @@ public:
    async_ws_con(
        socket_type&& sock,
        Args&&... args)
-        : base_from_member<beast::websocket::stream<socket_type>>(std::move(sock))
+        : base_from_member<boost::beast::websocket::stream<socket_type>>(std::move(sock))
        , async_ws_con_base<async_ws_con>(std::forward<Args>(args)...)
    {
    }
@ -252,7 +254,7 @@ public:
    // class to work with different return types for `stream()` such
    // as a `boost::asio::ip::tcp::socket&` or a `boost::asio::ssl::stream&`
    //
-    beast::websocket::stream<socket_type>&
+    boost::beast::websocket::stream<socket_type>&
    stream()
    {
        return this->member;
@ -282,7 +284,7 @@ class ws_async_port
    // The type of the on_new_stream callback
    //
    using on_new_stream_cb =
-        boost::function<void(beast::websocket::stream<socket_type>&)>;
+        boost::function<void(boost::beast::websocket::stream<socket_type>&)>;

    server& instance_;
    std::ostream& log_;
@ -301,7 +303,7 @@ public:
        should have this equivalent signature:
        @code
        template<class NextLayer>
-        void callback(beast::websocket::stream<NextLayer>&);
+        void callback(boost::beast::websocket::stream<NextLayer>&);
        @endcode
        In C++14 this can be accomplished with a generic lambda. In
        C++11 it will be necessary to write out a lambda manually,
@ -357,7 +359,7 @@ public:
    on_upgrade(
        socket_type&& sock,
        endpoint_type ep,
-        beast::http::request<Body>&& req)
+        boost::beast::http::request<Body>&& req)
    {
        std::make_shared<async_ws_con>(
            std::move(sock),
--- a/example/server-framework/ws_sync_port.hpp
+++ b/example/server-framework/ws_sync_port.hpp
@ -4,14 +4,16 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_WS_SYNC_PORT_HPP
-#define BEAST_EXAMPLE_SERVER_WS_SYNC_PORT_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_WS_SYNC_PORT_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_WS_SYNC_PORT_HPP

 #include "server.hpp"

-#include <beast/core/multi_buffer.hpp>
-#include <beast/websocket.hpp>
+#include <boost/beast/core/multi_buffer.hpp>
+#include <boost/beast/websocket.hpp>
 #include <boost/function.hpp>
 #include <memory>
 #include <ostream>
@ -60,7 +62,7 @@ public:
    //
    template<class Callback>
    sync_ws_con_base(
-        beast::string_view server_name,
+        boost::beast::string_view server_name,
        std::ostream& log,
        std::size_t id,
        endpoint_type const& ep,
@ -95,9 +97,9 @@ public:
    //
    template<class Body>
    void
-    run(beast::http::request<Body>&& req)
+    run(boost::beast::http::request<Body>&& req)
    {
-        BOOST_ASSERT(beast::websocket::is_upgrade(req));
+        BOOST_ASSERT(boost::beast::websocket::is_upgrade(req));

        // We need to transfer ownership of the request object into
        // the lambda, but there's no C++14 lambda capture
@ -119,7 +121,7 @@ protected:
        // Don't report the "closed" error since that
        // happens under normal circumstances.
        //
-        if(ec && ec != beast::websocket::error::closed)
+        if(ec && ec != boost::beast::websocket::error::closed)
        {
            log_ <<
                "[#" << id_ << " " << ep_ << "] " <<
@ -148,9 +150,9 @@ private:
        // to send back the response.
        //
        impl().stream().accept_ex(
-            [&](beast::websocket::response_type& res)
+            [&](boost::beast::websocket::response_type& res)
            {
-                res.insert(beast::http::field::server, server_name_);
+                res.insert(boost::beast::http::field::server, server_name_);
            },
            ec);

@ -172,7 +174,7 @@ private:
    class lambda
    {
        std::shared_ptr<sync_ws_con_base> self_;
-        beast::http::request<Body> req_;
+        boost::beast::http::request<Body> req_;
        
    public:
        // Constructor
@ -181,11 +183,11 @@ private:
        //
        lambda(
            std::shared_ptr<sync_ws_con_base> self,
-            beast::http::request<Body>&& req)
+            boost::beast::http::request<Body>&& req)
            : self_(std::move(self))
            , req_(std::move(req))
        {
-            BOOST_ASSERT(beast::websocket::is_upgrade(req_));
+            BOOST_ASSERT(boost::beast::websocket::is_upgrade(req_));
        }

        // Invoke the lambda
@ -193,7 +195,7 @@ private:
        void
        operator()()
        {
-            BOOST_ASSERT(beast::websocket::is_upgrade(req_));
+            BOOST_ASSERT(boost::beast::websocket::is_upgrade(req_));
            error_code ec;
            {
                // Move the message to the stack so we can get
@ -207,9 +209,9 @@ private:
                // it from the network.
                //
                self_->impl().stream().accept_ex(req,
-                    [&](beast::websocket::response_type& res)
+                    [&](boost::beast::websocket::response_type& res)
                    {
-                        res.insert(beast::http::field::server, self_->server_name_);
+                        res.insert(boost::beast::http::field::server, self_->server_name_);
                    },
                    ec);
            }
@ -233,7 +235,7 @@ private:
            // This buffer holds the message. We place a one
            // megabyte limit on the size to prevent abuse.
            //
-            beast::multi_buffer buffer{1024*1024};
+            boost::beast::multi_buffer buffer{1024*1024};

            // Read the message
            //
@ -276,7 +278,7 @@ class sync_ws_con
    // The stream should be created before the base class so
    // use the "base from member" idiom.
    //
-    , public base_from_member<beast::websocket::stream<socket_type>>
+    , public base_from_member<boost::beast::websocket::stream<socket_type>>

    // Constructs last, destroys first
    //
@ -290,7 +292,7 @@ public:
    sync_ws_con(
        socket_type&& sock,
        Args&&... args)
-        : base_from_member<beast::websocket::stream<socket_type>>(std::move(sock))
+        : base_from_member<boost::beast::websocket::stream<socket_type>>(std::move(sock))
        , sync_ws_con_base<sync_ws_con>(std::forward<Args>(args)...)
    {
    }
@ -302,7 +304,7 @@ public:
    // class to work with different return types for `stream()` such
    // as a `boost::asio::ip::tcp::socket&` or a `boost::asio::ssl::stream&`
    //
-    beast::websocket::stream<socket_type>&
+    boost::beast::websocket::stream<socket_type>&
    stream()
    {
        return this->member;
@ -337,7 +339,7 @@ class ws_sync_port
    // The type of the on_new_stream callback
    //
    using on_new_stream_cb =
-        boost::function<void(beast::websocket::stream<socket_type>&)>;
+        boost::function<void(boost::beast::websocket::stream<socket_type>&)>;

    server& instance_;
    std::ostream& log_;
@ -356,7 +358,7 @@ public:
        should have this equivalent signature:
        @code
        template<class NextLayer>
-        void callback(beast::websocket::stream<NextLayer>&);
+        void callback(boost::beast::websocket::stream<NextLayer>&);
        @endcode
        In C++14 this can be accomplished with a generic lambda. In
        C++11 it will be necessary to write out a lambda manually,
@ -412,7 +414,7 @@ public:
    on_upgrade(
        socket_type&& sock,
        endpoint_type ep,
-        beast::http::request<Body>&& req)
+        boost::beast::http::request<Body>&& req)
    {
        // Create the connection object and run it,
        // transferring ownership of the ugprade request.
--- a/example/server-framework/ws_upgrade_service.hpp
+++ b/example/server-framework/ws_upgrade_service.hpp
@ -4,14 +4,16 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_WS_UPGRADE_SERVICE_HPP
-#define BEAST_EXAMPLE_SERVER_WS_UPGRADE_SERVICE_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_WS_UPGRADE_SERVICE_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_WS_UPGRADE_SERVICE_HPP

 #include "framework.hpp"

-#include <beast/http/message.hpp>
-#include <beast/websocket/rfc6455.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/websocket/rfc6455.hpp>
 #include <memory>

 namespace framework {
@ -73,13 +75,13 @@ public:
    respond(
        Stream&& stream,
        endpoint_type const& ep,
-        beast::http::request<Body>&& req,
+        boost::beast::http::request<Body>&& req,
        Send const&) const
    {
        // If its not an upgrade request, return `false`
        // to indicate that we are not handling it.
        //
-        if(! beast::websocket::is_upgrade(req))
+        if(! boost::beast::websocket::is_upgrade(req))
            return false;

        // Its an ugprade request, so transfer ownership
--- a/example/server-framework/wss_ports.hpp
+++ b/example/server-framework/wss_ports.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_EXAMPLE_SERVER_WSS_PORTS_HPP
-#define BEAST_EXAMPLE_SERVER_WSS_PORTS_HPP
+#ifndef BOOST_BEAST_EXAMPLE_SERVER_WSS_PORTS_HPP
+#define BOOST_BEAST_EXAMPLE_SERVER_WSS_PORTS_HPP

 #include "ws_sync_port.hpp"
 #include "ws_async_port.hpp"
@ -36,7 +38,7 @@ class sync_wss_con
    // The stream should be created before the base class so
    // use the "base from member" idiom.
    //
-    , public base_from_member<beast::websocket::stream<ssl_stream<socket_type>>>
+    , public base_from_member<boost::beast::websocket::stream<ssl_stream<socket_type>>>

    // Constructs last, destroys first
    //
@ -53,7 +55,7 @@ public:
        socket_type&& sock,
        boost::asio::ssl::context& ctx,
        Args&&... args)
-        : base_from_member<beast::websocket::stream<ssl_stream<socket_type>>>(std::move(sock), ctx)
+        : base_from_member<boost::beast::websocket::stream<ssl_stream<socket_type>>>(std::move(sock), ctx)
        , sync_ws_con_base<sync_wss_con>(std::forward<Args>(args)...)
    {
    }
@ -64,7 +66,7 @@ public:
    sync_wss_con(
        ssl_stream<socket_type>&& stream,
        Args&&... args)
-        : base_from_member<beast::websocket::stream<ssl_stream<socket_type>>>(std::move(stream))
+        : base_from_member<boost::beast::websocket::stream<ssl_stream<socket_type>>>(std::move(stream))
        , sync_ws_con_base<sync_wss_con>(std::forward<Args>(args)...)
    {
    }
@ -76,7 +78,7 @@ public:
    // class to work with different return types for `stream()` such
    // as a `boost::asio::ip::tcp::socket&` or a `boost::asio::ssl::stream&`
    //
-    beast::websocket::stream<ssl_stream<socket_type>>&
+    boost::beast::websocket::stream<ssl_stream<socket_type>>&
    stream()
    {
        return this->member;
@ -116,7 +118,7 @@ class async_wss_con
    // The stream should be created before the base class so
    // use the "base from member" idiom.
    //
-    , public base_from_member<beast::websocket::stream<ssl_stream<socket_type>>>
+    , public base_from_member<boost::beast::websocket::stream<ssl_stream<socket_type>>>

    // Constructs last, destroys first
    //
@ -132,7 +134,7 @@ public:
        socket_type&& sock,
        boost::asio::ssl::context& ctx,
        Args&&... args)
-        : base_from_member<beast::websocket::stream<ssl_stream<socket_type>>>(std::move(sock), ctx)
+        : base_from_member<boost::beast::websocket::stream<ssl_stream<socket_type>>>(std::move(sock), ctx)
        , async_ws_con_base<async_wss_con>(std::forward<Args>(args)...)
    {
    }
@ -143,7 +145,7 @@ public:
    async_wss_con(
        ssl_stream<socket_type>&& stream,
        Args&&... args)
-        : base_from_member<beast::websocket::stream<ssl_stream<socket_type>>>(std::move(stream))
+        : base_from_member<boost::beast::websocket::stream<ssl_stream<socket_type>>>(std::move(stream))
        , async_ws_con_base<async_wss_con>(std::forward<Args>(args)...)
    {
    }
@ -155,7 +157,7 @@ public:
    // class to work with different return types for `stream()` such
    // as a `boost::asio::ip::tcp::socket&` or a `boost::asio::ssl::stream&`
    //
-    beast::websocket::stream<ssl_stream<socket_type>>&
+    boost::beast::websocket::stream<ssl_stream<socket_type>>&
    stream()
    {
        return this->member;
@ -211,10 +213,10 @@ class wss_sync_port
    // The types of the on_new_stream callbacks
    //
    using on_new_stream_cb1 =
-        boost::function<void(beast::websocket::stream<socket_type>&)>;
+        boost::function<void(boost::beast::websocket::stream<socket_type>&)>;
    
    using on_new_stream_cb2 =
-        boost::function<void(beast::websocket::stream<ssl_stream<socket_type>>&)>;
+        boost::function<void(boost::beast::websocket::stream<ssl_stream<socket_type>>&)>;

    server& instance_;
    std::ostream& log_;
@ -237,7 +239,7 @@ public:
        should have this equivalent signature:
        @code
        template<class NextLayer>
-        void callback(beast::websocket::stream<NextLayer>&);
+        void callback(boost::beast::websocket::stream<NextLayer>&);
        @endcode
        In C++14 this can be accomplished with a generic lambda. In
        C++11 it will be necessary to write out a lambda manually,
@ -297,7 +299,7 @@ public:
    on_upgrade(
        ssl_stream<socket_type>&& stream,
        endpoint_type ep,
-        beast::http::request<Body>&& req)
+        boost::beast::http::request<Body>&& req)
    {
        // Create the connection object and run it,
        // transferring ownership of the ugprade request.
@ -328,10 +330,10 @@ class wss_async_port
    // The types of the on_new_stream callbacks
    //
    using on_new_stream_cb1 =
-        boost::function<void(beast::websocket::stream<socket_type>&)>;
+        boost::function<void(boost::beast::websocket::stream<socket_type>&)>;

    using on_new_stream_cb2 =
-        boost::function<void(beast::websocket::stream<ssl_stream<socket_type>>&)>;
+        boost::function<void(boost::beast::websocket::stream<ssl_stream<socket_type>>&)>;

    // Reference to the server instance that made us
    server& instance_;
@ -361,7 +363,7 @@ public:
        should have this equivalent signature:
        @code
        template<class NextLayer>
-        void callback(beast::websocket::stream<NextLayer>&);
+        void callback(boost::beast::websocket::stream<NextLayer>&);
        @endcode
        In C++14 this can be accomplished with a generic lambda. In
        C++11 it will be necessary to write out a lambda manually,
@ -421,7 +423,7 @@ public:
    on_upgrade(
        ssl_stream<socket_type>&& stream,
        endpoint_type ep,
-        beast::http::request<Body>&& req)
+        boost::beast::http::request<Body>&& req)
    {
        std::make_shared<async_wss_con>(
            std::move(stream),
--- a/example/websocket-client-ssl/CMakeLists.txt
+++ b/example/websocket-client-ssl/CMakeLists.txt
@ -1,11 +1,19 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)

 GroupSources(example/websocket-client-ssl "/")

 add_executable (websocket-client-ssl
-    ${BEAST_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
+    Jamfile
    websocket_client_ssl.cpp
 )

--- a/example/websocket-client-ssl/Jamfile
+++ b/example/websocket-client-ssl/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 import os ;

--- a/example/websocket-client-ssl/websocket_client_ssl.cpp
+++ b/example/websocket-client-ssl/websocket_client_ssl.cpp
@ -4,12 +4,14 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

 #include "../common/root_certificates.hpp"

-#include <beast/core.hpp>
-#include <beast/websocket.hpp>
-#include <beast/websocket/ssl.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/websocket.hpp>
+#include <boost/beast/websocket/ssl.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 #include <cstdlib>
@ -18,13 +20,13 @@

 using tcp = boost::asio::ip::tcp; // from <boost/asio.hpp>
 namespace ssl = boost::asio::ssl; // from <boost/asio/ssl.hpp>
-namespace websocket = beast::websocket; // from <beast/websocket.hpp>
+namespace websocket = boost::beast::websocket; // from <boost/beast/websocket.hpp>

 int main()
 {
    // A helper for reporting errors
    auto const fail =
-        [](std::string what, beast::error_code ec)
+        [](std::string what, boost::beast::error_code ec)
        {
            std::cerr << what << ": " << ec.message() << std::endl;
            std::cerr.flush();
@ -81,7 +83,7 @@ int main()
        return fail("write", ec);

    // This buffer will hold the incoming message
-    beast::multi_buffer b;
+    boost::beast::multi_buffer b;

    // Read the message into our buffer
    ws.read(b, ec);
@ -94,13 +96,13 @@ int main()
        return fail("close", ec);

    // The buffers() function helps print a ConstBufferSequence
-    std::cout << beast::buffers(b.data()) << std::endl;
+    std::cout << boost::beast::buffers(b.data()) << std::endl;

    // WebSocket says that to close a connection you have
    // to keep reading messages until you receive a close frame.
    // Beast delivers the close frame as an error from read.
    //
-    beast::drain_buffer drain; // Throws everything away efficiently
+    boost::beast::drain_buffer drain; // Throws everything away efficiently
    for(;;)
    {
        // Keep reading messages...
--- a/example/websocket-client/CMakeLists.txt
+++ b/example/websocket-client/CMakeLists.txt
@ -1,12 +1,19 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)

 GroupSources(example/websocket-client "/")

 add_executable (websocket-client
-    ${BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
+    Jamfile
    websocket_client.cpp
 )

--- a/example/websocket-client/Jamfile
+++ b/example/websocket-client/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 exe websocket-client :
    websocket_client.cpp
--- a/example/websocket-client/websocket_client.cpp
+++ b/example/websocket-client/websocket_client.cpp
@ -4,24 +4,26 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

 //[example_websocket_client

-#include <beast/core.hpp>
-#include <beast/websocket.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/websocket.hpp>
 #include <boost/asio.hpp>
 #include <cstdlib>
 #include <iostream>
 #include <string>

 using tcp = boost::asio::ip::tcp;               // from <boost/asio.hpp>
-namespace websocket = beast::websocket; // from <beast/websocket.hpp>
+namespace websocket = boost::beast::websocket;  // from <boost/beast/websocket.hpp>

 int main()
 {
    // A helper for reporting errors
    auto const fail =
-        [](std::string what, beast::error_code ec)
+        [](std::string what, boost::beast::error_code ec)
        {
            std::cerr << what << ": " << ec.message() << std::endl;
            std::cerr.flush();
@ -60,7 +62,7 @@ int main()
        return fail("write", ec);

    // This buffer will hold the incoming message
-    beast::multi_buffer b;
+    boost::beast::multi_buffer b;

    // Read the message into our buffer
    ws.read(b, ec);
@ -73,13 +75,13 @@ int main()
        return fail("close", ec);

    // The buffers() function helps print a ConstBufferSequence
-    std::cout << beast::buffers(b.data()) << std::endl;
+    std::cout << boost::beast::buffers(b.data()) << std::endl;

    // WebSocket says that to close a connection you have
    // to keep reading messages until you receive a close frame.
    // Beast delivers the close frame as an error from read.
    //
-    beast::drain_buffer drain; // Throws everything away efficiently
+    boost::beast::drain_buffer drain; // Throws everything away efficiently
    for(;;)
    {
        // Keep reading messages...
--- a/example/websocket-server-async/CMakeLists.txt
+++ b/example/websocket-server-async/CMakeLists.txt
@ -1,12 +1,20 @@
-# Part of Beast
+#
+# 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)
+#
+# Official repository: https://github.com/boostorg/beast
+#

-GroupSources(include/beast beast)
+GroupSources(include/boost/beast beast)
 GroupSources(example/common common)
 GroupSources(example/websocket-server-async "/")

 add_executable (websocket-server-async
-    ${BEAST_INCLUDES}
+    ${BOOST_BEAST_INCLUDES}
    ${COMMON_INCLUDES}
+    Jamfile
    websocket_server_async.cpp
 )

--- a/example/websocket-server-async/Jamfile
+++ b/example/websocket-server-async/Jamfile
@ -4,6 +4,8 @@
 # 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)
 #
+# Official repository: https://github.com/boostorg/beast
+#

 exe websocket-server-async :
    websocket_server_async.cpp
--- a/example/websocket-server-async/websocket_server_async.cpp
+++ b/example/websocket-server-async/websocket_server_async.cpp
@ -4,11 +4,13 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

 #include "../common/helpers.hpp"

-#include <beast/core.hpp>
-#include <beast/websocket.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/websocket.hpp>
 #include <boost/asio.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>
@ -20,8 +22,8 @@
 #include <string>
 #include <thread>

-namespace http = beast::http;           // from <beast/http.hpp>
-namespace websocket = beast::websocket; // from <beast/websocket.hpp>
+namespace http = boost::beast::http;            // from <boost/beast/http.hpp>
+namespace websocket = boost::beast::websocket;  // from <boost/beast/websocket.hpp>
 namespace ip = boost::asio::ip;                 // from <boost/asio.hpp>
 using tcp = boost::asio::ip::tcp;               // from <boost/asio.hpp>

@ -38,7 +40,7 @@ using tcp = boost::asio::ip::tcp;       // from <boost/asio.hpp>
 */
 class server
 {
-    using error_code = beast::error_code;       // Saves typing
+    using error_code = boost::beast::error_code;       // Saves typing
    using clock_type =
        std::chrono::steady_clock;              // For the timer
    using stream_type =
@ -63,8 +65,8 @@ class server
        boost::asio::basic_waitable_timer<
            clock_type> timer_;                 // Needed for timeouts
        boost::asio::io_service::strand strand_;// Needed when threads > 1
-        beast::multi_buffer buffer_;            // Stores the current message
-        beast::drain_buffer drain_;             // Helps discard data on close
+        boost::beast::multi_buffer buffer_;            // Stores the current message
+        boost::beast::drain_buffer drain_;             // Helps discard data on close
        std::size_t id_;                        // A small unique id

    public:
@ -395,7 +397,7 @@ int main(int argc, char* argv[])
    s.on_new_stream(set_stream_options{pmd});

    // Open the listening port
-    beast::error_code ec;
+    boost::beast::error_code ec;
    s.open(tcp::endpoint{address, port}, ec);
    if(ec)
    {
--- a/extras/boost/beast/doc_debug.hpp
+++ b/extras/boost/beast/doc_debug.hpp
@ -5,12 +5,12 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //

-#ifndef BEAST_DOC_DEBUG_HPP
-#define BEAST_DOC_DEBUG_HPP
+#ifndef BOOST_BEAST_DOC_DEBUG_HPP
+#define BOOST_BEAST_DOC_DEBUG_HPP

 namespace beast {

-#if BEAST_DOXYGEN
+#if BOOST_BEAST_DOXYGEN

 /// doc type (documentation debug helper)
 using doc_type = int;
--- a/extras/boost/beast/test/fail_counter.hpp
+++ b/extras/boost/beast/test/fail_counter.hpp
@ -4,13 +4,16 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_TEST_FAIL_COUNTER_HPP
-#define BEAST_TEST_FAIL_COUNTER_HPP
+#ifndef BOOST_BEAST_TEST_FAIL_COUNTER_HPP
+#define BOOST_BEAST_TEST_FAIL_COUNTER_HPP

-#include <beast/core/error.hpp>
+#include <boost/beast/core/error.hpp>
 #include <boost/throw_exception.hpp>

+namespace boost {
 namespace beast {
 namespace test {

@ -156,6 +159,7 @@ public:

 } // test
 } // beast
+} // boost

 namespace boost {
 namespace system {
--- a/extras/boost/beast/test/fail_stream.hpp
+++ b/extras/boost/beast/test/fail_stream.hpp
@ -4,18 +4,21 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_TEST_FAIL_STREAM_HPP
-#define BEAST_TEST_FAIL_STREAM_HPP
+#ifndef BOOST_BEAST_TEST_FAIL_STREAM_HPP
+#define BOOST_BEAST_TEST_FAIL_STREAM_HPP

-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/error.hpp>
-#include <beast/core/detail/type_traits.hpp>
-#include <beast/websocket/teardown.hpp>
-#include <beast/test/fail_counter.hpp>
+#include <boost/beast/core/async_result.hpp>
+#include <boost/beast/core/bind_handler.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/core/detail/type_traits.hpp>
+#include <boost/beast/websocket/teardown.hpp>
+#include <boost/beast/test/fail_counter.hpp>
 #include <boost/optional.hpp>

+namespace boost {
 namespace beast {
 namespace test {

@ -188,5 +191,6 @@ public:

 } // test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/test/fuzz.hpp
+++ b/extras/boost/beast/test/fuzz.hpp
@ -4,14 +4,17 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_TEST_FUZZ_HPP
-#define BEAST_TEST_FUZZ_HPP
+#ifndef BOOST_BEAST_TEST_FUZZ_HPP
+#define BOOST_BEAST_TEST_FUZZ_HPP

-#include <beast/core/static_string.hpp>
-#include <beast/core/string.hpp>
+#include <boost/beast/core/static_string.hpp>
+#include <boost/beast/core/string.hpp>
 #include <random>

+namespace boost {
 namespace beast {
 namespace test {

@ -97,5 +100,6 @@ fuzz(

 } // test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/test/pipe_stream.hpp
+++ b/extras/boost/beast/test/pipe_stream.hpp
@ -4,17 +4,19 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_TEST_PIPE_STREAM_HPP
-#define BEAST_TEST_PIPE_STREAM_HPP
+#ifndef BOOST_BEAST_TEST_PIPE_STREAM_HPP
+#define BOOST_BEAST_TEST_PIPE_STREAM_HPP

-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/flat_buffer.hpp>
-#include <beast/core/string.hpp>
-#include <beast/core/type_traits.hpp>
-#include <beast/websocket/teardown.hpp>
-#include <beast/test/fail_counter.hpp>
+#include <boost/beast/core/async_result.hpp>
+#include <boost/beast/core/bind_handler.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/string.hpp>
+#include <boost/beast/core/type_traits.hpp>
+#include <boost/beast/websocket/teardown.hpp>
+#include <boost/beast/test/fail_counter.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/assert.hpp>
@ -24,6 +26,7 @@
 #include <mutex>
 #include <utility>

+namespace boost {
 namespace beast {
 namespace test {

@ -525,5 +528,6 @@ async_write_some(ConstBufferSequence const& buffers,

 } // test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/test/sig_wait.hpp
+++ b/extras/boost/beast/test/sig_wait.hpp
@ -4,12 +4,15 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_TEST_SIG_WAIT_HPP
-#define BEAST_TEST_SIG_WAIT_HPP
+#ifndef BOOST_BEAST_TEST_SIG_WAIT_HPP
+#define BOOST_BEAST_TEST_SIG_WAIT_HPP

 #include <boost/asio.hpp>

+namespace boost {
 namespace beast {
 namespace test {

@ -30,5 +33,6 @@ sig_wait()

 } // test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/test/string_iostream.hpp
+++ b/extras/boost/beast/test/string_iostream.hpp
@ -4,20 +4,23 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_TEST_STRING_IOSTREAM_HPP
-#define BEAST_TEST_STRING_IOSTREAM_HPP
+#ifndef BOOST_BEAST_TEST_STRING_IOSTREAM_HPP
+#define BOOST_BEAST_TEST_STRING_IOSTREAM_HPP

-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/buffer_prefix.hpp>
-#include <beast/core/error.hpp>
-#include <beast/websocket/teardown.hpp>
+#include <boost/beast/core/async_result.hpp>
+#include <boost/beast/core/bind_handler.hpp>
+#include <boost/beast/core/buffer_prefix.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/websocket/teardown.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/throw_exception.hpp>
 #include <string>

+namespace boost {
 namespace beast {
 namespace test {

@ -169,5 +172,6 @@ public:

 } // test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/test/string_istream.hpp
+++ b/extras/boost/beast/test/string_istream.hpp
@ -4,19 +4,22 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_TEST_STRING_ISTREAM_HPP
-#define BEAST_TEST_STRING_ISTREAM_HPP
+#ifndef BOOST_BEAST_TEST_STRING_ISTREAM_HPP
+#define BOOST_BEAST_TEST_STRING_ISTREAM_HPP

-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/error.hpp>
-#include <beast/websocket/teardown.hpp>
+#include <boost/beast/core/async_result.hpp>
+#include <boost/beast/core/bind_handler.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/websocket/teardown.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/throw_exception.hpp>
 #include <string>

+namespace boost {
 namespace beast {
 namespace test {

@ -157,5 +160,6 @@ public:

 } // test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/test/string_ostream.hpp
+++ b/extras/boost/beast/test/string_ostream.hpp
@ -4,20 +4,23 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_TEST_STRING_OSTREAM_HPP
-#define BEAST_TEST_STRING_OSTREAM_HPP
+#ifndef BOOST_BEAST_TEST_STRING_OSTREAM_HPP
+#define BOOST_BEAST_TEST_STRING_OSTREAM_HPP

-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/buffer_prefix.hpp>
-#include <beast/core/error.hpp>
-#include <beast/websocket/teardown.hpp>
+#include <boost/beast/core/async_result.hpp>
+#include <boost/beast/core/bind_handler.hpp>
+#include <boost/beast/core/buffer_prefix.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/websocket/teardown.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/throw_exception.hpp>
 #include <string>

+namespace boost {
 namespace beast {
 namespace test {

@ -145,5 +148,6 @@ public:

 } // test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/test/test_allocator.hpp
+++ b/extras/boost/beast/test/test_allocator.hpp
@ -4,14 +4,17 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_TEST_TEST_ALLOCATOR_HPP
-#define BEAST_TEST_TEST_ALLOCATOR_HPP
+#ifndef BOOST_BEAST_TEST_TEST_ALLOCATOR_HPP
+#define BOOST_BEAST_TEST_TEST_ALLOCATOR_HPP

 #include <atomic>
 #include <cstddef>
 #include <memory>

+namespace boost {
 namespace beast {
 namespace test {

@ -162,5 +165,6 @@ public:

 } // test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/test/yield_to.hpp
+++ b/extras/boost/beast/test/yield_to.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_TEST_YIELD_TO_HPP
-#define BEAST_TEST_YIELD_TO_HPP
+#ifndef BOOST_BEAST_TEST_YIELD_TO_HPP
+#define BOOST_BEAST_TEST_YIELD_TO_HPP

 #include <boost/asio/io_service.hpp>
 #include <boost/asio/spawn.hpp>
@ -17,6 +19,7 @@
 #include <thread>
 #include <vector>

+namespace boost {
 namespace beast {
 namespace test {

@ -78,7 +81,7 @@ public:

        @param fn... One or more functions to invoke.
    */
-#if BEAST_DOXYGEN
+#if BOOST_BEAST_DOXYGEN
    template<class... FN>
    void
    yield_to(FN&&... fn)
@ -130,5 +133,6 @@ spawn(F0&& f, FN&&... fn)

 } // test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/amount.hpp
+++ b/extras/boost/beast/unit_test/amount.hpp
@ -4,14 +4,17 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_AMOUNT_HPP
-#define BEAST_UNIT_TEST_AMOUNT_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_AMOUNT_HPP
+#define BOOST_BEAST_UNIT_TEST_AMOUNT_HPP

 #include <cstddef>
 #include <ostream>
 #include <string>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -51,5 +54,6 @@ operator<<(std::ostream& s, amount const& t)

 } // unit_test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/detail/const_container.hpp
+++ b/extras/boost/beast/unit_test/detail/const_container.hpp
@ -4,10 +4,13 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_DETAIL_CONST_CONTAINER_HPP
-#define BEAST_UNIT_TEST_DETAIL_CONST_CONTAINER_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_DETAIL_CONST_CONTAINER_HPP
+#define BOOST_BEAST_UNIT_TEST_DETAIL_CONST_CONTAINER_HPP

+namespace boost {
 namespace beast {
 namespace unit_test {
 namespace detail {
@ -87,5 +90,6 @@ public:
 } // detail
 } // unit_test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/dstream.hpp
+++ b/extras/boost/beast/unit_test/dstream.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_DSTREAM_HPP
-#define BEAST_UNIT_TEST_DSTREAM_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_DSTREAM_HPP
+#define BOOST_BEAST_UNIT_TEST_DSTREAM_HPP

 #include <boost/config.hpp>
 #include <ios>
@ -20,6 +22,7 @@
 //#include <boost/detail/winapi/debugapi.hpp>
 #endif

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -122,5 +125,6 @@ using dwstream = std::wostream&;

 } // unit_test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/global_suites.hpp
+++ b/extras/boost/beast/unit_test/global_suites.hpp
@ -4,12 +4,15 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_GLOBAL_SUITES_HPP
-#define BEAST_UNIT_TEST_GLOBAL_SUITES_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_GLOBAL_SUITES_HPP
+#define BOOST_BEAST_UNIT_TEST_GLOBAL_SUITES_HPP

-#include <beast/unit_test/suite_list.hpp>
+#include <boost/beast/unit_test/suite_list.hpp>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -47,5 +50,6 @@ global_suites()

 } // unit_test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/main.cpp
+++ b/extras/boost/beast/unit_test/main.cpp
@ -4,13 +4,15 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#include <beast/unit_test/amount.hpp>
-#include <beast/unit_test/dstream.hpp>
-#include <beast/unit_test/global_suites.hpp>
-#include <beast/unit_test/match.hpp>
-#include <beast/unit_test/reporter.hpp>
-#include <beast/unit_test/suite.hpp>
+#include <boost/beast/unit_test/amount.hpp>
+#include <boost/beast/unit_test/dstream.hpp>
+#include <boost/beast/unit_test/global_suites.hpp>
+#include <boost/beast/unit_test/match.hpp>
+#include <boost/beast/unit_test/reporter.hpp>
+#include <boost/beast/unit_test/suite.hpp>
 #include <boost/config.hpp>
 #include <boost/program_options.hpp>
 #include <cstdlib>
@ -27,6 +29,7 @@
 # endif
 #endif

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -71,13 +74,14 @@ print(std::ostream& os)

 } // unit_test
 } // beast
+} // boost

 // Simple main used to produce stand
 // alone executables that run unit tests.
 int main(int ac, char const* av[])
 {
    using namespace std;
-    using namespace beast::unit_test;
+    using namespace boost::beast::unit_test;

 #if BOOST_MSVC
    {
--- a/extras/boost/beast/unit_test/match.hpp
+++ b/extras/boost/beast/unit_test/match.hpp
@ -4,13 +4,16 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_MATCH_HPP
-#define BEAST_UNIT_TEST_MATCH_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_MATCH_HPP
+#define BOOST_BEAST_UNIT_TEST_MATCH_HPP

-#include <beast/unit_test/suite_info.hpp>
+#include <boost/beast/unit_test/suite_info.hpp>
 #include <string>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -169,5 +172,6 @@ match_library(std::string const& name)

 } // unit_test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/recorder.hpp
+++ b/extras/boost/beast/unit_test/recorder.hpp
@ -4,13 +4,16 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_RECORDER_HPP
-#define BEAST_UNIT_TEST_RECORDER_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_RECORDER_HPP
+#define BOOST_BEAST_UNIT_TEST_RECORDER_HPP

-#include <beast/unit_test/results.hpp>
-#include <beast/unit_test/runner.hpp>
+#include <boost/beast/unit_test/results.hpp>
+#include <boost/beast/unit_test/runner.hpp>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -88,5 +91,6 @@ private:

 } // unit_test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/reporter.hpp
+++ b/extras/boost/beast/unit_test/reporter.hpp
@ -4,12 +4,14 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_REPORTER_HPP
-#define BEAST_UNIT_TEST_REPORTER_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_REPORTER_HPP
+#define BOOST_BEAST_UNIT_TEST_REPORTER_HPP

-#include <beast/unit_test/amount.hpp>
-#include <beast/unit_test/recorder.hpp>
+#include <boost/beast/unit_test/amount.hpp>
+#include <boost/beast/unit_test/recorder.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>
 #include <algorithm>
@ -21,6 +23,7 @@
 #include <string>
 #include <utility>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -291,5 +294,6 @@ using reporter = detail::reporter<>;

 } // unit_test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/results.hpp
+++ b/extras/boost/beast/unit_test/results.hpp
@ -4,15 +4,18 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_RESULTS_HPP
-#define BEAST_UNIT_TEST_RESULTS_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_RESULTS_HPP
+#define BOOST_BEAST_UNIT_TEST_RESULTS_HPP

-#include <beast/unit_test/detail/const_container.hpp>
+#include <boost/beast/unit_test/detail/const_container.hpp>

 #include <string>
 #include <vector>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -238,5 +241,6 @@ public:

 } // unit_test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/runner.hpp
+++ b/extras/boost/beast/unit_test/runner.hpp
@ -4,16 +4,19 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_RUNNER_H_INCLUDED
-#define BEAST_UNIT_TEST_RUNNER_H_INCLUDED
+#ifndef BOOST_BEAST_UNIT_TEST_RUNNER_H_INCLUDED
+#define BOOST_BEAST_UNIT_TEST_RUNNER_H_INCLUDED

-#include <beast/unit_test/suite_info.hpp>
+#include <boost/beast/unit_test/suite_info.hpp>
 #include <boost/assert.hpp>
 #include <mutex>
 #include <ostream>
 #include <string>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -284,5 +287,6 @@ runner::log(std::string const& s)

 } // unit_test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/suite.hpp
+++ b/extras/boost/beast/unit_test/suite.hpp
@ -4,11 +4,13 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_SUITE_HPP
-#define BEAST_UNIT_TEST_SUITE_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_SUITE_HPP
+#define BOOST_BEAST_UNIT_TEST_SUITE_HPP

-#include <beast/unit_test/runner.hpp>
+#include <boost/beast/unit_test/runner.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/throw_exception.hpp>
@ -16,6 +18,7 @@
 #include <sstream>
 #include <string>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -52,7 +55,7 @@ enum abort_t

    Derived classes execute a series of testcases, where each testcase is
    a series of pass/fail tests. To provide a unit test using this class,
-    derive from it and use the BEAST_DEFINE_UNIT_TEST macro in a
+    derive from it and use the BOOST_BEAST_DEFINE_UNIT_TEST macro in a
    translation unit.
 */
 class suite
@ -599,31 +602,32 @@ run(runner& r)
    }
 }

-#ifndef BEAST_EXPECT
+#ifndef BOOST_BEAST_EXPECT
 /** Check a precondition.

    If the condition is false, the file and line number are reported.
 */
-#define BEAST_EXPECT(cond) expect(cond, __FILE__, __LINE__)
+#define BOOST_BEAST_EXPECT(cond) expect(cond, __FILE__, __LINE__)
 #endif

-#ifndef BEAST_EXPECTS
+#ifndef BOOST_BEAST_EXPECTS
 /** Check a precondition.

    If the condition is false, the file and line number are reported.
 */
-#define BEAST_EXPECTS(cond, reason) ((cond) ? (pass(), true) : \
+#define BOOST_BEAST_EXPECTS(cond, reason) ((cond) ? (pass(), true) : \
        (fail((reason), __FILE__, __LINE__), false))
 #endif

 } // unit_test
 } // beast
+} // boost

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

 // detail:
 // This inserts the suite with the given manual flag
-#define BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,manual) \
+#define BOOST_BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,manual) \
    static beast::unit_test::detail::insert_suite <Class##_test>   \
        Library ## Module ## Class ## _test_instance(             \
            #Class, #Module, #Library, manual)
@ -635,15 +639,15 @@ run(runner& r)
 // If this is already defined, don't redefine it. This allows
 // programs to provide custom behavior for testsuite definitions
 //
-#ifndef BEAST_DEFINE_TESTSUITE
+#ifndef BOOST_BEAST_DEFINE_TESTSUITE

 /** Enables insertion of test suites into the global container.
    The default is to insert all test suite definitions into the global
-    container. If BEAST_DEFINE_TESTSUITE is user defined, this macro
+    container. If BOOST_BEAST_DEFINE_TESTSUITE is user defined, this macro
    has no effect.
 */
-#ifndef BEAST_NO_UNIT_TEST_INLINE
-#define BEAST_NO_UNIT_TEST_INLINE 0
+#ifndef BOOST_BEAST_NO_UNIT_TEST_INLINE
+#define BOOST_BEAST_NO_UNIT_TEST_INLINE 0
 #endif

 /** Define a unit test suite.
@ -668,15 +672,15 @@ run(runner& r)
    The macro invocation must appear in the same namespace as the test class.
 */

-#if BEAST_NO_UNIT_TEST_INLINE
-#define BEAST_DEFINE_TESTSUITE(Class,Module,Library)
+#if BOOST_BEAST_NO_UNIT_TEST_INLINE
+#define BOOST_BEAST_DEFINE_TESTSUITE(Class,Module,Library)

 #else
-#include <beast/unit_test/global_suites.hpp>
-#define BEAST_DEFINE_TESTSUITE(Class,Module,Library) \
-        BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,false)
-#define BEAST_DEFINE_TESTSUITE_MANUAL(Class,Module,Library) \
-        BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,true)
+#include <boost/beast/unit_test/global_suites.hpp>
+#define BOOST_BEAST_DEFINE_TESTSUITE(Class,Module,Library) \
+        BOOST_BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,false)
+#define BOOST_BEAST_DEFINE_TESTSUITE_MANUAL(Class,Module,Library) \
+        BOOST_BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,true)

 #endif

--- a/extras/boost/beast/unit_test/suite_info.hpp
+++ b/extras/boost/beast/unit_test/suite_info.hpp
@ -4,15 +4,18 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_SUITE_INFO_HPP
-#define BEAST_UNIT_TEST_SUITE_INFO_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_SUITE_INFO_HPP
+#define BOOST_BEAST_UNIT_TEST_SUITE_INFO_HPP

 #include <cstring>
 #include <functional>
 #include <string>
 #include <utility>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -118,5 +121,6 @@ make_suite_info(

 } // unit_test
 } // beast
+} // boost

 #endif
--- a/extras/boost/beast/unit_test/suite_list.hpp
+++ b/extras/boost/beast/unit_test/suite_list.hpp
@ -4,17 +4,20 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_SUITE_LIST_HPP
-#define BEAST_UNIT_TEST_SUITE_LIST_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_SUITE_LIST_HPP
+#define BOOST_BEAST_UNIT_TEST_SUITE_LIST_HPP

-#include <beast/unit_test/suite_info.hpp>
-#include <beast/unit_test/detail/const_container.hpp>
+#include <boost/beast/unit_test/suite_info.hpp>
+#include <boost/beast/unit_test/detail/const_container.hpp>
 #include <boost/assert.hpp>
 #include <typeindex>
 #include <set>
 #include <unordered_set>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -72,6 +75,7 @@ suite_list::insert(

 } // unit_test
 } // beast
+} // boost

 #endif

--- a/extras/boost/beast/unit_test/thread.hpp
+++ b/extras/boost/beast/unit_test/thread.hpp
@ -4,15 +4,18 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_UNIT_TEST_THREAD_HPP
-#define BEAST_UNIT_TEST_THREAD_HPP
+#ifndef BOOST_BEAST_UNIT_TEST_THREAD_HPP
+#define BOOST_BEAST_UNIT_TEST_THREAD_HPP

-#include <beast/unit_test/suite.hpp>
+#include <boost/beast/unit_test/suite.hpp>
 #include <functional>
 #include <thread>
 #include <utility>

+namespace boost {
 namespace beast {
 namespace unit_test {

@ -120,5 +123,6 @@ private:

 } // unit_test
 } // beast
+} // boost

 #endif
--- a/include/beast.hpp
+++ b/include/beast.hpp
@ -1,19 +0,0 @@
-//
-// 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_HPP
-#define BEAST_HPP
-
-#include <beast/config.hpp>
-
-#include <beast/core.hpp>
-#include <beast/http.hpp>
-#include <beast/version.hpp>
-#include <beast/websocket.hpp>
-#include <beast/zlib.hpp>
-
-#endif
--- a/include/beast/core.hpp
+++ b/include/beast/core.hpp
@ -1,40 +0,0 @@
-//
-// 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_CORE_HPP
-#define BEAST_CORE_HPP
-
-#include <beast/config.hpp>
-
-#include <beast/core/async_result.hpp>
-#include <beast/core/bind_handler.hpp>
-#include <beast/core/buffer_cat.hpp>
-#include <beast/core/buffer_prefix.hpp>
-#include <beast/core/buffered_read_stream.hpp>
-#include <beast/core/buffers_adapter.hpp>
-#include <beast/core/consuming_buffers.hpp>
-#include <beast/core/drain_buffer.hpp>
-#include <beast/core/error.hpp>
-#include <beast/core/file.hpp>
-#include <beast/core/file_base.hpp>
-#include <beast/core/file_posix.hpp>
-#include <beast/core/file_stdio.hpp>
-#include <beast/core/file_win32.hpp>
-#include <beast/core/flat_buffer.hpp>
-#include <beast/core/handler_alloc.hpp>
-#include <beast/core/handler_ptr.hpp>
-#include <beast/core/multi_buffer.hpp>
-#include <beast/core/ostream.hpp>
-#include <beast/core/read_size.hpp>
-#include <beast/core/span.hpp>
-#include <beast/core/flat_static_buffer.hpp>
-#include <beast/core/static_string.hpp>
-#include <beast/core/string.hpp>
-#include <beast/core/string_param.hpp>
-#include <beast/core/type_traits.hpp>
-
-#endif
--- a/include/beast/http.hpp
+++ b/include/beast/http.hpp
@ -1,36 +0,0 @@
-//
-// 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_HTTP_HPP
-#define BEAST_HTTP_HPP
-
-#include <beast/config.hpp>
-
-#include <beast/http/basic_dynamic_body.hpp>
-#include <beast/http/basic_parser.hpp>
-#include <beast/http/buffer_body.hpp>
-#include <beast/http/chunk_encode.hpp>
-#include <beast/http/dynamic_body.hpp>
-#include <beast/http/empty_body.hpp>
-#include <beast/http/error.hpp>
-#include <beast/http/field.hpp>
-#include <beast/http/fields.hpp>
-#include <beast/http/file_body.hpp>
-#include <beast/http/message.hpp>
-#include <beast/http/parser.hpp>
-#include <beast/http/read.hpp>
-#include <beast/http/rfc7230.hpp>
-#include <beast/http/serializer.hpp>
-#include <beast/http/span_body.hpp>
-#include <beast/http/status.hpp>
-#include <beast/http/string_body.hpp>
-#include <beast/http/type_traits.hpp>
-#include <beast/http/vector_body.hpp>
-#include <beast/http/verb.hpp>
-#include <beast/http/write.hpp>
-
-#endif
--- a/include/beast/version.hpp
+++ b/include/beast/version.hpp
@ -1,26 +0,0 @@
-//
-// 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_VERSION_HPP
-#define BEAST_VERSION_HPP
-
-#include <beast/config.hpp>
-#include <boost/config.hpp>
-
-/** @def BEAST_API_VERSION 
-
-    Identifies the API version of Beast.
-
-    This is a simple integer that is incremented by one every time
-    a set of code changes is merged to the master or develop branch.
-*/
-#define BEAST_VERSION 85
-
-#define BEAST_VERSION_STRING "Beast/" BOOST_STRINGIZE(BEAST_VERSION)
-
-#endif
-
--- a/include/beast/websocket.hpp
+++ b/include/beast/websocket.hpp
@ -1,19 +0,0 @@
-//
-// 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_WEBSOCKET_HPP
-#define BEAST_WEBSOCKET_HPP
-
-#include <beast/config.hpp>
-
-#include <beast/websocket/error.hpp>
-#include <beast/websocket/option.hpp>
-#include <beast/websocket/rfc6455.hpp>
-#include <beast/websocket/stream.hpp>
-#include <beast/websocket/teardown.hpp>
-
-#endif
--- a/include/beast/zlib.hpp
+++ b/include/beast/zlib.hpp
@ -1,18 +0,0 @@
-//
-// 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_ZLIB_HPP
-#define BEAST_ZLIB_HPP
-
-#include <beast/config.hpp>
-
-#include <beast/zlib/deflate_stream.hpp>
-#include <beast/zlib/error.hpp>
-#include <beast/zlib/inflate_stream.hpp>
-#include <beast/zlib/zlib.hpp>
-
-#endif
--- a/include/boost/beast.hpp
+++ b/include/boost/beast.hpp
@ -0,0 +1,21 @@
+//
+// 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)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#ifndef BOOST_BEAST_HPP
+#define BOOST_BEAST_HPP
+
+#include <boost/beast/config.hpp> // must come first
+
+#include <boost/beast/core.hpp>
+#include <boost/beast/http.hpp>
+#include <boost/beast/version.hpp>
+#include <boost/beast/websocket.hpp>
+#include <boost/beast/zlib.hpp>
+
+#endif
--- a/include/boost/beast/config.hpp
+++ b/include/boost/beast/config.hpp
@ -4,9 +4,11 @@
 // 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)
 //
+// Official repository: https://github.com/boostorg/beast
+//

-#ifndef BEAST_CONFIG_HPP
-#define BEAST_CONFIG_HPP
+#ifndef BOOST_BEAST_CONFIG_HPP
+#define BOOST_BEAST_CONFIG_HPP

 #include <boost/config.hpp>

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