boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-30 21:07:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

awaitable server close fix.

Browse Source 
Closes #2637
This commit is contained in:
Klemens Morgenstern
2023-02-20 13:58:07 +08:00
parent 78c21308fa
commit 2bd65b27e1
1 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
example/http/server/awaitable/http_server_awaitable.cpp
View File

@ -215,37 +215,37 @@ do_session(
tcp_stream stream, tcp_stream stream,
std::shared_ptr<std::string const> doc_root) std::shared_ptr<std::string const> doc_root)
{ {
beast::error_code ec;
// This buffer is required to persist across reads // This buffer is required to persist across reads
beast::flat_buffer buffer; beast::flat_buffer buffer;
// This lambda is used to send messages // This lambda is used to send messages
for(;;)
try try
{ {
// Set the timeout. for(;;)
stream.expires_after(std::chrono::seconds(30));
// Read a request
http::request<http::string_body> req;
co_await http::async_read(stream, buffer, req);
// Handle the request
http::message_generator msg =
handle_request(*doc_root, std::move(req));
// Determine if we should close the connection
bool keep_alive = msg.keep_alive();
// Send the response
co_await beast::async_write(stream, std::move(msg), net::use_awaitable);
if(! keep_alive)
{ {
// This means we should close the connection, usually because // Set the timeout.
// the response indicated the "Connection: close" semantic. stream.expires_after(std::chrono::seconds(30));
break;
// Read a request
http::request<http::string_body> req;
co_await http::async_read(stream, buffer, req);
// Handle the request
http::message_generator msg =
handle_request(*doc_root, std::move(req));
// Determine if we should close the connection
bool keep_alive = msg.keep_alive();
// Send the response
co_await beast::async_write(stream, std::move(msg), net::use_awaitable);
if(! keep_alive)
{
// This means we should close the connection, usually because
// the response indicated the "Connection: close" semantic.
break;
}
} }
} }
catch (boost::system::system_error & se) catch (boost::system::system_error & se)
@ -255,9 +255,12 @@ do_session(
} }
// Send a TCP shutdown // Send a TCP shutdown
beast::error_code ec;
stream.socket().shutdown(tcp::socket::shutdown_send, ec); stream.socket().shutdown(tcp::socket::shutdown_send, ec);
// At this point the connection is closed gracefully // At this point the connection is closed gracefully
// we ignore the error because the client might have
// dropped the connection already.
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -287,13 +290,14 @@ do_listen(
do_session(tcp_stream(co_await acceptor.async_accept()), doc_root), do_session(tcp_stream(co_await acceptor.async_accept()), doc_root),
[](std::exception_ptr e) [](std::exception_ptr e)
{ {
try if (e)
{ try
std::rethrow_exception(e); {
} std::rethrow_exception(e);
catch (std::exception &e) { }
std::cerr << "Error in session: " << e.what() << "\n"; catch (std::exception &e) {
} std::cerr << "Error in session: " << e.what() << "\n";
}
}); });
} }