From 703aa97c533ab7d942d6d9ef07bbfc8c0d0dfb35 Mon Sep 17 00:00:00 2001 From: Jessica James Date: Sat, 20 Nov 2021 20:37:01 -0600 Subject: [PATCH] Fix some server list crashes Fix /server endpoint JSON never being updated --- src/common/HTTP_Server.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/HTTP_Server.cpp b/src/common/HTTP_Server.cpp index 6e8644f..fc62db7 100644 --- a/src/common/HTTP_Server.cpp +++ b/src/common/HTTP_Server.cpp @@ -701,8 +701,7 @@ bool Jupiter::HTTP::Server::tls_bind(const Jupiter::ReadableString &hostname, ui int Jupiter::HTTP::Server::think() { // Process existing clients - auto sessions_end = m_data->m_sessions.end(); - for (auto itr = m_data->m_sessions.begin(); itr != sessions_end;) { + for (auto itr = m_data->m_sessions.begin(); itr != m_data->m_sessions.end();) { auto& session = *itr; if (session->sock.isShutdown()) { if (session->sock.recv() == 0) { @@ -752,7 +751,7 @@ int Jupiter::HTTP::Server::think() { // Process incoming clients std::unique_ptr socket; for (auto& port : m_data->m_ports) { - socket.reset(socket->accept()); + socket.reset(port->accept()); if (socket != nullptr) { socket->setBlocking(false); auto session = std::make_unique(std::move(*socket));