diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-10 09:21:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-10 09:21:09 (GMT) |
| commit | f07d637dfe39a3887c1c2374f0543e19d885ff90 (patch) | |
| tree | 3b1711bc5b5cf05afa8292ca1d9b10d0b81e5d94 /src/network | |
| parent | 796010e822884a895eaf1597f4ae20eb2c0ac926 (diff) | |
| parent | 5bb3af94428d85c9d08b3c4cfb31c4071604b06d (diff) | |
| download | Qt-f07d637dfe39a3887c1c2374f0543e19d885ff90.zip Qt-f07d637dfe39a3887c1c2374f0543e19d885ff90.tar.gz Qt-f07d637dfe39a3887c1c2374f0543e19d885ff90.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix dialog position adjustment regression in Symbian
SSL readbuffer 16->32 kB
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 565ab2c..141d80a 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -1291,9 +1291,9 @@ bool QSslSocketBackendPrivate::startHandshake() sslErrors.clear(); } - // if we have a max read buffer size, reset the plain socket's to 16k + // if we have a max read buffer size, reset the plain socket's to 32k if (readBufferMaxSize) - plainSocket->setReadBufferSize(16384); + plainSocket->setReadBufferSize(32768); connectionEncrypted = true; emit q->encrypted(); |