diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
| commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
| tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /src/network/access/qnetworkreplyhttpimpl.cpp | |
| parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
| parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro
Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'src/network/access/qnetworkreplyhttpimpl.cpp')
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index f4c905f007..df0a32dd6c 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -365,6 +365,7 @@ qint64 QNetworkReplyHttpImpl::readData(char* data, qint64 maxlen) void QNetworkReplyHttpImpl::setReadBufferSize(qint64 size) { + Q_UNUSED(size); // FIXME, unsupported right now return; } @@ -379,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(); } @@ -876,6 +878,7 @@ void QNetworkReplyHttpImplPrivate::postRequest() delegate->isPipeliningUsed, QSharedPointer<char>(), delegate->incomingContentLength); + replyDownloadData(delegate->synchronousDownloadData); httpError(delegate->incomingErrorCode, delegate->incomingErrorDetail); } else { replyDownloadMetaData @@ -1168,7 +1171,6 @@ void QNetworkReplyHttpImplPrivate::replyDownloadProgressSlot(qint64 bytesReceive void QNetworkReplyHttpImplPrivate::httpAuthenticationRequired(const QHttpNetworkRequest &, QAuthenticator *auth) { - Q_Q(QNetworkReplyHttpImpl); managerPrivate->authenticationRequired(auth, q_func(), synchronous, url, &urlForLastAuthentication); } |