Skip to content

Commit

Permalink
Code format
Browse files Browse the repository at this point in the history
  • Loading branch information
@yhirose
yhirose committed Apr 14, 2021
1 parent 6cc2edc commit 63643e6
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 89 deletions.
24 changes: 15 additions & 9 deletions httplib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2065,8 +2065,9 @@ inline int shutdown_socket(socket_t sock) {
}

template <typename BindOrConnect>
socket_t create_socket(const char *host, int port, int address_family, int socket_flags,
bool tcp_nodelay, SocketOptions socket_options,
socket_t create_socket(const char *host, int port, int address_family,
int socket_flags, bool tcp_nodelay,
SocketOptions socket_options,
BindOrConnect bind_or_connect) {
// Get address info
struct addrinfo hints;
Expand Down Expand Up @@ -2214,8 +2215,7 @@ inline std::string if2ip(const std::string &ifn) {
#endif

inline socket_t create_client_socket(const char *host, int port,
int address_family,
bool tcp_nodelay,
int address_family, bool tcp_nodelay,
SocketOptions socket_options,
time_t timeout_sec, time_t timeout_usec,
const std::string &intf, Error &error) {
Expand Down Expand Up @@ -4771,7 +4771,8 @@ inline socket_t
Server::create_server_socket(const char *host, int port, int socket_flags,
SocketOptions socket_options) const {
return detail::create_socket(
host, port, address_family_, socket_flags, tcp_nodelay_, std::move(socket_options),
host, port, address_family_, socket_flags, tcp_nodelay_,
std::move(socket_options),
[](socket_t sock, struct addrinfo &ai) -> bool {
if (::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
return false;
Expand Down Expand Up @@ -5260,8 +5261,9 @@ inline void ClientImpl::copy_settings(const ClientImpl &rhs) {
inline socket_t ClientImpl::create_client_socket(Error &error) const {
if (!proxy_host_.empty() && proxy_port_ != -1) {
return detail::create_client_socket(
proxy_host_.c_str(), proxy_port_, address_family_, tcp_nodelay_, socket_options_,
connection_timeout_sec_, connection_timeout_usec_, interface_, error);
proxy_host_.c_str(), proxy_port_, address_family_, tcp_nodelay_,
socket_options_, connection_timeout_sec_, connection_timeout_usec_,
interface_, error);
}
return detail::create_client_socket(
host_.c_str(), port_, address_family_, tcp_nodelay_, socket_options_,
Expand Down Expand Up @@ -6392,7 +6394,9 @@ inline void ClientImpl::set_default_headers(Headers headers) {
default_headers_ = std::move(headers);
}

inline void ClientImpl::set_address_family(int family) { address_family_ = family; }
inline void ClientImpl::set_address_family(int family) {
address_family_ = family;
}

inline void ClientImpl::set_tcp_nodelay(bool on) { tcp_nodelay_ = on; }

Expand Down Expand Up @@ -7456,7 +7460,9 @@ inline void Client::set_default_headers(Headers headers) {
cli_->set_default_headers(std::move(headers));
}

inline void Client::set_address_family(int family) { cli_->set_address_family(family); }
inline void Client::set_address_family(int family) {
cli_->set_address_family(family);
}

inline void Client::set_tcp_nodelay(bool on) { cli_->set_tcp_nodelay(on); }

Expand Down
168 changes: 88 additions & 80 deletions test/test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,16 +417,16 @@ TEST(ChunkedEncodingTest, WithResponseHandlerAndContentReceiver) {
cli.set_connection_timeout(2);

std::string body;
auto res =
cli.Get("/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137",
[&](const Response &response) {
EXPECT_EQ(200, response.status);
return true;
},
[&](const char *data, size_t data_length) {
body.append(data, data_length);
return true;
});
auto res = cli.Get(
"/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137",
[&](const Response &response) {
EXPECT_EQ(200, response.status);
return true;
},
[&](const char *data, size_t data_length) {
body.append(data, data_length);
return true;
});
ASSERT_TRUE(res);

std::string out;
Expand Down Expand Up @@ -916,11 +916,10 @@ TEST(RedirectFromPageWithContent, Redirect) {
cli.set_follow_location(true);

std::string body;
auto res = cli.Get("/1",
[&](const char *data, size_t data_length) {
body.append(data, data_length);
return true;
});
auto res = cli.Get("/1", [&](const char *data, size_t data_length) {
body.append(data, data_length);
return true;
});

ASSERT_TRUE(res);
EXPECT_EQ(200, res->status);
Expand All @@ -931,11 +930,10 @@ TEST(RedirectFromPageWithContent, Redirect) {
Client cli("localhost", PORT);

std::string body;
auto res = cli.Get("/1",
[&](const char *data, size_t data_length) {
body.append(data, data_length);
return true;
});
auto res = cli.Get("/1", [&](const char *data, size_t data_length) {
body.append(data, data_length);
return true;
});

ASSERT_TRUE(res);
EXPECT_EQ(302, res->status);
Expand Down Expand Up @@ -2520,13 +2518,13 @@ TEST_F(ServerTest, SlowPost) {
char buffer[64 * 1024];
memset(buffer, 0x42, sizeof(buffer));

auto res =
cli_.Post("/slowpost", 64 * 1024 * 1024,
[&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
sink.write(buffer, sizeof(buffer));
return true;
},
"text/plain");
auto res = cli_.Post(
"/slowpost", 64 * 1024 * 1024,
[&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
sink.write(buffer, sizeof(buffer));
return true;
},
"text/plain");

ASSERT_TRUE(res);
EXPECT_EQ(200, res->status);
Expand All @@ -2537,13 +2535,13 @@ TEST_F(ServerTest, SlowPostFail) {
memset(buffer, 0x42, sizeof(buffer));

cli_.set_write_timeout(std::chrono::seconds(0));
auto res =
cli_.Post("/slowpost", 64 * 1024 * 1024,
[&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
sink.write(buffer, sizeof(buffer));
return true;
},
"text/plain");
auto res = cli_.Post(
"/slowpost", 64 * 1024 * 1024,
[&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
sink.write(buffer, sizeof(buffer));
return true;
},
"text/plain");

ASSERT_TRUE(!res);
EXPECT_EQ(Error::Write, res.error());
Expand All @@ -2557,38 +2555,42 @@ TEST_F(ServerTest, Put) {
}

TEST_F(ServerTest, PutWithContentProvider) {
auto res = cli_.Put("/put", 3,
[](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
EXPECT_TRUE(sink.is_writable());
sink.os << "PUT";
return true;
},
"text/plain");
auto res = cli_.Put(
"/put", 3,
[](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
EXPECT_TRUE(sink.is_writable());
sink.os << "PUT";
return true;
},
"text/plain");

ASSERT_TRUE(res);
EXPECT_EQ(200, res->status);
EXPECT_EQ("PUT", res->body);
}

TEST_F(ServerTest, PostWithContentProviderAbort) {
auto res = cli_.Post("/post", 42,
[](size_t /*offset*/, size_t /*length*/,
DataSink & /*sink*/) { return false; },
"text/plain");
auto res = cli_.Post(
"/post", 42,
[](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) {
return false;
},
"text/plain");

ASSERT_TRUE(!res);
EXPECT_EQ(Error::Canceled, res.error());
}

TEST_F(ServerTest, PutWithContentProviderWithoutLength) {
auto res = cli_.Put("/put",
[](size_t /*offset*/, DataSink &sink) {
EXPECT_TRUE(sink.is_writable());
sink.os << "PUT";
sink.done();
return true;
},
"text/plain");
auto res = cli_.Put(
"/put",
[](size_t /*offset*/, DataSink &sink) {
EXPECT_TRUE(sink.is_writable());
sink.os << "PUT";
sink.done();
return true;
},
"text/plain");

ASSERT_TRUE(res);
EXPECT_EQ(200, res->status);
Expand All @@ -2607,13 +2609,14 @@ TEST_F(ServerTest, PostWithContentProviderWithoutLengthAbort) {
#ifdef CPPHTTPLIB_ZLIB_SUPPORT
TEST_F(ServerTest, PutWithContentProviderWithGzip) {
cli_.set_compress(true);
auto res = cli_.Put("/put", 3,
[](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
EXPECT_TRUE(sink.is_writable());
sink.os << "PUT";
return true;
},
"text/plain");
auto res = cli_.Put(
"/put", 3,
[](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
EXPECT_TRUE(sink.is_writable());
sink.os << "PUT";
return true;
},
"text/plain");

ASSERT_TRUE(res);
EXPECT_EQ(200, res->status);
Expand All @@ -2622,25 +2625,28 @@ TEST_F(ServerTest, PutWithContentProviderWithGzip) {

TEST_F(ServerTest, PostWithContentProviderWithGzipAbort) {
cli_.set_compress(true);
auto res = cli_.Post("/post", 42,
[](size_t /*offset*/, size_t /*length*/,
DataSink & /*sink*/) { return false; },
"text/plain");
auto res = cli_.Post(
"/post", 42,
[](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) {
return false;
},
"text/plain");

ASSERT_TRUE(!res);
EXPECT_EQ(Error::Canceled, res.error());
}

TEST_F(ServerTest, PutWithContentProviderWithoutLengthWithGzip) {
cli_.set_compress(true);
auto res = cli_.Put("/put",
[](size_t /*offset*/, DataSink &sink) {
EXPECT_TRUE(sink.is_writable());
sink.os << "PUT";
sink.done();
return true;
},
"text/plain");
auto res = cli_.Put(
"/put",
[](size_t /*offset*/, DataSink &sink) {
EXPECT_TRUE(sink.is_writable());
sink.os << "PUT";
sink.done();
return true;
},
"text/plain");

ASSERT_TRUE(res);
EXPECT_EQ(200, res->status);
Expand Down Expand Up @@ -2960,8 +2966,9 @@ TEST_F(ServerTest, KeepAlive) {
EXPECT_EQ("empty", res->body);
EXPECT_EQ("close", res->get_header_value("Connection"));

res = cli_.Post("/empty", 0, [&](size_t, size_t, DataSink &) { return true; },
"text/plain");
res = cli_.Post(
"/empty", 0, [&](size_t, size_t, DataSink &) { return true; },
"text/plain");
ASSERT_TRUE(res);
EXPECT_EQ(200, res->status);
EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
Expand Down Expand Up @@ -3556,7 +3563,7 @@ TEST(ErrorHandlerWithContentProviderTest, ErrorHandler) {
TEST(GetWithParametersTest, GetWithParameters) {
Server svr;

svr.Get("/", [&](const Request & req, Response &res) {
svr.Get("/", [&](const Request &req, Response &res) {
auto text = req.get_param_value("hello");
res.set_content(text, "text/plain");
});
Expand Down Expand Up @@ -3585,7 +3592,7 @@ TEST(GetWithParametersTest, GetWithParameters) {
TEST(GetWithParametersTest, GetWithParameters2) {
Server svr;

svr.Get("/", [&](const Request & req, Response &res) {
svr.Get("/", [&](const Request &req, Response &res) {
auto text = req.get_param_value("hello");
res.set_content(text, "text/plain");
});
Expand All @@ -3602,10 +3609,11 @@ TEST(GetWithParametersTest, GetWithParameters2) {
params.emplace("hello", "world");

std::string body;
auto res = cli.Get("/", params, Headers{}, [&](const char *data, size_t data_length) {
body.append(data, data_length);
return true;
});
auto res = cli.Get("/", params, Headers{},
[&](const char *data, size_t data_length) {
body.append(data, data_length);
return true;
});

ASSERT_TRUE(res);
EXPECT_EQ(200, res->status);
Expand Down

0 comments on commit 63643e6

Please sign in to comment.