Skip to content
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

Jump to bottom

Fix unexpected POLLHUP event on connection failure on MacOS #976

Merged
merged 2 commits into from
Sep 13, 2023
Merged

Fix unexpected POLLHUP event on connection failure on MacOS #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e842ee2
Fixed unexpected POLLHUP event on connection failure on MacOS
paullouisageneau Sep 11, 2023
0feb74c
Test IPv4 fallback in WebSocksetServer test
paullouisageneau Sep 12, 2023
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
4 changes: 3 additions & 1 deletion src/impl/pollservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ void PollService::process(std::vector<struct pollfd> &pfds) {
auto &entry = jt->second;
const auto &params = entry.params;

if (it->revents & POLLNVAL || it->revents & POLLERR) {
if (it->revents & POLLNVAL || it->revents & POLLERR ||
(it->revents & POLLHUP &&
!(it->events & POLLIN))) { // MacOS sets POLLHUP on connection failure
PLOG_VERBOSE << "Poll error event";
auto callback = std::move(params.callback);
mSocks->erase(sock);
Expand Down
1 change: 1 addition & 0 deletions test/websocketserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ void test_websocketserver() {
serverConfig.enableTls = true;
// serverConfig.certificatePemFile = ...
// serverConfig.keyPemFile = ...
serverConfig.bindAddress = "127.0.0.1"; // to test IPv4 fallback
WebSocketServer server(std::move(serverConfig));

shared_ptr<WebSocket> client;
Expand Down
Loading