lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-21 22:25:55 +03:00
Code

Unit test for #52

Browse Source
This commit is contained in:
yhirose 2018-04-17 00:05:05 -04:00
parent 3c711089e5
commit 9dc4e23082
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
httplib.h
View File

@ -205,6 +205,8 @@ public:
bool is_running() const; bool is_running() const;
void stop(); void stop();
bool is_handling_requests() const;
protected: protected:
bool process_request(Stream& strm, bool last_connection); bool process_request(Stream& strm, bool last_connection);
@ -1482,6 +1484,11 @@ inline void Server::stop()
svr_sock_ = -1; svr_sock_ = -1;
} }
inline bool Server::is_handling_requests() const
{
return running_threads_ > 0;
}
inline bool Server::parse_request_line(const char* s, Request& req) inline bool Server::parse_request_line(const char* s, Request& req)
{ {
static std::regex re("(GET|HEAD|POST) ([^?]+)(?:\\?(.+?))? (HTTP/1\\.[01])\r\n"); static std::regex re("(GET|HEAD|POST) ([^?]+)(?:\\?(.+?))? (HTTP/1\\.[01])\r\n");

13
test/test.cc
View File

@ -262,6 +262,10 @@ protected:
svr_.get("/hi", [&](const Request& /*req*/, Response& res) { svr_.get("/hi", [&](const Request& /*req*/, Response& res) {
res.set_content("Hello World!", "text/plain"); res.set_content("Hello World!", "text/plain");
}) })
.get("/slow", [&](const Request& /*req*/, Response& res) {
msleep(3000);
res.set_content("slow", "text/plain");
})
.get("/remote_addr", [&](const Request& req, Response& res) { .get("/remote_addr", [&](const Request& req, Response& res) {
auto remote_addr = req.headers.find("REMOTE_ADDR")->second; auto remote_addr = req.headers.find("REMOTE_ADDR")->second;
res.set_content(remote_addr.c_str(), "text/plain"); res.set_content(remote_addr.c_str(), "text/plain");
@ -358,6 +362,7 @@ protected:
virtual void TearDown() { virtual void TearDown() {
svr_.stop(); svr_.stop();
t_.join(); t_.join();
EXPECT_EQ(false, svr_.is_handling_requests());
} }
map<string, string> persons_; map<string, string> persons_;
@ -664,6 +669,14 @@ TEST_F(ServerTest, GetMethodRemoteAddr)
EXPECT_TRUE(res->body == "::1" || res->body == "127.0.0.1"); EXPECT_TRUE(res->body == "::1" || res->body == "127.0.0.1");
} }
TEST_F(ServerTest, SlowRequest)
{
std::thread([=]() { auto res = cli_.get("/slow"); }).detach();
std::thread([=]() { auto res = cli_.get("/slow"); }).detach();
std::thread([=]() { auto res = cli_.get("/slow"); }).detach();
msleep(1000);
}
#ifdef CPPHTTPLIB_ZLIB_SUPPORT #ifdef CPPHTTPLIB_ZLIB_SUPPORT
TEST_F(ServerTest, Gzip) TEST_F(ServerTest, Gzip)
{ {