1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qnetworkreplyfileimpl: set attributes if file was sent

Browse Source 
Set status code and status text if file was sent with reply.

Change-Id: Ie6acadc5c1d06538449262ffd8486e8de573b931
Task-number: QTBUG-45581
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Valery Kotov 2015-04-22 18:03:00 +03:00 committed by Simon Hausmann
parent af851c290b
commit a5890fbcd8
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/access/qnetworkreplyfileimpl.cpp
View File

@ -36,7 +36,6 @@
#include "QtCore/qdatetime.h" #include "QtCore/qdatetime.h"
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QDebug>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -136,6 +135,7 @@ QNetworkReplyFileImpl::QNetworkReplyFileImpl(QObject *parent, const QNetworkRequ
QMetaObject::invokeMethod(this, "readyRead", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "readyRead", Qt::QueuedConnection);
QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
} }
void QNetworkReplyFileImpl::close() void QNetworkReplyFileImpl::close()
{ {
Q_D(QNetworkReplyFileImpl); Q_D(QNetworkReplyFileImpl);
@ -182,8 +182,11 @@ qint64 QNetworkReplyFileImpl::readData(char *data, qint64 maxlen)
d->realFile.close(); d->realFile.close();
if (ret == 0 && bytesAvailable() == 0) if (ret == 0 && bytesAvailable() == 0)
return -1; return -1;
else else {
setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 200);
setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, QLatin1String("OK"));
return ret; return ret;
}
} }

1
tests/auto/network/access/qnetworkreply/element.xml Normal file
View File

@ -0,0 +1 @@
<root attr="value" attr2="value2"><person /><fruit /></root>

30
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -426,6 +426,8 @@ private Q_SLOTS:
void qtbug28035browserDoesNotLoadQtProjectOrgCorrectly(); void qtbug28035browserDoesNotLoadQtProjectOrgCorrectly();
void qtbug45581WrongReplyStatusCode();
void synchronousRequest_data(); void synchronousRequest_data();
void synchronousRequest(); void synchronousRequest();
#ifndef QT_NO_SSL #ifndef QT_NO_SSL
@ -7256,6 +7258,34 @@ void tst_QNetworkReply::qtbug28035browserDoesNotLoadQtProjectOrgCorrectly() {
QCOMPARE(reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool(), true); QCOMPARE(reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool(), true);
} }
void tst_QNetworkReply::qtbug45581WrongReplyStatusCode()
{
const QUrl url("file:" + testDataDir + "/element.xml");
QNetworkRequest request(url);
QNetworkReplyPtr reply;
QSignalSpy finishedSpy(&manager, SIGNAL(finished(QNetworkReply*)));
QSignalSpy sslErrorsSpy(&manager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)));
RUN_REQUEST(runSimpleRequest(QNetworkAccessManager::GetOperation, request, reply, 0));
QVERIFY(reply->isFinished());
const QByteArray expectedContent =
"<root attr=\"value\" attr2=\"value2\">"
"<person /><fruit /></root>\n";
QCOMPARE(reply->readAll(), expectedContent);
QCOMPARE(finishedSpy.count(), 0);
QCOMPARE(sslErrorsSpy.count(), 0);
QCOMPARE(reply->header(QNetworkRequest::ContentLengthHeader).toLongLong(), expectedContent.size());
QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200);
QCOMPARE(reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString(), QLatin1String("OK"));
reply->deleteLater();
}
void tst_QNetworkReply::synchronousRequest_data() void tst_QNetworkReply::synchronousRequest_data()
{ {
QTest::addColumn<QUrl>("url"); QTest::addColumn<QUrl>("url");