github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 21:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #10492 from Chocobo1/server

Browse source 
Remove closed connections immediately
This commit is contained in:
Mike Tzou 2019-04-16 12:25:40 +08:00 • committed by GitHub
commit 7db2d1b8cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/base/http/server.cpp
View file

@ -107,16 +107,23 @@ void Server::incomingConnection(const qintptr socketDescriptor)
} }
auto *c = new Connection(serverSocket, m_requestHandler, this); auto *c = new Connection(serverSocket, m_requestHandler, this);
m_connections.append(c); m_connections.insert(c);
connect(serverSocket, &QAbstractSocket::disconnected, this, [c, this]() { removeConnection(c); });
}
void Server::removeConnection(Connection *connection)
{
m_connections.remove(connection);
connection->deleteLater();
} }
void Server::dropTimedOutConnection() void Server::dropTimedOutConnection()
{ {
QMutableListIterator<Connection *> i(m_connections); QMutableSetIterator<Connection *> i(m_connections);
while (i.hasNext()) { while (i.hasNext()) {
const auto *connection = i.next(); Connection *connection = i.next();
if (connection->isClosed() || connection->hasExpired(KEEP_ALIVE_DURATION)) { if (connection->hasExpired(KEEP_ALIVE_DURATION)) {
delete connection; connection->deleteLater();
i.remove(); i.remove();
} }
} }

4
src/base/http/server.h
View file

@ -31,6 +31,7 @@
#ifndef HTTP_SERVER_H #ifndef HTTP_SERVER_H
#define HTTP_SERVER_H #define HTTP_SERVER_H
#include <QSet>
#include <QSslCertificate> #include <QSslCertificate>
#include <QSslKey> #include <QSslKey>
#include <QTcpServer> #include <QTcpServer>
@ -56,9 +57,10 @@ namespace Http
private: private:
void incomingConnection(qintptr socketDescriptor); void incomingConnection(qintptr socketDescriptor);
void removeConnection(Connection *connection);
IRequestHandler *m_requestHandler; IRequestHandler *m_requestHandler;
QList<Connection *> m_connections; // for tracking persistent connections QSet<Connection *> m_connections; // for tracking persistent connections
bool m_https; bool m_https;
QList<QSslCertificate> m_certificates; QList<QSslCertificate> m_certificates;