aboutsummaryrefslogtreecommitdiff
path: root/src/zenhttp
diff options
context:
space:
mode:
Diffstat (limited to 'src/zenhttp')
-rw-r--r--src/zenhttp/httpclient.cpp2
-rw-r--r--src/zenhttp/httpclient_test.cpp18
-rw-r--r--src/zenhttp/httpserver.cpp6
-rw-r--r--src/zenhttp/include/zenhttp/httpserver.h6
-rw-r--r--src/zenhttp/include/zenhttp/httpstats.h4
-rw-r--r--src/zenhttp/include/zenhttp/httpwsclient.h8
-rw-r--r--src/zenhttp/servers/httpasio.cpp2
-rw-r--r--src/zenhttp/servers/httpsys.cpp6
-rw-r--r--src/zenhttp/servers/wsasio.cpp2
-rw-r--r--src/zenhttp/servers/wshttpsys.cpp6
-rw-r--r--src/zenhttp/servers/wstest.cpp8
11 files changed, 34 insertions, 34 deletions
diff --git a/src/zenhttp/httpclient.cpp b/src/zenhttp/httpclient.cpp
index ace7a3c7f..3da8a9220 100644
--- a/src/zenhttp/httpclient.cpp
+++ b/src/zenhttp/httpclient.cpp
@@ -520,7 +520,7 @@ MeasureLatency(HttpClient& Client, std::string_view Url)
ErrorMessage = MeasureResponse.ErrorMessage(fmt::format("Unable to measure latency using {}", Url));
// Connection-level failures (timeout, refused, DNS) mean the endpoint is unreachable.
- // Bail out immediately — retrying will just burn the connect timeout each time.
+ // Bail out immediately - retrying will just burn the connect timeout each time.
if (MeasureResponse.Error && MeasureResponse.Error->IsConnectionError())
{
break;
diff --git a/src/zenhttp/httpclient_test.cpp b/src/zenhttp/httpclient_test.cpp
index 9b3148a4a..67cbaea9b 100644
--- a/src/zenhttp/httpclient_test.cpp
+++ b/src/zenhttp/httpclient_test.cpp
@@ -1148,7 +1148,7 @@ struct FaultTcpServer
~FaultTcpServer()
{
// io_context::stop() is thread-safe; do NOT call m_Acceptor.close() from this
- // thread — ASIO I/O objects are not safe for concurrent access and the io_context
+ // thread - ASIO I/O objects are not safe for concurrent access and the io_context
// thread may be touching the acceptor in StartAccept().
m_IoContext.stop();
if (m_Thread.joinable())
@@ -1502,7 +1502,7 @@ TEST_CASE("httpclient.transport-faults-post" * doctest::skip())
std::atomic<bool> StallActive{true};
FaultTcpServer Server([&StallActive](asio::ip::tcp::socket& Socket) {
DrainHttpRequest(Socket);
- // Stop reading body — TCP window will fill and client send will stall
+ // Stop reading body - TCP window will fill and client send will stall
while (StallActive.load())
{
std::this_thread::sleep_for(std::chrono::milliseconds(50));
@@ -1739,21 +1739,21 @@ TEST_CASE("httpclient.uri_decoding")
TestServerFixture Fixture;
HttpClient Client = Fixture.MakeClient();
- // URI without encoding — should pass through unchanged
+ // URI without encoding - should pass through unchanged
{
HttpClient::Response Resp = Client.Get("/api/test/echo/uri/hello/world.txt");
REQUIRE(Resp.IsSuccess());
CHECK(Resp.AsText() == "uri=echo/uri/hello/world.txt\ncapture=hello/world.txt");
}
- // Percent-encoded space — server should see decoded path
+ // Percent-encoded space - server should see decoded path
{
HttpClient::Response Resp = Client.Get("/api/test/echo/uri/hello%20world.txt");
REQUIRE(Resp.IsSuccess());
CHECK(Resp.AsText() == "uri=echo/uri/hello world.txt\ncapture=hello world.txt");
}
- // Percent-encoded slash (%2F) — should be decoded to /
+ // Percent-encoded slash (%2F) - should be decoded to /
{
HttpClient::Response Resp = Client.Get("/api/test/echo/uri/a%2Fb.txt");
REQUIRE(Resp.IsSuccess());
@@ -1767,21 +1767,21 @@ TEST_CASE("httpclient.uri_decoding")
CHECK(Resp.AsText() == "uri=echo/uri/file & name.txt\ncapture=file & name.txt");
}
- // No capture — echo/uri route returns just RelativeUri
+ // No capture - echo/uri route returns just RelativeUri
{
HttpClient::Response Resp = Client.Get("/api/test/echo/uri");
REQUIRE(Resp.IsSuccess());
CHECK(Resp.AsText() == "echo/uri");
}
- // Literal percent that is not an escape (%ZZ) — should be kept as-is
+ // Literal percent that is not an escape (%ZZ) - should be kept as-is
{
HttpClient::Response Resp = Client.Get("/api/test/echo/uri/100%25done.txt");
REQUIRE(Resp.IsSuccess());
CHECK(Resp.AsText() == "uri=echo/uri/100%done.txt\ncapture=100%done.txt");
}
- // Query params — raw values are returned as-is from GetQueryParams
+ // Query params - raw values are returned as-is from GetQueryParams
{
HttpClient::Response Resp = Client.Get("/api/test/echo/uri?key=value&name=test");
REQUIRE(Resp.IsSuccess());
@@ -1792,7 +1792,7 @@ TEST_CASE("httpclient.uri_decoding")
{
HttpClient::Response Resp = Client.Get("/api/test/echo/uri?prefix=listing%2F&mode=s3");
REQUIRE(Resp.IsSuccess());
- // GetQueryParams returns raw (still-encoded) values — callers must Decode() explicitly
+ // GetQueryParams returns raw (still-encoded) values - callers must Decode() explicitly
CHECK(Resp.AsText() == "echo/uri\nprefix=listing%2F\nmode=s3");
}
diff --git a/src/zenhttp/httpserver.cpp b/src/zenhttp/httpserver.cpp
index 3668e1e8f..03117ee6c 100644
--- a/src/zenhttp/httpserver.cpp
+++ b/src/zenhttp/httpserver.cpp
@@ -920,7 +920,7 @@ HttpRequestRouter::HandleRequest(zen::HttpServerRequest& Request)
// Strip the separator slash left over after the service prefix is removed.
// When a service has BaseUri "/foo", the prefix length is set to len("/foo") = 4.
- // Stripping 4 chars from "/foo/bar" yields "/bar" — the path separator becomes
+ // Stripping 4 chars from "/foo/bar" yields "/bar" - the path separator becomes
// the first character of the relative URI. Remove it so patterns like "bar" or
// "{id}" match without needing to account for the leading slash.
if (!Uri.empty() && Uri.front() == '/')
@@ -1621,7 +1621,7 @@ TEST_CASE("http.common")
},
HttpVerb::kGet);
- // Single-segment literal with leading slash — simulates real server RelativeUri
+ // Single-segment literal with leading slash - simulates real server RelativeUri
{
Reset();
TestHttpServerRequest req{Service, "/activity_counters"sv};
@@ -1641,7 +1641,7 @@ TEST_CASE("http.common")
CHECK_EQ(Captures[0], "hello"sv);
}
- // Two-segment route with leading slash — first literal segment
+ // Two-segment route with leading slash - first literal segment
{
Reset();
TestHttpServerRequest req{Service, "/prefix/world"sv};
diff --git a/src/zenhttp/include/zenhttp/httpserver.h b/src/zenhttp/include/zenhttp/httpserver.h
index 136304426..955b8ed15 100644
--- a/src/zenhttp/include/zenhttp/httpserver.h
+++ b/src/zenhttp/include/zenhttp/httpserver.h
@@ -302,12 +302,12 @@ public:
std::string_view GetDefaultRedirect() const { return m_DefaultRedirect; }
- /** Track active WebSocket connections — called by server implementations on upgrade/close. */
+ /** Track active WebSocket connections - called by server implementations on upgrade/close. */
void OnWebSocketConnectionOpened() { m_ActiveWebSocketConnections.fetch_add(1, std::memory_order_relaxed); }
void OnWebSocketConnectionClosed() { m_ActiveWebSocketConnections.fetch_sub(1, std::memory_order_relaxed); }
uint64_t GetActiveWebSocketConnectionCount() const { return m_ActiveWebSocketConnections.load(std::memory_order_relaxed); }
- /** Track WebSocket frame and byte counters — called by WS connection implementations per frame. */
+ /** Track WebSocket frame and byte counters - called by WS connection implementations per frame. */
void OnWebSocketFrameReceived(uint64_t Bytes)
{
m_WsFramesReceived.fetch_add(1, std::memory_order_relaxed);
@@ -329,7 +329,7 @@ private:
int m_EffectiveHttpsPort = 0;
std::string m_ExternalHost;
metrics::Meter m_RequestMeter;
- metrics::HyperLogLog<12> m_ClientAddresses; // ~4 KiB, ~1.6% error — sufficient for client counting
+ metrics::HyperLogLog<12> m_ClientAddresses; // ~4 KiB, ~1.6% error - sufficient for client counting
metrics::HyperLogLog<12> m_ClientSessions;
std::string m_DefaultRedirect;
std::atomic<uint64_t> m_ActiveWebSocketConnections{0};
diff --git a/src/zenhttp/include/zenhttp/httpstats.h b/src/zenhttp/include/zenhttp/httpstats.h
index b20bc3a36..51ab2e06e 100644
--- a/src/zenhttp/include/zenhttp/httpstats.h
+++ b/src/zenhttp/include/zenhttp/httpstats.h
@@ -23,11 +23,11 @@ namespace zen {
class HttpStatsService : public HttpService, public IHttpStatsService, public IWebSocketHandler
{
public:
- /// Construct without an io_context — optionally uses a dedicated push thread
+ /// Construct without an io_context - optionally uses a dedicated push thread
/// for WebSocket stats broadcasting.
explicit HttpStatsService(bool EnableWebSockets = false);
- /// Construct with an external io_context — uses an asio timer instead
+ /// Construct with an external io_context - uses an asio timer instead
/// of a dedicated thread for WebSocket stats broadcasting.
/// The caller must ensure the io_context outlives this service and that
/// its run loop is active.
diff --git a/src/zenhttp/include/zenhttp/httpwsclient.h b/src/zenhttp/include/zenhttp/httpwsclient.h
index 9c3b909a2..fd2f79171 100644
--- a/src/zenhttp/include/zenhttp/httpwsclient.h
+++ b/src/zenhttp/include/zenhttp/httpwsclient.h
@@ -26,7 +26,7 @@ namespace zen {
* Callback interface for WebSocket client events
*
* Separate from the server-side IWebSocketHandler because the caller
- * already owns the HttpWsClient — no Ref<WebSocketConnection> needed.
+ * already owns the HttpWsClient - no Ref<WebSocketConnection> needed.
*/
class IWsClientHandler
{
@@ -85,9 +85,9 @@ private:
/// it is treated as a plain host:port and gets the ws:// prefix.
///
/// Examples:
-/// HttpToWsUrl("http://host:8080", "/orch/ws") → "ws://host:8080/orch/ws"
-/// HttpToWsUrl("https://host", "/foo") → "wss://host/foo"
-/// HttpToWsUrl("host:8080", "/bar") → "ws://host:8080/bar"
+/// HttpToWsUrl("http://host:8080", "/orch/ws") -> "ws://host:8080/orch/ws"
+/// HttpToWsUrl("https://host", "/foo") -> "wss://host/foo"
+/// HttpToWsUrl("host:8080", "/bar") -> "ws://host:8080/bar"
std::string HttpToWsUrl(std::string_view Endpoint, std::string_view Path);
} // namespace zen
diff --git a/src/zenhttp/servers/httpasio.cpp b/src/zenhttp/servers/httpasio.cpp
index cfba3c95f..a1a775ba3 100644
--- a/src/zenhttp/servers/httpasio.cpp
+++ b/src/zenhttp/servers/httpasio.cpp
@@ -1311,7 +1311,7 @@ HttpServerConnectionT<SocketType>::HandleRequest()
return;
}
}
- // Service doesn't support WebSocket or missing key — fall through to normal handling
+ // Service doesn't support WebSocket or missing key - fall through to normal handling
}
if (!m_RequestData.IsKeepAlive())
diff --git a/src/zenhttp/servers/httpsys.cpp b/src/zenhttp/servers/httpsys.cpp
index d45804c50..67b1230a0 100644
--- a/src/zenhttp/servers/httpsys.cpp
+++ b/src/zenhttp/servers/httpsys.cpp
@@ -1272,7 +1272,7 @@ HttpSysServer::RegisterHttpUrls(int BasePort)
else if (InternalResult == ERROR_SHARING_VIOLATION || InternalResult == ERROR_ACCESS_DENIED)
{
// Port may be owned by another process's wildcard registration (access denied)
- // or actively in use (sharing violation) — retry on a different port
+ // or actively in use (sharing violation) - retry on a different port
ShouldRetryNextPort = true;
}
else
@@ -2638,11 +2638,11 @@ InitialRequestHandler::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfBytesT
ZEN_WARN("WebSocket 101 send failed: {} ({:#x})", GetSystemErrorAsString(SendResult), SendResult);
- // WebSocket upgrade failed — return nullptr since ServerRequest()
+ // WebSocket upgrade failed - return nullptr since ServerRequest()
// was never populated (no InvokeRequestHandler call)
return nullptr;
}
- // Service doesn't support WebSocket or missing key — fall through to normal handling
+ // Service doesn't support WebSocket or missing key - fall through to normal handling
}
}
diff --git a/src/zenhttp/servers/wsasio.cpp b/src/zenhttp/servers/wsasio.cpp
index 5ae48f5b3..078c21ea1 100644
--- a/src/zenhttp/servers/wsasio.cpp
+++ b/src/zenhttp/servers/wsasio.cpp
@@ -141,7 +141,7 @@ WsAsioConnectionT<SocketType>::ProcessReceivedData()
}
case WebSocketOpcode::kPong:
- // Unsolicited pong — ignore per RFC 6455
+ // Unsolicited pong - ignore per RFC 6455
break;
case WebSocketOpcode::kClose:
diff --git a/src/zenhttp/servers/wshttpsys.cpp b/src/zenhttp/servers/wshttpsys.cpp
index af320172d..8520e9f60 100644
--- a/src/zenhttp/servers/wshttpsys.cpp
+++ b/src/zenhttp/servers/wshttpsys.cpp
@@ -70,7 +70,7 @@ WsHttpSysConnection::Shutdown()
return;
}
- // Cancel pending I/O — completions will fire with ERROR_OPERATION_ABORTED
+ // Cancel pending I/O - completions will fire with ERROR_OPERATION_ABORTED
HttpCancelHttpRequest(m_RequestQueueHandle, m_RequestId, nullptr);
}
@@ -211,7 +211,7 @@ WsHttpSysConnection::ProcessReceivedData()
}
case WebSocketOpcode::kPong:
- // Unsolicited pong — ignore per RFC 6455
+ // Unsolicited pong - ignore per RFC 6455
break;
case WebSocketOpcode::kClose:
@@ -446,7 +446,7 @@ WsHttpSysConnection::DoClose(uint16_t Code, std::string_view Reason)
m_Handler.OnWebSocketClose(*this, Code, Reason);
- // Cancel pending read I/O — completions drain via ERROR_OPERATION_ABORTED
+ // Cancel pending read I/O - completions drain via ERROR_OPERATION_ABORTED
HttpCancelHttpRequest(m_RequestQueueHandle, m_RequestId, nullptr);
}
diff --git a/src/zenhttp/servers/wstest.cpp b/src/zenhttp/servers/wstest.cpp
index 872698ee5..a58037fec 100644
--- a/src/zenhttp/servers/wstest.cpp
+++ b/src/zenhttp/servers/wstest.cpp
@@ -60,7 +60,7 @@ TEST_CASE("websocket.framecodec")
std::vector<uint8_t> Frame = WsFrameCodec::BuildFrame(WebSocketOpcode::kText, Payload);
- // Server frames are unmasked — TryParseFrame should handle them
+ // Server frames are unmasked - TryParseFrame should handle them
WsFrameParseResult Result = WsFrameCodec::TryParseFrame(Frame.data(), Frame.size());
CHECK(Result.IsValid);
@@ -130,7 +130,7 @@ TEST_CASE("websocket.framecodec")
{
std::vector<uint8_t> Frame = WsFrameCodec::BuildFrame(WebSocketOpcode::kText, std::span<const uint8_t>{});
- // Pass only 1 byte — not enough for a frame header
+ // Pass only 1 byte - not enough for a frame header
WsFrameParseResult Result = WsFrameCodec::TryParseFrame(Frame.data(), 1);
CHECK_FALSE(Result.IsValid);
CHECK_EQ(Result.BytesConsumed, 0u);
@@ -465,7 +465,7 @@ namespace {
if (!Done.load())
{
- // Timeout — cancel the read
+ // Timeout - cancel the read
asio::error_code Ec;
Sock.cancel(Ec);
}
@@ -711,7 +711,7 @@ TEST_CASE("websocket.integration")
std::string Response(asio::buffers_begin(ResponseBuf.data()), asio::buffers_end(ResponseBuf.data()));
- // Should NOT get 101 — should fall through to normal request handling
+ // Should NOT get 101 - should fall through to normal request handling
CHECK(Response.find("101") == std::string::npos);
Sock.close();
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-15 06:02:38 +0000