feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

http write returns success on connection close (API Change):

Browse Source 
fix #767

The write family of HTTP stream algorithms no longer returns
error::end_of_stream when the message indicates that the connection
should be closed.

Actions Required:

* Add code to servers to close the connection after successfully
  writing a message where `message::keep_alive()` would return `false`.
This commit is contained in:
Vinnie Falco
2017-10-22 07:03:04 -07:00
parent 885b9dfe0b
commit d0d4e0a740
16 changed files with 122 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/http/server/stackless-ssl/http_server_stackless_ssl.cpp
+14 -9
View File
@@ -251,7 +251,8 @@ class session
&session::loop,
self_.shared_from_this(),
std::placeholders::_1,
std::placeholders::_2)));
std::placeholders::_2,
! sp->keep_alive())));
}
};
@@ -283,14 +284,15 @@ public:
void
run()
{
loop({}, 0);
loop({}, 0, false);
}
#include <boost/asio/yield.hpp>
void
loop(
boost::system::error_code ec,
std::size_t bytes_transferred)
std::size_t bytes_transferred,
bool close)
{
boost::ignore_unused(bytes_transferred);
reenter(*this)
@@ -302,7 +304,8 @@ public:
&session::loop,
shared_from_this(),
std::placeholders::_1,
0)));
0,
false)));
if(ec)
return fail(ec, "handshake");
@@ -314,7 +317,8 @@ public:
&session::loop,
shared_from_this(),
std::placeholders::_1,
std::placeholders::_2)));
std::placeholders::_2,
false)));
if(ec == http::error::end_of_stream)
{
// The remote host closed the connection
@@ -325,14 +329,14 @@ public:
// Send the response
yield handle_request(doc_root_, std::move(req_), lambda_);
if(ec == http::error::end_of_stream)
if(ec)
return fail(ec, "write");
if(close)
{
// This means we should close the connection, usually because
// the response indicated the "Connection: close" semantic.
break;
}
if(ec)
return fail(ec, "write");
// We're done with the response so delete it
res_ = nullptr;
@@ -344,7 +348,8 @@ public:
&session::loop,
shared_from_this(),
std::placeholders::_1,
0)));
0,
false)));
if(ec)
return fail(ec, "shutdown");