diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
| commit | ea9003268556154fdc305aa745890fdea92ac46b (patch) | |
| tree | a3ed6fc20fe4be0d7d07f752942cd5b7e2e3c7de /src/network/socket | |
| parent | c67f7c0f0fc34887a4922a269815c460cbe3ccf8 (diff) | |
| parent | 7e74f8f398deb8ed84f6c4613de6dab2066dc9de (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/network/ssl/qsslsocket_openssl_symbols.cpp
Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qhttpsocketengine.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 2e920ad69f..0a25815752 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -568,9 +568,6 @@ void QHttpSocketEngine::slotSocketReadNotification() char dummybuffer[4096]; while (d->pendingResponseData) { int read = d->socket->read(dummybuffer, qMin(sizeof(dummybuffer), (size_t)d->pendingResponseData)); - if (read >= 0) - dummybuffer[read] = 0; - if (read == 0) return; if (read == -1) { |