diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-29 07:42:39 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-29 07:42:39 +0000 |
| commit | 75aea3ff5eec4a5c8f4184e14a90f4a5e3a577b0 (patch) | |
| tree | fcf23325ec038627de8861c9e8f9a4aa2223feef /src/network/ssl/qsslsocket_mac.cpp | |
| parent | 433e5ccf507fc153db589df80655618f241af0c3 (diff) | |
| parent | cdb56c42fc1145ad25560720fb95df2bfa760a20 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
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); |