Fix regression that caused waitForXXX(-1) to fail.
authorThiago Macieira <thiago.macieira@nokia.com>
Mon, 16 May 2011 11:20:25 +0000 (13:20 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Mon, 16 May 2011 11:30:34 +0000 (13:30 +0200)
commitcb5b6799333794496269aa7e6515f96c2ac96d37
tree7b2eba109047c19af6e7a8d99431b7dad11ca1d6
parenta45398677309ab905b69c599177b4c2951292b04
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
src/network/socket/qabstractsocket.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
tests/auto/qtcpsocket/tst_qtcpsocket.cpp