Close the connection after a partly read request body

When a content receiver returned false, or threw, partway through a body,
the drain after the response read a whole Content-Length again from where
it stopped. It swallowed the start of the next request, so the rest was
parsed as a request of its own once the handler answered below 400. A
handler that called the content reader a second time read into the next
request the same way.

Mark the body once reading starts, and if it does not finish, answer with
Connection: close and never drain it from the middle. Let each request's
body be read only once.
This commit is contained in:
yhirose committed 2026-10-16 05:32:29 -04:00
1 parent c11d95b26b
commit fc0e8230ba
2 files changed
+84 -3

No files matched your search

+16 -3
View File
@@ -1811,6 +1811,7 @@ struct Request {
bool is_multipart_form_data() const;
// private members...
bool body_read_started_ = false;
bool body_consumed_ = false;
bool expect_100_continue_pending_ = false;
size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT;
@@ -13586,7 +13587,10 @@ inline bool Server::write_response_core(Stream &strm, bool close_connection,
400 <= res.status || // Don't leave connections open after errors
// The client withholds the body until `100 Continue`, which was never
// sent, so whether and when the body follows is unknown.
(req.expect_100_continue_pending_ && detail::has_framed_body(req))) {
(req.expect_100_continue_pending_ && detail::has_framed_body(req)) ||
// The body was left partway, e.g. by a content receiver that returned
// false, so the rest of it cannot be told from the next request.
(req.body_read_started_ && !req.body_consumed_)) {
res.set_header("Connection", "close");
} else {
std::string s = "timeout=";
@@ -13858,6 +13862,10 @@ inline bool Server::read_content_core(
}
#endif
// A second read would start where the first one stopped, or in the next
// request.
if (req.body_read_started_) { return false; }
// The client is waiting for this before it sends the body.
if (req.expect_100_continue_pending_) {
req.expect_100_continue_pending_ = false;
@@ -13865,6 +13873,9 @@ inline bool Server::read_content_core(
strm.write("\r\n");
}
// Set before reading, since a receiver may also stop by throwing.
req.body_read_started_ = true;
if (!detail::read_content(strm, req, payload_max_length_, res.status, nullptr,
out, true)) {
return false;
@@ -14938,11 +14949,13 @@ Server::process_request(Stream &strm, const std::string &remote_addr,
// Drain any unconsumed framed body to prevent request smuggling on
// keep-alive. Without framing there is no body to drain — reading would
// consume the next request (issue #2450). If the response has committed the
// connection to close, there is no next request to protect.
// connection to close, there is no next request to protect. A body read in
// part cannot be drained from where it stopped, so the connection closes.
if (!req.body_consumed_ && detail::has_framed_body(req) &&
!detail::has_header_token(res.headers, "Connection", "close")) {
int dummy_status;
if (!detail::read_content(
if (req.body_read_started_ ||
!detail::read_content(
strm, req, payload_max_length_, dummy_status, nullptr,
[](const char *, size_t, size_t, size_t) { return true; }, false)) {
connection_closed = true;