Schannel: Fix incomplete downloads with read buffer restricted
When the read buffer has a max size we do our best not to exceed it. Usually there's no problem and we just read more when the next tcp frame arrives. However if there's data leftover after the last tcp frame arrived then we won't receive any more data. To counter this QSslSocket would try to invoke QSslSocketPrivate::transmit indirectly if there were any bytes available on the plain socket. The problem is that with Schannel the last few remaining bytes would not be in the plain socket, but in the 'intermediateBuffer'. So let's make QSslSocket aware of that. Fixes: QTBUG-90625 Pick-to: 5.15 6.0 6.1 Change-Id: If56e4cce558f99c9a08a1f6818e005a887712ef2 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Norbert Pfeiler <norbert.pfeiler+git@gmail.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
parent
08ace69f0e
commit
6d4da1340f
@ -1950,7 +1950,7 @@ qint64 QSslSocket::readData(char *data, qint64 maxlen)
|
||||
#endif
|
||||
} else {
|
||||
// possibly trigger another transmit() to decrypt more data from the socket
|
||||
if (d->plainSocket->bytesAvailable())
|
||||
if (d->plainSocket->bytesAvailable() || d->hasUndecryptedData())
|
||||
QMetaObject::invokeMethod(this, "_q_flushReadBuffer", Qt::QueuedConnection);
|
||||
else if (d->state != QAbstractSocket::ConnectedState)
|
||||
return maxlen ? qint64(-1) : qint64(0);
|
||||
|
@ -224,6 +224,8 @@ private:
|
||||
|
||||
protected:
|
||||
bool verifyErrorsHaveBeenIgnored();
|
||||
// Only implemented/useful in Schannel for now
|
||||
virtual bool hasUndecryptedData() { return false; };
|
||||
bool paused;
|
||||
bool flushTriggered;
|
||||
bool systemOrSslErrorDetected = false;
|
||||
|
@ -123,6 +123,8 @@ private:
|
||||
|
||||
bool rootCertOnDemandLoadingAllowed();
|
||||
|
||||
bool hasUndecryptedData() override { return intermediateBuffer.size() > 0; }
|
||||
|
||||
SecPkgContext_ConnectionInfo connectionInfo = {};
|
||||
SecPkgContext_StreamSizes streamSizes = {};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user