From 61bb8b7702b8f2d4f42f89a2837b8c355757628e Mon Sep 17 00:00:00 2001
From: Gregory Robertson <robertson.gregory.a@gmail.com>
Date: Sun, 11 Dec 2022 17:29:38 -0500
Subject: [PATCH 1/2] Fix websocketpp incompliance with C++20

---
 extern/websocketpp/websocketpp/endpoint.hpp        |  2 +-
 extern/websocketpp/websocketpp/logger/basic.hpp    | 14 +++++++-------
 .../websocketpp/roles/server_endpoint.hpp          |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extern/websocketpp/websocketpp/endpoint.hpp b/extern/websocketpp/websocketpp/endpoint.hpp
index c124b1d9ab..9ce8a62614 100644
--- a/extern/websocketpp/websocketpp/endpoint.hpp
+++ b/extern/websocketpp/websocketpp/endpoint.hpp
@@ -109,7 +109,7 @@ class endpoint : public config::transport_type, public config::endpoint_base {
 
 
     /// Destructor
-    ~endpoint<connection,config>() {}
+    ~endpoint() {}
 
     #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
         // no copy constructor because endpoints are not copyable
diff --git a/extern/websocketpp/websocketpp/logger/basic.hpp b/extern/websocketpp/websocketpp/logger/basic.hpp
index 84514130e7..4c9d836493 100644
--- a/extern/websocketpp/websocketpp/logger/basic.hpp
+++ b/extern/websocketpp/websocketpp/logger/basic.hpp
@@ -58,33 +58,33 @@ namespace log {
 template <typename concurrency, typename names>
 class basic {
 public:
-    basic<concurrency,names>(channel_type_hint::value h =
+    basic(channel_type_hint::value h =
         channel_type_hint::access)
       : m_static_channels(0xffffffff)
       , m_dynamic_channels(0)
       , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
 
-    basic<concurrency,names>(std::ostream * out)
+    basic(std::ostream * out)
       : m_static_channels(0xffffffff)
       , m_dynamic_channels(0)
       , m_out(out) {}
 
-    basic<concurrency,names>(level c, channel_type_hint::value h =
+    basic(level c, channel_type_hint::value h =
         channel_type_hint::access)
       : m_static_channels(c)
       , m_dynamic_channels(0)
       , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
 
-    basic<concurrency,names>(level c, std::ostream * out)
+    basic(level c, std::ostream * out)
       : m_static_channels(c)
       , m_dynamic_channels(0)
       , m_out(out) {}
 
     /// Destructor
-    ~basic<concurrency,names>() {}
+    ~basic() {}
 
     /// Copy constructor
-    basic<concurrency,names>(basic<concurrency,names> const & other)
+    basic(basic<concurrency,names> const & other)
      : m_static_channels(other.m_static_channels)
      , m_dynamic_channels(other.m_dynamic_channels)
      , m_out(other.m_out)
@@ -97,7 +97,7 @@ class basic {
 
 #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
     /// Move constructor
-    basic<concurrency,names>(basic<concurrency,names> && other)
+    basic(basic<concurrency,names> && other)
      : m_static_channels(other.m_static_channels)
      , m_dynamic_channels(other.m_dynamic_channels)
      , m_out(other.m_out)
diff --git a/extern/websocketpp/websocketpp/roles/server_endpoint.hpp b/extern/websocketpp/websocketpp/roles/server_endpoint.hpp
index 9cc652f75c..64e8cd1034 100644
--- a/extern/websocketpp/websocketpp/roles/server_endpoint.hpp
+++ b/extern/websocketpp/websocketpp/roles/server_endpoint.hpp
@@ -72,11 +72,11 @@ class server : public endpoint<connection<config>,config> {
     }
 
     /// Destructor
-    ~server<config>() {}
+    ~server() {}
 
 #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
     // no copy constructor because endpoints are not copyable
-    server<config>(server<config> &) = delete;
+    server(server<config> &) = delete;
 
     // no copy assignment operator because endpoints are not copyable
     server<config> & operator=(server<config> const &) = delete;

From 4aa49764a47345afeff5a312e58837ea2b310353 Mon Sep 17 00:00:00 2001
From: Gregory Robertson <robertson.gregory.a@gmail.com>
Date: Tue, 13 Dec 2022 06:36:12 -0500
Subject: [PATCH 2/2] Update websocketpp to 0.8.2 with c++20 compliance fix

---
 extern/CMakeLists.txt                         |   3 +
 extern/websocketpp/CMakeLists.txt             | 285 +++++++++++++++++-
 extern/websocketpp/Doxyfile                   |   2 +-
 extern/websocketpp/changelog.md               |  12 +
 extern/websocketpp/cmake/CMakeHelpers.cmake   |   2 +-
 extern/websocketpp/docs/faq.dox               |   2 +-
 .../print_client_tls/print_client_tls.cpp     |   6 +-
 extern/websocketpp/readme.md                  |   2 +-
 .../websocketpp/roles/server_endpoint.hpp     |   2 +-
 .../websocketpp/transport/asio/connection.hpp |  10 +-
 .../websocketpp/transport/asio/endpoint.hpp   |  10 +-
 .../transport/asio/security/none.hpp          |   3 +-
 .../transport/asio/security/tls.hpp           |   3 +-
 extern/websocketpp/websocketpp/version.hpp    |   4 +-
 14 files changed, 317 insertions(+), 29 deletions(-)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 89ca138735..8d7651627c 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -28,6 +28,9 @@ add_subdirectory(SQLiteCpp)
 ## websocketpp
 add_subdirectory(asio-1.12.2) # Only required for websocketpp
 add_subdirectory(websocketpp)
+add_library(websocketpp INTERFACE)
+target_include_directories(websocketpp INTERFACE websocketpp)
+target_link_libraries(websocketpp INTERFACE asio)
 
 ## discord-rpc
 set(CLANG_FORMAT_CMD OFF CACHE BOOL "" FORCE)   # Disable discord clang-format
diff --git a/extern/websocketpp/CMakeLists.txt b/extern/websocketpp/CMakeLists.txt
index c10560cb0e..4f93e243a1 100644
--- a/extern/websocketpp/CMakeLists.txt
+++ b/extern/websocketpp/CMakeLists.txt
@@ -1,3 +1,282 @@
-add_library(websocketpp INTERFACE)
-target_include_directories(websocketpp INTERFACE .)
-target_link_libraries(websocketpp INTERFACE asio)
\ No newline at end of file
+
+############ Setup project and cmake
+# Minimum cmake requirement. We should require a quite recent
+# cmake for the dependency find macros etc. to be up to date.
+cmake_minimum_required (VERSION 2.8.8)
+
+############ Paths
+
+set (WEBSOCKETPP_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
+set (WEBSOCKETPP_INCLUDE ${WEBSOCKETPP_ROOT}/websocketpp)
+set (WEBSOCKETPP_BUILD_ROOT ${CMAKE_CURRENT_BINARY_DIR})
+set (WEBSOCKETPP_BIN ${WEBSOCKETPP_BUILD_ROOT}/bin)
+set (WEBSOCKETPP_LIB ${WEBSOCKETPP_BUILD_ROOT}/lib)
+
+# CMake install step prefix. I assume linux users want the prefix to
+# be the default /usr or /usr/local so this is only adjusted on Windows.
+# This must be set prior to any call to project or it will not be read correctly.
+# - Windows: Build the INSTALL project in your solution file.
+# - Linux/OSX: make install.
+if (WIN32)
+    set (CMAKE_INSTALL_PREFIX "${WEBSOCKETPP_ROOT}/install" CACHE PATH "")
+endif ()
+
+############ Project name and version
+set (WEBSOCKETPP_MAJOR_VERSION 0)
+set (WEBSOCKETPP_MINOR_VERSION 8)
+set (WEBSOCKETPP_PATCH_VERSION 2)
+set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
+
+if(POLICY CMP0048)
+  cmake_policy(GET CMP0048 _version_policy)
+endif()
+
+if(_version_allowed STREQUAL NEW)
+  project (websocketpp VERSION ${WEBSOCKETPP_VERSION})
+else()
+  project (websocketpp)
+endif()
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
+if (WIN32 AND NOT CYGWIN)
+  set (DEF_INSTALL_CMAKE_DIR cmake)
+else ()
+  set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp)
+endif ()
+set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
+
+# Make relative paths absolute (needed later on)
+foreach (p INCLUDE CMAKE)
+  set (var INSTALL_${p}_DIR)
+  if (NOT IS_ABSOLUTE "${${var}}")
+    set (${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
+  endif ()
+endforeach ()
+
+# Set CMake library search policy
+if (COMMAND cmake_policy)
+    cmake_policy (SET CMP0003 NEW)
+    cmake_policy (SET CMP0005 NEW)
+endif ()
+
+# Disable unnecessary build types
+set (CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo;Debug" CACHE STRING "Configurations" FORCE)
+
+# Include our cmake macros
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+include (CMakeHelpers)
+
+
+############  Build customization
+
+# Override from command line "CMake -D<OPTION>=TRUE/FALSE/0/1/ON/OFF"
+option (ENABLE_CPP11 "Build websocketpp with CPP11 features enabled." TRUE)
+option (BUILD_EXAMPLES "Build websocketpp examples." FALSE)
+option (BUILD_TESTS "Build websocketpp tests." FALSE)
+
+if (BUILD_TESTS OR BUILD_EXAMPLES)
+
+    enable_testing ()
+
+    ############ Compiler specific setup
+
+    set (WEBSOCKETPP_PLATFORM_LIBS "")
+    set (WEBSOCKETPP_PLATFORM_TLS_LIBS "")
+    set (WEBSOCKETPP_BOOST_LIBS "")
+
+    # VC9 and C++11 reasoning
+    if (ENABLE_CPP11 AND MSVC AND MSVC90)
+        message("* Detected Visual Studio 9 2008, disabling C++11 support.")
+        set (ENABLE_CPP11 FALSE)
+    endif ()
+
+    # Detect clang. Not officially reported by cmake.
+    execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-v" ERROR_VARIABLE CXX_VER_STDERR)
+    if ("${CXX_VER_STDERR}" MATCHES ".*clang.*")
+        set (CMAKE_COMPILER_IS_CLANGXX 1)
+    endif ()
+
+    # C++11 defines
+    if (ENABLE_CPP11)
+        if (MSVC)
+            add_definitions (-D_WEBSOCKETPP_CPP11_FUNCTIONAL_)
+            add_definitions (-D_WEBSOCKETPP_CPP11_SYSTEM_ERROR_)
+            add_definitions (-D_WEBSOCKETPP_CPP11_RANDOM_DEVICE_)
+            add_definitions (-D_WEBSOCKETPP_CPP11_MEMORY_)
+        else()
+            add_definitions (-D_WEBSOCKETPP_CPP11_STL_)
+        endif()
+    endif ()
+
+    # Visual studio
+    if (MSVC)
+        set (WEBSOCKETPP_BOOST_LIBS system thread)
+        set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Gy /GF /Ox /Ob2 /Ot /Oi /MP /arch:SSE2 /fp:fast")
+        set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG /INCREMENTAL:NO /OPT:REF /OPT:ICF")
+        add_definitions (/W3 /wd4996 /wd4995 /wd4355)
+        add_definitions (-DUNICODE -D_UNICODE)
+        add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
+        add_definitions (-DNOMINMAX)
+    endif ()
+
+    # g++
+    if (CMAKE_COMPILER_IS_GNUCXX)
+        if (NOT APPLE)
+            set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
+        else()
+            set (WEBSOCKETPP_PLATFORM_LIBS pthread)
+        endif()
+        set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
+        set (WEBSOCKETPP_BOOST_LIBS system thread)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+        if (NOT APPLE)
+            add_definitions (-DNDEBUG -Wall -Wcast-align) # todo: should we use CMAKE_C_FLAGS for these?
+        endif ()
+
+        # Try to detect version. Note: Not tested!
+        execute_process (COMMAND ${CMAKE_CXX_COMPILER} "-dumpversion" OUTPUT_VARIABLE GCC_VERSION)
+        if ("${GCC_VERSION}" STRGREATER "4.4.0")
+            message("* C++11 support partially enabled due to GCC version ${GCC_VERSION}")
+            set (WEBSOCKETPP_BOOST_LIBS system thread)
+        endif ()
+    endif ()
+
+    # clang
+    if (CMAKE_COMPILER_IS_CLANGXX)
+        if (NOT APPLE)
+            set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
+        else()
+            set (WEBSOCKETPP_PLATFORM_LIBS pthread)
+        endif()
+        set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
+        set (WEBSOCKETPP_BOOST_LIBS system thread)
+        set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
+        if (NOT APPLE)
+            add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?
+        endif ()
+    endif ()
+
+    # OSX, can override above.
+    if (APPLE)
+        add_definitions (-DNDEBUG -Wall)
+    endif ()
+
+    if (BUILD_EXAMPLES)
+        list (APPEND WEBSOCKETPP_BOOST_LIBS random)
+    endif()
+
+    if (BUILD_TESTS)
+        list (APPEND WEBSOCKETPP_BOOST_LIBS unit_test_framework)
+    endif()
+
+    ############ Dependencies
+
+    # Set BOOST_ROOT env variable or pass with cmake -DBOOST_ROOT=path.
+    # BOOST_ROOT can also be defined by a previous run from cmake cache.
+    if (NOT "$ENV{BOOST_ROOT_CPP11}" STREQUAL "")
+        # Scons documentation for BOOST_ROOT_CPP11:
+        # "look for optional second boostroot compiled with clang's libc++ STL library
+        # this prevents warnings/errors when linking code built with two different
+        # incompatible STL libraries."
+        file (TO_CMAKE_PATH "$ENV{BOOST_ROOT_CPP11}" BOOST_ROOT)
+        set (BOOST_ROOT ${BOOST_ROOT} CACHE PATH "BOOST_ROOT dependency path" FORCE)
+    endif ()
+    if ("${BOOST_ROOT}" STREQUAL "")
+        file (TO_CMAKE_PATH "$ENV{BOOST_ROOT}" BOOST_ROOT)
+        # Cache BOOST_ROOT for runs that do not define $ENV{BOOST_ROOT}.
+        set (BOOST_ROOT ${BOOST_ROOT} CACHE PATH "BOOST_ROOT dependency path" FORCE)
+    endif ()
+
+    message ("* Configuring Boost")
+    message (STATUS "-- Using BOOST_ROOT")
+    message (STATUS "       " ${BOOST_ROOT})
+
+    if (MSVC)
+        set (Boost_USE_MULTITHREADED TRUE)
+        set (Boost_USE_STATIC_LIBS TRUE)
+    else ()
+        set (Boost_USE_MULTITHREADED FALSE)
+        set (Boost_USE_STATIC_LIBS FALSE)
+    endif ()
+
+	if (BOOST_STATIC)
+		set (Boost_USE_STATIC_LIBS TRUE)
+	endif ()
+
+    if (NOT Boost_USE_STATIC_LIBS)
+        add_definitions (-DBOOST_TEST_DYN_LINK)
+    endif ()
+
+    set (Boost_FIND_REQUIRED TRUE)
+    set (Boost_FIND_QUIETLY TRUE)
+    set (Boost_DEBUG FALSE)
+    set (Boost_USE_MULTITHREADED TRUE)
+    set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
+
+    find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
+
+    if (Boost_FOUND)
+        # Boost is a project wide global dependency.
+        include_directories (${Boost_INCLUDE_DIRS})
+        link_directories (${Boost_LIBRARY_DIRS})
+
+        # Pretty print status
+        message (STATUS "-- Include Directories")
+        foreach (include_dir ${Boost_INCLUDE_DIRS})
+            message (STATUS "       " ${include_dir})
+        endforeach ()
+        message (STATUS "-- Library Directories")
+        foreach (library_dir ${Boost_LIBRARY_DIRS})
+            message (STATUS "       " ${library_dir})
+        endforeach ()
+        message (STATUS "-- Libraries")
+        foreach (boost_lib ${Boost_LIBRARIES})
+            message (STATUS "       " ${boost_lib})
+        endforeach ()
+        message ("")
+    else ()
+        message (FATAL_ERROR "Failed to find required dependency: boost")
+    endif ()
+
+    find_package(OpenSSL)
+    find_package(ZLIB)
+endif()
+
+############ Add projects
+
+# Add main library
+add_subdirectory (websocketpp)
+
+# Add examples
+if (BUILD_EXAMPLES)
+    include_subdirs ("examples")
+endif ()
+
+# Add tests
+if (BUILD_TESTS)
+    include_subdirs ("test")
+endif ()
+
+print_used_build_config()
+
+export (PACKAGE websocketpp)
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(websocketpp-config.cmake.in
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-config.cmake"
+  PATH_VARS INSTALL_INCLUDE_DIR
+  INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}"
+  NO_CHECK_REQUIRED_COMPONENTS_MACRO
+)
+write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
+  VERSION ${WEBSOCKETPP_VERSION}
+  COMPATIBILITY ExactVersion)
+
+# Install the websocketpp-config.cmake and websocketpp-configVersion.cmake
+install (FILES
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-config.cmake"
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
+  DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
+
diff --git a/extern/websocketpp/Doxyfile b/extern/websocketpp/Doxyfile
index e2061659b9..20b695cc9d 100644
--- a/extern/websocketpp/Doxyfile
+++ b/extern/websocketpp/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = WebSocket++
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.8.1
+PROJECT_NUMBER         = 0.8.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/extern/websocketpp/changelog.md b/extern/websocketpp/changelog.md
index 6771d6e9ef..3488a1981e 100644
--- a/extern/websocketpp/changelog.md
+++ b/extern/websocketpp/changelog.md
@@ -1,5 +1,17 @@
 HEAD
 
+0.8.2 - 2020-04-19
+- Examples: Update print_client_tls example to remove use of deprecated
+  OpenSSL functions.
+- Compatibility: Removes the use of make_shared in a number of cases where
+  it would be incompatible with newer versions of ASIO. Thank you Stefan
+  Floeren for the patch. #810 #814 #862 #843 #794 #808
+- CMake: Update cmake installer to better handle dependencies when using
+  g++ on MacOS. Thank you Luca Palano for reporting and a patch. #831
+- CMake: Update cmake installer to use a variable for the include directory
+  improving the ability of the install to be customized. THank you Schrijvers
+  Luc and Gianfranco Costamanga for reporting and a patch. #842
+
 0.8.1 - 2018-07-16
 Note: This release does not change library behavior. It only corrects issues
 in the installer and test system.
diff --git a/extern/websocketpp/cmake/CMakeHelpers.cmake b/extern/websocketpp/cmake/CMakeHelpers.cmake
index 1478f4b525..f6036325b2 100644
--- a/extern/websocketpp/cmake/CMakeHelpers.cmake
+++ b/extern/websocketpp/cmake/CMakeHelpers.cmake
@@ -80,7 +80,7 @@ macro (final_target)
     endif ()
 
     install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME}
-             DESTINATION include/
+             DESTINATION ${INSTALL_INCLUDE_DIR}/
              FILES_MATCHING PATTERN "*.hpp*")
 endmacro ()
 
diff --git a/extern/websocketpp/docs/faq.dox b/extern/websocketpp/docs/faq.dox
index 24059f755e..9f417ec410 100644
--- a/extern/websocketpp/docs/faq.dox
+++ b/extern/websocketpp/docs/faq.dox
@@ -55,7 +55,7 @@ If you handle errors from methods like send, ping, close, etc correctly then you
 
 Normally, for security purposes, operating systems prevent programs from listening on sockets created by other programs. When your program crashes and restarts, the new instance is a different program from the perspective of the operating system. As such it can’t listen on the socket address/port that the previous program was using until after a timeout occurs to make sure the old program was done with it.
 
-The the first step for handling this is to make sure that you provide a method (signal handler, admin websocket message, etc) to perform a clean server shutdown. There is a question elsewhere in this FAQ that describes the steps necessary for this.
+The first step for handling this is to make sure that you provide a method (signal handler, admin websocket message, etc) to perform a clean server shutdown. There is a question elsewhere in this FAQ that describes the steps necessary for this.
 
 The clean close strategy won't help in the case of crashes or other abnormal closures. An option to consider for these cases is the use of the SO_REUSEADDR socket option. This instructs the OS to not request an exclusive lock on the socket. This means that after your program crashes the replacement you start can immediately listen on that address/port combo again.
 
diff --git a/extern/websocketpp/examples/print_client_tls/print_client_tls.cpp b/extern/websocketpp/examples/print_client_tls/print_client_tls.cpp
index 0a1c72c06d..469d9c61e3 100644
--- a/extern/websocketpp/examples/print_client_tls/print_client_tls.cpp
+++ b/extern/websocketpp/examples/print_client_tls/print_client_tls.cpp
@@ -61,7 +61,7 @@ bool verify_subject_alternative_name(const char * hostname, X509 * cert) {
             continue;
         }
         
-        char * dns_name = (char *) ASN1_STRING_data(current_name->d.dNSName);
+        char const * dns_name = (char const *) ASN1_STRING_get0_data(current_name->d.dNSName);
         
         // Make sure there isn't an embedded NUL character in the DNS name
         if (ASN1_STRING_length(current_name->d.dNSName) != strlen(dns_name)) {
@@ -76,7 +76,7 @@ bool verify_subject_alternative_name(const char * hostname, X509 * cert) {
 }
 
 /// Verify that the certificate common name matches the given hostname
-bool verify_common_name(const char * hostname, X509 * cert) {
+bool verify_common_name(char const * hostname, X509 * cert) {
     // Find the position of the CN field in the Subject field of the certificate
     int common_name_loc = X509_NAME_get_index_by_NID(X509_get_subject_name(cert), NID_commonName, -1);
     if (common_name_loc < 0) {
@@ -95,7 +95,7 @@ bool verify_common_name(const char * hostname, X509 * cert) {
         return false;
     }
     
-    char * common_name_str = (char *) ASN1_STRING_data(common_name_asn1);
+    char const * common_name_str = (char const *) ASN1_STRING_get0_data(common_name_asn1);
     
     // Make sure there isn't an embedded NUL character in the CN
     if (ASN1_STRING_length(common_name_asn1) != strlen(common_name_str)) {
diff --git a/extern/websocketpp/readme.md b/extern/websocketpp/readme.md
index aa99f668e2..6cc608516f 100644
--- a/extern/websocketpp/readme.md
+++ b/extern/websocketpp/readme.md
@@ -1,4 +1,4 @@
-WebSocket++ (0.8.1)
+WebSocket++ (0.8.2)
 ==========================
 
 WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket
diff --git a/extern/websocketpp/websocketpp/roles/server_endpoint.hpp b/extern/websocketpp/websocketpp/roles/server_endpoint.hpp
index 64e8cd1034..63b200a54d 100644
--- a/extern/websocketpp/websocketpp/roles/server_endpoint.hpp
+++ b/extern/websocketpp/websocketpp/roles/server_endpoint.hpp
@@ -84,7 +84,7 @@ class server : public endpoint<connection<config>,config> {
 
 #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
     /// Move constructor
-    server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
+    server(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
 
 #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
     // no move assignment operator because of const member variables
diff --git a/extern/websocketpp/websocketpp/transport/asio/connection.hpp b/extern/websocketpp/websocketpp/transport/asio/connection.hpp
index 60f88a79f0..57dda74a2c 100644
--- a/extern/websocketpp/websocketpp/transport/asio/connection.hpp
+++ b/extern/websocketpp/websocketpp/transport/asio/connection.hpp
@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type {
      * needed.
      */
     timer_ptr set_timer(long duration, timer_handler callback) {
-        timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
-            lib::ref(*m_io_service),
-            lib::asio::milliseconds(duration)
+        timer_ptr new_timer(
+            new lib::asio::steady_timer(
+                *m_io_service,
+                lib::asio::milliseconds(duration))
         );
 
         if (config::enable_multithreading) {
@@ -461,8 +462,7 @@ class connection : public config::socket_type::socket_con_type {
         m_io_service = io_service;
 
         if (config::enable_multithreading) {
-            m_strand = lib::make_shared<lib::asio::io_service::strand>(
-                lib::ref(*io_service));
+            m_strand.reset(new lib::asio::io_service::strand(*io_service));
         }
 
         lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
diff --git a/extern/websocketpp/websocketpp/transport/asio/endpoint.hpp b/extern/websocketpp/websocketpp/transport/asio/endpoint.hpp
index ddab2c7421..94509adb3b 100644
--- a/extern/websocketpp/websocketpp/transport/asio/endpoint.hpp
+++ b/extern/websocketpp/websocketpp/transport/asio/endpoint.hpp
@@ -195,8 +195,7 @@ class endpoint : public config::socket_type {
 
         m_io_service = ptr;
         m_external_io_service = true;
-        m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
-            lib::ref(*m_io_service));
+        m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
 
         m_state = READY;
         ec = lib::error_code();
@@ -688,9 +687,7 @@ class endpoint : public config::socket_type {
      * @since 0.3.0
      */
     void start_perpetual() {
-        m_work = lib::make_shared<lib::asio::io_service::work>(
-            lib::ref(*m_io_service)
-        );
+        m_work.reset(new lib::asio::io_service::work(*m_io_service));
     }
 
     /// Clears the endpoint's perpetual flag, allowing it to exit when empty
@@ -854,8 +851,7 @@ class endpoint : public config::socket_type {
 
         // Create a resolver
         if (!m_resolver) {
-            m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
-                lib::ref(*m_io_service));
+            m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
         }
 
         tcon->set_uri(u);
diff --git a/extern/websocketpp/websocketpp/transport/asio/security/none.hpp b/extern/websocketpp/websocketpp/transport/asio/security/none.hpp
index 5c8293dbe9..6c7d352410 100644
--- a/extern/websocketpp/websocketpp/transport/asio/security/none.hpp
+++ b/extern/websocketpp/websocketpp/transport/asio/security/none.hpp
@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this<connection> {
             return socket::make_error_code(socket::error::invalid_state);
         }
 
-        m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
-            lib::ref(*service));
+        m_socket.reset(new lib::asio::ip::tcp::socket(*service));
 
         if (m_socket_init_handler) {
             m_socket_init_handler(m_hdl, *m_socket);
diff --git a/extern/websocketpp/websocketpp/transport/asio/security/tls.hpp b/extern/websocketpp/websocketpp/transport/asio/security/tls.hpp
index c76fd9aa12..04ac379036 100644
--- a/extern/websocketpp/websocketpp/transport/asio/security/tls.hpp
+++ b/extern/websocketpp/websocketpp/transport/asio/security/tls.hpp
@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this<connection> {
         if (!m_context) {
             return socket::make_error_code(socket::error::invalid_tls_context);
         }
-        m_socket = lib::make_shared<socket_type>(
-            _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
+        m_socket.reset(new socket_type(*service, *m_context));
 
         if (m_socket_init_handler) {
             m_socket_init_handler(m_hdl, get_socket());
diff --git a/extern/websocketpp/websocketpp/version.hpp b/extern/websocketpp/websocketpp/version.hpp
index f701ab103b..5766546f76 100644
--- a/extern/websocketpp/websocketpp/version.hpp
+++ b/extern/websocketpp/websocketpp/version.hpp
@@ -44,7 +44,7 @@ static int const major_version = 0;
 /// Library minor version number
 static int const minor_version = 8;
 /// Library patch version number
-static int const patch_version = 1;
+static int const patch_version = 2;
 /// Library pre-release flag
 /**
  * This is a textual flag indicating the type and number for pre-release
@@ -54,7 +54,7 @@ static int const patch_version = 1;
 static char const prerelease_flag[] = "";
 
 /// Default user agent string
-static char const user_agent[] = "WebSocket++/0.8.1";
+static char const user_agent[] = "WebSocket++/0.8.2";
 
 } // namespace websocketpp