summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Petersson <martin.petersson@nokia.com>2011-03-31 09:56:59 (GMT)
committerMartin Petersson <martin.petersson@nokia.com>2011-03-31 10:01:47 (GMT)
commit8616c85eaa69fac5b15aa9a3d416f9c8b0098c17 (patch)
treed826065d8e5824c46607905b96a28b1fa032b848 /src
parentd43455eaa9106c63885fe04c39a7b2c7249f406f (diff)
downloadQt-8616c85eaa69fac5b15aa9a3d416f9c8b0098c17.zip
Qt-8616c85eaa69fac5b15aa9a3d416f9c8b0098c17.tar.gz
Qt-8616c85eaa69fac5b15aa9a3d416f9c8b0098c17.tar.bz2
QSslSocket: fix setReadBufferSize
This fix the qnetworkreply::ioPostToHttpsUploadProgress() auto test. Before the readbuffer where always limited to 1k for ssl sockets. Reviewed-by: Markus Goetz
Diffstat (limited to 'src')
-rw-r--r--src/network/ssl/qsslsocket.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index a649758..bceb875 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -828,14 +828,8 @@ void QSslSocket::setReadBufferSize(qint64 size)
Q_D(QSslSocket);
d->readBufferMaxSize = size;
- // set the plain socket's buffer size to 1k if we have a limit
- // see also the same logic in QSslSocketPrivate::createPlainSocket
- if (d->plainSocket) {
- if (d->mode == UnencryptedMode)
- d->plainSocket->setReadBufferSize(size);
- else
- d->plainSocket->setReadBufferSize(size ? 1024 : 0);
- }
+ if (d->plainSocket)
+ d->plainSocket->setReadBufferSize(size);
}
/*!