diff options
Diffstat (limited to 'modules/socketengines')
| -rw-r--r-- | modules/socketengines/m_socketengine_epoll.cpp | 8 | ||||
| -rw-r--r-- | modules/socketengines/m_socketengine_select.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/modules/socketengines/m_socketengine_epoll.cpp b/modules/socketengines/m_socketengine_epoll.cpp index 5f8569a75..05978caf0 100644 --- a/modules/socketengines/m_socketengine_epoll.cpp +++ b/modules/socketengines/m_socketengine_epoll.cpp @@ -121,6 +121,8 @@ class SocketEngineEPoll : public SocketEngineBase epoll_event *ev = &events[i]; Socket *s = Sockets[ev->data.fd]; + if (s->HasFlag(SF_DEAD)) + continue; if (ev->events & (EPOLLHUP | EPOLLERR)) { s->ProcessError(); @@ -135,10 +137,10 @@ class SocketEngineEPoll : public SocketEngineBase s->SetFlag(SF_DEAD); } - for (std::map<int, Socket *>::iterator it = Sockets.begin(), it_end = Sockets.end(); it != it_end; ) + for (int i = 0; i < total; ++i) { - Socket *s = it->second; - ++it; + epoll_event *ev = &events[i]; + Socket *s = Sockets[ev->data.fd]; if (s->HasFlag(SF_DEAD)) delete s; diff --git a/modules/socketengines/m_socketengine_select.cpp b/modules/socketengines/m_socketengine_select.cpp index e713915a3..ae82345f6 100644 --- a/modules/socketengines/m_socketengine_select.cpp +++ b/modules/socketengines/m_socketengine_select.cpp @@ -73,6 +73,8 @@ class SocketEngineSelect : public SocketEngineBase { Socket *s = it->second; + if (s->HasFlag(SF_DEAD)) + continue; if (FD_ISSET(s->GetSock(), &efdset)) { s->ProcessError(); |