diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 14:06:47 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-15 15:53:16 +0000 |
| commit | f98d125b2928d0784d509c8025271fca661ea270 (patch) | |
| tree | 214aa16bf1782a8819b1d7fd801ab9c62af4cae1 /src/network/ssl/qsslsocket.cpp | |
| parent | c09ff1dbcb50d77b64e47b333fd1ee2f4c6510e7 (diff) | |
| parent | 605617b5dce6ccd8826d07aabe2db781ae3aa9b4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index ea21f1c5ad..513cc51620 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -790,7 +790,7 @@ void QSslSocket::close() qCDebug(lcSsl) << "QSslSocket::close()"; #endif Q_D(QSslSocket); - if (encryptedBytesToWrite()) + if (encryptedBytesToWrite() || !d->writeBuffer.isEmpty()) flush(); if (d->plainSocket) d->plainSocket->close(); |