lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-20 11:47:43 +03:00
Code

Add EINTR and EAGAIN judge for accept (#1438)

Browse Source 
* Add EINTR and EAGAIN judge for accept

* Add EINTR signal tests

* Cancel win32 and win64 compile on signal unittest

Co-authored-by: yukun.yu <yukun.yu@alibaba-inc.com>
This commit is contained in:
yukun 2022-12-21 08:34:51 +08:00 committed by GitHub
parent 93e53c91f7
commit 227d2c2050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httplib.h
View File

@ -5507,6 +5507,8 @@ inline bool Server::listen_internal() {
// Try to accept new connections after a short sleep. // Try to accept new connections after a short sleep.
std::this_thread::sleep_for(std::chrono::milliseconds(1)); std::this_thread::sleep_for(std::chrono::milliseconds(1));
continue; continue;
} else if (errno == EINTR || errno == EAGAIN) {
continue;
} }
if (svr_sock_ != INVALID_SOCKET) { if (svr_sock_ != INVALID_SOCKET) {
detail::close_socket(svr_sock_); detail::close_socket(svr_sock_);

39
test/test.cc
View File

@ -1,4 +1,5 @@
#include <httplib.h> #include <httplib.h>
#include <signal.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
@ -943,6 +944,44 @@ TEST(UrlWithSpace, Redirect_Online) {
#endif #endif
#if !defined(_WIN32) && !defined(_WIN64)
TEST(ReceiveSignals, Signal) {
auto setupSignalHandlers = []() {
struct sigaction act;
sigemptyset(&act.sa_mask);
act.sa_flags = SA_SIGINFO;
act.sa_sigaction = [](int sig, siginfo_t *, void *) {
switch (sig) {
case SIGINT:
default: break;
}
};
::sigaction(SIGINT, &act, nullptr);
};
Server svr;
int port = 0;
auto thread = std::thread([&]() {
setupSignalHandlers();
port = svr.bind_to_any_port("localhost");
svr.listen_after_bind();
});
while (!svr.is_running()) {
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
ASSERT_TRUE(svr.is_running());
pthread_kill(thread.native_handle(), SIGINT);
std::this_thread::sleep_for(std::chrono::milliseconds(100));
ASSERT_TRUE(svr.is_running());
svr.stop();
thread.join();
ASSERT_FALSE(svr.is_running());
}
#endif
TEST(RedirectToDifferentPort, Redirect) { TEST(RedirectToDifferentPort, Redirect) {
Server svr1; Server svr1;
svr1.Get("/1", [&](const Request & /*req*/, Response &res) { svr1.Get("/1", [&](const Request & /*req*/, Response &res) {