diff options
author | Markus Goetz <Markus.Goetz@nokia.com> | 2009-10-22 09:31:27 (GMT) |
---|---|---|
committer | Markus Goetz <Markus.Goetz@nokia.com> | 2009-10-22 15:12:58 (GMT) |
commit | 760f221e7f1550ecc8198fb0c01c65ee13ded7f4 (patch) | |
tree | 667dff08f0213f5a1285eef34070fa3a76a40224 /src/network/ssl/qsslsocket.cpp | |
parent | 0e4d5715992f9d7d7e1c598527907797e0b98427 (diff) | |
download | Qt-760f221e7f1550ecc8198fb0c01c65ee13ded7f4.zip Qt-760f221e7f1550ecc8198fb0c01c65ee13ded7f4.tar.gz Qt-760f221e7f1550ecc8198fb0c01c65ee13ded7f4.tar.bz2 |
QSslSocket: Trigger a SSL transmission when reading from the socket.
In certain cases a SSL transfer stalled when a readBufferSize was set.
This change triggers a SSL transmission when there is data on the
socket waiting to be decrypted.
Task-number: QTBUG-3860
Reviewed-by: Thiago
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
-rw-r--r-- | src/network/ssl/qsslsocket.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index ad766c1..2c88130 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1740,6 +1740,11 @@ qint64 QSslSocket::readData(char *data, qint64 maxlen) #ifdef QSSLSOCKET_DEBUG qDebug() << "QSslSocket::readData(" << (void *)data << ',' << maxlen << ") ==" << readBytes; #endif + + // possibly trigger another transmit() to decrypt more data from the socket + if (d->readBuffer.isEmpty() && d->plainSocket->bytesAvailable()) + QMetaObject::invokeMethod(this, "_q_flushReadBuffer", Qt::QueuedConnection); + return readBytes; } @@ -2134,6 +2139,16 @@ void QSslSocketPrivate::_q_flushWriteBuffer() q->flush(); } +/*! + \internal +*/ +void QSslSocketPrivate::_q_flushReadBuffer() +{ + // trigger a read from the plainSocket into SSL + if (mode != QSslSocket::UnencryptedMode) + transmit(); +} + QT_END_NAMESPACE // For private slots |