diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-29 12:58:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-29 12:58:41 +0200 |
| commit | e66d181e659a08d19ab7d144c3ba0619d537de83 (patch) | |
| tree | 7367e93797cb9a2a331f0741baed5a1cad2c96b6 /src/network/ssl/qsslsocket_mac.cpp | |
| parent | 4758555f3e44af3425f0b691dc38fb40f3c9413d (diff) | |
| parent | 75aea3ff5eec4a5c8f4184e14a90f4a5e3a577b0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I3b51bb706e401edfda09a433c67aa58e44f33e83
Diffstat (limited to 'src/network/ssl/qsslsocket_mac.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket_mac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp index 4c06404415..0548aa3909 100644 --- a/src/network/ssl/qsslsocket_mac.cpp +++ b/src/network/ssl/qsslsocket_mac.cpp @@ -505,7 +505,7 @@ void QSslSocketBackendPrivate::transmit() if (connectionEncrypted) { QVarLengthArray<char, 4096> data; - while (context) { + while (context && (!readBufferMaxSize || buffer.size() < readBufferMaxSize)) { size_t readBytes = 0; data.resize(4096); const OSStatus err = SSLRead(context, data.data(), data.size(), &readBytes); |