diff options
| author | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-06-22 11:38:32 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-06-22 11:38:32 (GMT) |
| commit | 14f10211e72f2d04fa7f4e0faa430eb94c1f8f83 (patch) | |
| tree | 1e8d1e2f758c1090a15123cbcb8f615d867caa47 /src/network/ssl | |
| parent | e4cce8849bf45be9a111072e3fca7bdf67364e8a (diff) | |
| parent | 5e80b137d195625c0d57c1c27e5e8464d1ccfa33 (diff) | |
| download | Qt-14f10211e72f2d04fa7f4e0faa430eb94c1f8f83.zip Qt-14f10211e72f2d04fa7f4e0faa430eb94c1f8f83.tar.gz Qt-14f10211e72f2d04fa7f4e0faa430eb94c1f8f83.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/opengl/qgl.cpp
src/opengl/qpixmapdata_symbiangl.cpp
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'src/network/ssl')
| -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 4747f29..9a137a6 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -1338,9 +1338,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(); |