diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2011-07-05 13:07:30 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-05 17:03:32 +0200 |
| commit | 808acc07f25f167b0f90ce9f2cdfe12c4bb09cd0 (patch) | |
| tree | b8bdec63f69533fbf1df38668a3e90cf2f89f20e /src | |
| parent | f45ad0eeb3e298df731bc4d8dffe188b21500ea4 (diff) | |
QNAM HTTP: Fix canReadLine() for zerocopy
Change-Id: I16cf25c72b3fa16649c3e4e0f4d4b08ad7ce360d
Reviewed-on: http://codereview.qt.nokia.com/1161
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 1b36fd5139..df0a32dd6c 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -380,7 +380,8 @@ bool QNetworkReplyHttpImpl::canReadLine () const if (d->cacheLoadDevice) return d->cacheLoadDevice->canReadLine() || d->downloadMultiBuffer.canReadLine(); - // FIXME zerocopy buffer? + if (d->downloadZerocopyBuffer) + return memchr(d->downloadZerocopyBuffer + d->downloadBufferReadPosition, '\n', d->downloadBufferCurrentSize - d->downloadBufferReadPosition); return d->downloadMultiBuffer.canReadLine(); } |