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

file_win32 bodies respect http::serializer::split

Browse Source 
fix #1786, close #1788
This commit is contained in:
Mika Fischer
2019-12-23 13:33:00 +01:00
committed by Vinnie Falco
parent 35eaa441b9
commit 0abb38a310
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -2,6 +2,7 @@ Version 281:
* Travis builds docs * Travis builds docs
* Fix echo-op test * Fix echo-op test
* file_win32 bodies respect http::serializer::split
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

11
include/boost/beast/http/impl/file_body_win32.hpp
View File

@@ -339,7 +339,6 @@ class write_some_win32_op
Protocol, Executor>& sock_; Protocol, Executor>& sock_;
serializer<isRequest, serializer<isRequest,
basic_file_body<file_win32>, Fields>& sr_; basic_file_body<file_win32>, Fields>& sr_;
std::size_t bytes_transferred_ = 0;
bool header_ = false; bool header_ = false;
public: public:
@@ -415,14 +414,8 @@ public:
error_code ec, error_code ec,
std::size_t bytes_transferred = 0) std::size_t bytes_transferred = 0)
{ {
bytes_transferred_ += bytes_transferred; if(! ec && ! header_)
if(! ec)
{ {
if(header_)
{
header_ = false;
return (*this)();
}
auto& w = sr_.writer_impl(); auto& w = sr_.writer_impl();
w.pos_ += bytes_transferred; w.pos_ += bytes_transferred;
BOOST_ASSERT(w.pos_ <= w.body_.last_); BOOST_ASSERT(w.pos_ <= w.body_.last_);
@@ -433,7 +426,7 @@ public:
BOOST_ASSERT(sr_.is_done()); BOOST_ASSERT(sr_.is_done());
} }
} }
this->complete_now(ec, bytes_transferred_); this->complete_now(ec, bytes_transferred);
} }
}; };