Conflicts:

src/lib/server/ClientListener.cpp
This commit is contained in:
Jerry (Xinyu Hou)
2016-08-24 16:28:29 +01:00
committed by Andrew Nelless
parent e1be67cfb6
commit 3df75f9601
5 changed files with 50 additions and 31 deletions

View File

@@ -662,6 +662,7 @@ SecureSocket::serviceAccept(ISocketMultiplexerJob* job,
// If status > 0, success
if (status > 0) {
sendEvent(m_events->forClientListener().accepted());
return newJob();
}