Skip to content

fix for #1107 - websocket failure #1113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2025
+32 −30
Merged

fix for #1107 - websocket failure #1113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 32 additions & 30 deletions include/crow/websocket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,38 +716,40 @@ namespace crow // NOTE: Already documented in "crow/app.h"
/// Also destroys the object if the Close flag is set.
void do_write()
{
if (write_buffers_.empty()) return;
if (sending_buffers_.empty()) {
if (write_buffers_.empty()) return;

sending_buffers_.swap(write_buffers_);
std::vector<asio::const_buffer> buffers;
buffers.reserve(sending_buffers_.size());
for (auto& s : sending_buffers_)
{
buffers.emplace_back(asio::buffer(s));
}
auto watch = std::weak_ptr<void>{anchor_};
asio::async_write(
adaptor_.socket(), buffers,
[shared_this = this->shared_from_this(), watch](const error_code& ec, std::size_t /*bytes_transferred*/) {
auto anchor = watch.lock();
if (anchor == nullptr)
return;

if (!ec && !shared_this->close_connection_)
{
shared_this->sending_buffers_.clear();
if (!shared_this->write_buffers_.empty())
shared_this->do_write();
if (shared_this->has_sent_close_)
sending_buffers_.swap(write_buffers_);
std::vector<asio::const_buffer> buffers;
buffers.reserve(sending_buffers_.size());
for (auto &s: sending_buffers_)
{
buffers.emplace_back(asio::buffer(s));
}
auto watch = std::weak_ptr<void>{anchor_};
asio::async_write(
adaptor_.socket(), buffers,
[shared_this = this->shared_from_this(), watch](const error_code &ec, std::size_t /*bytes_transferred*/) {
auto anchor = watch.lock();
if (anchor == nullptr)
return;

if (!ec && !shared_this->close_connection_)
{
shared_this->sending_buffers_.clear();
if (!shared_this->write_buffers_.empty())
shared_this->do_write();
if (shared_this->has_sent_close_)
shared_this->close_connection_ = true;
}
else
{
shared_this->sending_buffers_.clear();
shared_this->close_connection_ = true;
}
else
{
shared_this->sending_buffers_.clear();
shared_this->close_connection_ = true;
shared_this->check_destroy();
}
});
shared_this->check_destroy();
}
});
}
}

/// Destroy the Connection.
Expand Down
Loading