Fix regression that caused waitForXXX(-1) to fail.
Regression was introduced by 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba when it failed to check when msecs == -1. This manifested visibly in KDE failing to connect to any SSL site -- kioslaves are synchronous and use waitForXXX(-1) (in this particular case, waitForEncrypted, which calls waitForReadyRead). Also, take the opportunity to convert these tests in QTcpSocket to use port 80 (a defined service in the test server) instead of port 22. Reviewed-by: Martin Petersson (cherry picked from commit cb5b6799333794496269aa7e6515f96c2ac96d37) Change-Id: I256a1e138e43fd45844976fe84cd2bc938552e47 Reviewed-on: http://codereview.qt.nokia.com/359 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
This commit is contained in:
parent
ae3b5b3ab4
commit
dddfcd66f8
@ -1908,7 +1908,7 @@ bool QAbstractSocket::waitForReadyRead(int msecs)
|
||||
|
||||
if (state() != ConnectedState)
|
||||
return false;
|
||||
} while (qt_timeout_value(msecs, stopWatch.elapsed()) > 0);
|
||||
} while (msecs == -1 || qt_timeout_value(msecs, stopWatch.elapsed()) > 0);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -156,6 +156,7 @@ private slots:
|
||||
void setSslConfiguration_data();
|
||||
void setSslConfiguration();
|
||||
void waitForEncrypted();
|
||||
void waitForEncryptedMinusOne();
|
||||
void waitForConnectedEncryptedReadyRead();
|
||||
void startClientEncryption();
|
||||
void startServerEncryption();
|
||||
@ -1098,6 +1099,20 @@ void tst_QSslSocket::waitForEncrypted()
|
||||
QVERIFY(socket->waitForEncrypted(10000));
|
||||
}
|
||||
|
||||
void tst_QSslSocket::waitForEncryptedMinusOne()
|
||||
{
|
||||
if (!QSslSocket::supportsSsl())
|
||||
return;
|
||||
|
||||
QSslSocketPtr socket = newSocket();
|
||||
this->socket = socket;
|
||||
|
||||
connect(socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(ignoreErrorSlot()));
|
||||
socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
|
||||
|
||||
QVERIFY(socket->waitForEncrypted(-1));
|
||||
}
|
||||
|
||||
void tst_QSslSocket::waitForConnectedEncryptedReadyRead()
|
||||
{
|
||||
if (!QSslSocket::supportsSsl())
|
||||
|
@ -166,7 +166,9 @@ private slots:
|
||||
void readLineString();
|
||||
void readChunks();
|
||||
void waitForBytesWritten();
|
||||
void waitForBytesWrittenMinusOne();
|
||||
void waitForReadyRead();
|
||||
void waitForReadyReadMinusOne();
|
||||
void flush();
|
||||
void synchronousApi();
|
||||
void dontCloseOnTimeout();
|
||||
@ -1417,10 +1419,10 @@ void tst_QTcpSocket::readChunks()
|
||||
void tst_QTcpSocket::waitForBytesWritten()
|
||||
{
|
||||
QTcpSocket *socket = newSocket();
|
||||
socket->connectToHost(QtNetworkSettings::serverName(), 22);
|
||||
socket->connectToHost(QtNetworkSettings::serverName(), 80);
|
||||
QVERIFY(socket->waitForConnected(10000));
|
||||
|
||||
socket->write(QByteArray(10000, '@'));
|
||||
socket->write("GET / HTTP/1.0\r\n\r\n");
|
||||
qint64 toWrite = socket->bytesToWrite();
|
||||
QVERIFY(socket->waitForBytesWritten(5000));
|
||||
QVERIFY(toWrite > socket->bytesToWrite());
|
||||
@ -1428,12 +1430,38 @@ void tst_QTcpSocket::waitForBytesWritten()
|
||||
delete socket;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------
|
||||
void tst_QTcpSocket::waitForBytesWrittenMinusOne()
|
||||
{
|
||||
QTcpSocket *socket = newSocket();
|
||||
socket->connectToHost(QtNetworkSettings::serverName(), 80);
|
||||
QVERIFY(socket->waitForConnected(10000));
|
||||
|
||||
socket->write("GET / HTTP/1.0\r\n\r\n");
|
||||
qint64 toWrite = socket->bytesToWrite();
|
||||
QVERIFY(socket->waitForBytesWritten(-1));
|
||||
QVERIFY(toWrite > socket->bytesToWrite());
|
||||
|
||||
delete socket;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------
|
||||
void tst_QTcpSocket::waitForReadyRead()
|
||||
{
|
||||
QTcpSocket *socket = newSocket();
|
||||
socket->connectToHost(QtNetworkSettings::serverName(), 22);
|
||||
socket->waitForReadyRead(0);
|
||||
socket->connectToHost(QtNetworkSettings::serverName(), 80);
|
||||
socket->write("GET / HTTP/1.0\r\n\r\n");
|
||||
QVERIFY(socket->waitForReadyRead(5000));
|
||||
delete socket;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------
|
||||
void tst_QTcpSocket::waitForReadyReadMinusOne()
|
||||
{
|
||||
QTcpSocket *socket = newSocket();
|
||||
socket->connectToHost(QtNetworkSettings::serverName(), 80);
|
||||
socket->write("GET / HTTP/1.0\r\n\r\n");
|
||||
QVERIFY(socket->waitForReadyRead(-1));
|
||||
delete socket;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user