From 00e8c381cd0cdd3f7e5bbb775c1e51329c291e60 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Sat, 16 Feb 2019 05:29:13 -0800
Subject: [PATCH] Examples use ssl_stream

fix #1455
---
 CHANGELOG.md                                                 | 1 +
 example/http/client/sync-ssl/http_client_sync_ssl.cpp        | 3 ++-
 example/http/server/sync-ssl/http_server_sync_ssl.cpp        | 5 +++--
 .../websocket/client/coro-ssl/websocket_client_coro_ssl.cpp  | 2 +-
 .../websocket/client/sync-ssl/websocket_client_sync_ssl.cpp  | 3 ++-
 .../websocket/server/sync-ssl/websocket_server_sync_ssl.cpp  | 3 ++-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 840b8fd8..a11aefca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Version 215:
 * Rename to async_op_base::invoke_now
 * Add async_op_base::invoke
 * Remove CppCon2018 example
+* Examples use ssl_stream
 
 --------------------------------------------------------------------------------
 
diff --git a/example/http/client/sync-ssl/http_client_sync_ssl.cpp b/example/http/client/sync-ssl/http_client_sync_ssl.cpp
index b2751c63..dba5744d 100644
--- a/example/http/client/sync-ssl/http_client_sync_ssl.cpp
+++ b/example/http/client/sync-ssl/http_client_sync_ssl.cpp
@@ -18,6 +18,7 @@
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
 #include <boost/beast/version.hpp>
+#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/connect.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/error.hpp>
@@ -66,7 +67,7 @@ int main(int argc, char** argv)
 
             // These objects perform our I/O
         tcp::resolver resolver{ioc};
-        ssl::stream<tcp::socket> stream{ioc, ctx};
+        beast::ssl_stream<tcp::socket> stream{ioc, ctx};
 
         // Set SNI Hostname (many hosts need this to handshake successfully)
         if(! SSL_set_tlsext_host_name(stream.native_handle(), host))
diff --git a/example/http/server/sync-ssl/http_server_sync_ssl.cpp b/example/http/server/sync-ssl/http_server_sync_ssl.cpp
index f25d045d..b6ba11e9 100644
--- a/example/http/server/sync-ssl/http_server_sync_ssl.cpp
+++ b/example/http/server/sync-ssl/http_server_sync_ssl.cpp
@@ -18,6 +18,7 @@
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
 #include <boost/beast/version.hpp>
+#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>
 #include <boost/config.hpp>
@@ -258,7 +259,7 @@ do_session(
     beast::error_code ec;
 
     // Construct the stream around the socket
-    ssl::stream<tcp::socket&> stream{socket, ctx};
+    beast::ssl_stream<tcp::socket&> stream{socket, ctx};
 
     // Perform the SSL handshake
     stream.handshake(ssl::stream_base::server, ec);
@@ -269,7 +270,7 @@ do_session(
     beast::flat_buffer buffer;
 
     // This lambda is used to send messages
-    send_lambda<ssl::stream<tcp::socket&>> lambda{stream, close, ec};
+    send_lambda<beast::ssl_stream<tcp::socket&>> lambda{stream, close, ec};
 
     for(;;)
     {
diff --git a/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp b/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp
index c84edb17..1d8f997b 100644
--- a/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp
+++ b/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp
@@ -55,7 +55,7 @@ do_session(
 
     // These objects perform our I/O
     tcp::resolver resolver{ioc};
-    websocket::stream<ssl::stream<
+    websocket::stream<beast::ssl_stream<
         beast::tcp_stream<net::io_context::executor_type>>> ws(ioc, ctx);
 
     // Look up the domain name
diff --git a/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp b/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp
index 7f4402fa..60a56d19 100644
--- a/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp
+++ b/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp
@@ -18,6 +18,7 @@
 #include <boost/beast/core.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/ssl.hpp>
+#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/connect.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>
@@ -61,7 +62,7 @@ int main(int argc, char** argv)
 
         // These objects perform our I/O
         tcp::resolver resolver{ioc};
-        websocket::stream<ssl::stream<tcp::socket>> ws{ioc, ctx};
+        websocket::stream<beast::ssl_stream<tcp::socket>> ws{ioc, ctx};
 
         // Look up the domain name
         auto const results = resolver.resolve(host, port);
diff --git a/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp b/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp
index 789e8b4a..976d7cf0 100644
--- a/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp
+++ b/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp
@@ -18,6 +18,7 @@
 #include <boost/beast/core.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/ssl.hpp>
+#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>
 #include <cstdlib>
@@ -42,7 +43,7 @@ do_session(tcp::socket& socket, ssl::context& ctx)
     try
     {
         // Construct the websocket stream around the socket
-        websocket::stream<ssl::stream<tcp::socket&>> ws{socket, ctx};
+        websocket::stream<beast::ssl_stream<tcp::socket&>> ws{socket, ctx};
 
         // Perform the SSL handshake
         ws.next_layer().handshake(ssl::stream_base::server);