Skip to content

Commit 1e8c421

Browse files
committed
formatting
1 parent 72d6651 commit 1e8c421

File tree

2 files changed

+26
-20
lines changed

2 files changed

+26
-20
lines changed

ixwebsocket/IXHttp.cpp

+14-11
Original file line numberDiff line numberDiff line change
@@ -129,24 +129,27 @@ namespace ix
129129
{
130130
return std::make_tuple(false, "Error parsing HTTP headers", httpRequest);
131131
}
132-
132+
133133
std::string body = "";
134-
if (headers.find("Content-Length") != headers.end()){
135-
134+
if (headers.find("Content-Length") != headers.end())
135+
{
136136
int contentLength = 0;
137-
try {
137+
try
138+
{
138139
contentLength = std::stoi(headers["Content-Length"]);
139140
}
140-
catch (std::exception){
141-
return std::make_tuple(false, "Error parsing HTTP Header 'Content-Length'", httpRequest);
141+
catch (std::exception)
142+
{
143+
return std::make_tuple(
144+
false, "Error parsing HTTP Header 'Content-Length'", httpRequest);
142145
}
143-
146+
144147
char c;
145148
body.reserve(contentLength);
146-
147-
for (int i = 0; i < contentLength; i++){
148-
if (socket->readByte(&c, isCancellationRequested))
149-
body += c;
149+
150+
for (int i = 0; i < contentLength; i++)
151+
{
152+
if (socket->readByte(&c, isCancellationRequested)) body += c;
150153
}
151154
}
152155

test/IXHttpServerTest.cpp

+12-9
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,17 @@ TEST_CASE("http server", "[httpd]")
6969
int port = getFreePort();
7070
ix::HttpServer server(port, "127.0.0.1");
7171

72-
server.setOnConnectionCallback([](HttpRequestPtr request, std::shared_ptr<ConnectionState>) -> HttpResponsePtr {
73-
if (request->method == "POST"){
74-
return std::make_shared<HttpResponse>(200, "OK", HttpErrorCode::Ok, WebSocketHttpHeaders(), request->body);
75-
}
76-
77-
return std::make_shared<HttpResponse>(400, "BAD REQUEST");
78-
});
79-
72+
server.setOnConnectionCallback(
73+
[](HttpRequestPtr request, std::shared_ptr<ConnectionState>) -> HttpResponsePtr {
74+
if (request->method == "POST")
75+
{
76+
return std::make_shared<HttpResponse>(
77+
200, "OK", HttpErrorCode::Ok, WebSocketHttpHeaders(), request->body);
78+
}
79+
80+
return std::make_shared<HttpResponse>(400, "BAD REQUEST");
81+
});
82+
8083
auto res = server.listen();
8184
REQUIRE(res.first);
8285
server.start();
@@ -97,7 +100,7 @@ TEST_CASE("http server", "[httpd]")
97100
args->body = "Hello World!";
98101

99102
auto response = httpClient.post(url, args->body, args);
100-
103+
101104
std::cerr << "Status: " << response->statusCode << std::endl;
102105
std::cerr << "Error message: " << response->errorMsg << std::endl;
103106
std::cerr << "Payload: " << response->payload << std::endl;

0 commit comments

Comments
 (0)