From 808acc07f25f167b0f90ce9f2cdfe12c4bb09cd0 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 5 Jul 2011 13:07:30 +0200
Subject: 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>
---
 src/network/access/qnetworkreplyhttpimpl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

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();
 }
-- 
cgit v1.2.3