Skip to content

Commit

Permalink
fix: apple weirdness
Browse files Browse the repository at this point in the history
  • Loading branch information
braindigitalis committed Dec 4, 2024
1 parent 0d5e932 commit 4edc9a2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/dpp/httpsclient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ void https_client::close() {

https_client::~https_client() {
if (sfd != INVALID_SOCKET) {
https_client::close();
ssl_client::close();
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/dpp/queues.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ http_request_completion_t http_request::run(request_concurrency_queue* processor
if (client->timed_out) {
result.error = h_connection;
owner->log(ll_error, "HTTP(S) error on " + hci.scheme + " connection to " + request_verb[method] + " " + hci.hostname + ":" + std::to_string(hci.port) + _url + ": Timed out while waiting for the response");
} else if (cli->get_status() < 100) {
} else if (client->get_status() < 100) {
result.error = h_connection;
owner->log(ll_error, "HTTP(S) error on " + hci.scheme + " connection to " + request_verb[method] + " " + hci.hostname + ":" + std::to_string(hci.port) + _url + ": Malformed HTTP response");
}
Expand Down Expand Up @@ -403,7 +403,8 @@ void request_concurrency_queue::tick_and_deliver_requests(uint32_t index)
for (auto it = begin; it != end; ++it) {
if (it->get() == request_view) {
/* Grab and remove */
removals.emplace_back(std::move(*it));
rq = std::move(*it);
removals.push_back(std::move(rq));
requests_in.erase(it);
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/dpp/socketengines/kqueue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ struct DPP_EXPORT socket_engine_kqueue : public socket_engine_base {
bool remove_socket(dpp::socket fd) final {
bool r = socket_engine_base::remove_socket(fd);
if (r) {
struct kevent ke;
struct kevent ke{};
EV_SET(&ke, fd, EVFILT_WRITE, EV_DELETE, 0, 0, nullptr);
kevent(kqueue_handle, &ke, 1, nullptr, 0, nullptr);
EV_SET(&ke, fd, EVFILT_READ, EV_DELETE, 0, 0, nullptr);
Expand Down

0 comments on commit 4edc9a2

Please sign in to comment.