yuzu/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #591

Browse source
This commit is contained in:
yhirose 2020-07-30 18:26:18 -04:00
parent 110393eadb
commit 3e906a9b8c
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
httplib.h
View file

@ -4518,7 +4518,7 @@ inline bool ClientImpl::send(const Request &req, Response &res) {
return handle_request(strm, req, res, close_connection);
});
if (close_connection) { stop(); }
if (close_connection || !ret) { stop(); }
return ret;
}

37
test/test.cc
View file

@ -2720,6 +2720,43 @@ TEST(ExceptionTest, ThrowExceptionInHandler) {
ASSERT_FALSE(svr.is_running());
}
TEST(KeepAliveTest, ReadTimeout) {
Server svr;
svr.Get("/a", [&](const Request & /*req*/, Response &res) {
std::this_thread::sleep_for(std::chrono::seconds(2));
res.set_content("a", "text/plain");
});
svr.Get("/b", [&](const Request & /*req*/, Response &res) {
res.set_content("b", "text/plain");
});
auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
while (!svr.is_running()) {
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
// Give GET time to get a few messages.
std::this_thread::sleep_for(std::chrono::seconds(1));
Client cli("localhost", PORT);
cli.set_keep_alive(true);
cli.set_read_timeout(1);
auto resa = cli.Get("/a");
ASSERT_TRUE(resa == nullptr);
auto resb = cli.Get("/b");
ASSERT_TRUE(resb != nullptr);
EXPECT_EQ(200, resb->status);
EXPECT_EQ("b", resb->body);
svr.stop();
listen_thread.join();
ASSERT_FALSE(svr.is_running());
}
class ServerTestWithAI_PASSIVE : public ::testing::Test {
protected:
ServerTestWithAI_PASSIVE()