forked from boostorg/beast
net::ssl::stream is canonical in examples
We no longer need to use beast::ssl_stream to improve write performance, as Asio now linearizes scatter/gather I/O in ssl::stream: https://github.com/chriskohlhoff/asio/commit/17637a48ccbfa2f63941d8393a7c8316a8df4a79
This commit is contained in:
committed by
Mohammad Nejati
parent
bd804b6520
commit
03b792faac
@@ -17,14 +17,13 @@
|
||||
|
||||
#include <boost/beast/core.hpp>
|
||||
#include <boost/beast/http.hpp>
|
||||
#include <boost/beast/ssl.hpp>
|
||||
#include <boost/beast/version.hpp>
|
||||
#include <boost/asio/dispatch.hpp>
|
||||
#include <boost/asio/ssl.hpp>
|
||||
#include <boost/asio/strand.hpp>
|
||||
#include <boost/config.hpp>
|
||||
#include <algorithm>
|
||||
#include <cstdlib>
|
||||
#include <functional>
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
@@ -236,7 +235,7 @@ fail(beast::error_code ec, char const* what)
|
||||
// Handles an HTTP server connection
|
||||
class session : public std::enable_shared_from_this<session>
|
||||
{
|
||||
beast::ssl_stream<beast::tcp_stream> stream_;
|
||||
ssl::stream<beast::tcp_stream> stream_;
|
||||
beast::flat_buffer buffer_;
|
||||
std::shared_ptr<std::string const> doc_root_;
|
||||
http::request<http::string_body> req_;
|
||||
|
||||
@@ -17,10 +17,10 @@
|
||||
|
||||
#include <boost/beast/core.hpp>
|
||||
#include <boost/beast/http.hpp>
|
||||
#include <boost/beast/ssl.hpp>
|
||||
#include <boost/beast/version.hpp>
|
||||
#include <boost/asio/detached.hpp>
|
||||
#include <boost/asio/spawn.hpp>
|
||||
#include <boost/asio/ssl.hpp>
|
||||
#include <boost/config.hpp>
|
||||
#include <algorithm>
|
||||
#include <cstdlib>
|
||||
@@ -235,7 +235,7 @@ fail(beast::error_code ec, char const* what)
|
||||
// Handles an HTTP server connection
|
||||
void
|
||||
do_session(
|
||||
beast::ssl_stream<beast::tcp_stream>& stream,
|
||||
ssl::stream<beast::tcp_stream>& stream,
|
||||
std::shared_ptr<std::string const> const& doc_root,
|
||||
net::yield_context yield)
|
||||
{
|
||||
@@ -342,7 +342,7 @@ do_listen(
|
||||
acceptor.get_executor(),
|
||||
std::bind(
|
||||
&do_session,
|
||||
beast::ssl_stream<beast::tcp_stream>(
|
||||
ssl::stream<beast::tcp_stream>(
|
||||
std::move(socket), ctx),
|
||||
doc_root,
|
||||
std::placeholders::_1),
|
||||
|
||||
@@ -17,14 +17,13 @@
|
||||
|
||||
#include <boost/beast/core.hpp>
|
||||
#include <boost/beast/http.hpp>
|
||||
#include <boost/beast/ssl.hpp>
|
||||
#include <boost/beast/version.hpp>
|
||||
#include <boost/asio/dispatch.hpp>
|
||||
#include <boost/asio/ssl.hpp>
|
||||
#include <boost/asio/strand.hpp>
|
||||
#include <boost/config.hpp>
|
||||
#include <algorithm>
|
||||
#include <cstdlib>
|
||||
#include <functional>
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
@@ -393,7 +392,7 @@ class ssl_session
|
||||
: public session<ssl_session>
|
||||
, public std::enable_shared_from_this<ssl_session>
|
||||
{
|
||||
beast::ssl_stream<beast::tcp_stream> stream_;
|
||||
ssl::stream<beast::tcp_stream> stream_;
|
||||
|
||||
public:
|
||||
// Create the session
|
||||
@@ -410,7 +409,7 @@ public:
|
||||
}
|
||||
|
||||
// Called by the base class
|
||||
beast::ssl_stream<beast::tcp_stream>&
|
||||
ssl::stream<beast::tcp_stream>&
|
||||
stream()
|
||||
{
|
||||
return stream_;
|
||||
|
||||
@@ -17,10 +17,10 @@
|
||||
|
||||
#include <boost/beast/core.hpp>
|
||||
#include <boost/beast/http.hpp>
|
||||
#include <boost/beast/ssl.hpp>
|
||||
#include <boost/beast/version.hpp>
|
||||
#include <boost/asio/coroutine.hpp>
|
||||
#include <boost/asio/dispatch.hpp>
|
||||
#include <boost/asio/ssl.hpp>
|
||||
#include <boost/asio/strand.hpp>
|
||||
#include <boost/config.hpp>
|
||||
#include <algorithm>
|
||||
@@ -239,7 +239,7 @@ class session
|
||||
: public boost::asio::coroutine
|
||||
, public std::enable_shared_from_this<session>
|
||||
{
|
||||
beast::ssl_stream<beast::tcp_stream> stream_;
|
||||
ssl::stream<beast::tcp_stream> stream_;
|
||||
beast::flat_buffer buffer_;
|
||||
std::shared_ptr<std::string const> doc_root_;
|
||||
http::request<http::string_body> req_;
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
|
||||
#include <boost/beast/core.hpp>
|
||||
#include <boost/beast/http.hpp>
|
||||
#include <boost/beast/ssl.hpp>
|
||||
#include <boost/beast/version.hpp>
|
||||
#include <boost/asio/ip/tcp.hpp>
|
||||
#include <boost/asio/ssl.hpp>
|
||||
#include <boost/asio/ssl/stream.hpp>
|
||||
#include <boost/config.hpp>
|
||||
#include <cstdlib>
|
||||
@@ -220,7 +220,7 @@ do_session(
|
||||
beast::error_code ec;
|
||||
|
||||
// Construct the stream around the socket
|
||||
beast::ssl_stream<tcp::socket&> stream{socket, ctx};
|
||||
ssl::stream<tcp::socket&> stream{socket, ctx};
|
||||
|
||||
// Perform the SSL handshake
|
||||
stream.handshake(ssl::stream_base::server, ec);
|
||||
|
||||
Reference in New Issue
Block a user