iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use newConnection not incommingConnection to handle new connections

Browse Source 
BUG: 554
This commit is contained in:
craig.p.drummond
2014-10-04 08:44:44 +00:00
committed by craig.p.drummond
parent 70974b8806
commit e383546083
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
http/httpsocket.cpp
View File

@@ -266,6 +266,7 @@ HttpSocket::HttpSocket(const QString &iface, quint16 port)
connect(MPDConnection::self(), SIGNAL(cantataStreams(QList<Song>,bool)), this, SLOT(cantataStreams(QList<Song>,bool)));
connect(MPDConnection::self(), SIGNAL(cantataStreams(QStringList)), this, SLOT(cantataStreams(QStringList)));
connect(MPDConnection::self(), SIGNAL(removedIds(QSet<qint32>)), this, SLOT(removedIds(QSet<qint32>)));
connect(this, SIGNAL(newConnection()), SLOT(handleNewConnection()));
}
bool HttpSocket::openPort(const QHostAddress &a, quint16 p)
@@ -305,12 +306,14 @@ void HttpSocket::terminate()
deleteLater();
}
void HttpSocket::incomingConnection(int socket)
void HttpSocket::handleNewConnection()
{
QTcpSocket *s = new QTcpSocket(this);
connect(s, SIGNAL(readyRead()), this, SLOT(readClient()));
connect(s, SIGNAL(disconnected()), this, SLOT(discardClient()));
s->setSocketDescriptor(socket);
DBUG;
while (hasPendingConnections()) {
QTcpSocket *s = nextPendingConnection();
connect(s, SIGNAL(readyRead()), this, SLOT(readClient()));
connect(s, SIGNAL(disconnected()), this, SLOT(discardClient()));
}
}
void HttpSocket::readClient()