Add a means to send a PUT request with an empty body
We have implemented the same functionality recently for POST, in this patch implement it for PUT. Task-number: QTBUG-108309 Change-Id: I34c41538054fec836d0d1d1dbb44fabab9bc0e9a Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
parent
e566a8a968
commit
282839ad41
@ -957,6 +957,23 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, const
|
|||||||
return reply;
|
return reply;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
\overload
|
||||||
|
|
||||||
|
\since 6.8
|
||||||
|
|
||||||
|
Sends the PUT request specified by \a request without a body and returns
|
||||||
|
a new QNetworkReply object.
|
||||||
|
*/
|
||||||
|
|
||||||
|
QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, std::nullptr_t nptr)
|
||||||
|
{
|
||||||
|
Q_UNUSED(nptr);
|
||||||
|
QIODevice *dev = nullptr;
|
||||||
|
|
||||||
|
return d_func()->postProcess(createRequest(QNetworkAccessManager::PutOperation, request, dev));
|
||||||
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\since 4.6
|
\since 4.6
|
||||||
|
|
||||||
|
@ -87,6 +87,7 @@ public:
|
|||||||
QNetworkReply *post(const QNetworkRequest &request, std::nullptr_t nptr);
|
QNetworkReply *post(const QNetworkRequest &request, std::nullptr_t nptr);
|
||||||
QNetworkReply *put(const QNetworkRequest &request, QIODevice *data);
|
QNetworkReply *put(const QNetworkRequest &request, QIODevice *data);
|
||||||
QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data);
|
QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data);
|
||||||
|
QNetworkReply *put(const QNetworkRequest &request, std::nullptr_t nptr);
|
||||||
QNetworkReply *deleteResource(const QNetworkRequest &request);
|
QNetworkReply *deleteResource(const QNetworkRequest &request);
|
||||||
QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = nullptr);
|
QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = nullptr);
|
||||||
QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, const QByteArray &data);
|
QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, const QByteArray &data);
|
||||||
|
@ -263,6 +263,8 @@ private Q_SLOTS:
|
|||||||
void putToHttpSynchronous();
|
void putToHttpSynchronous();
|
||||||
void putToHttpMultipart_data();
|
void putToHttpMultipart_data();
|
||||||
void putToHttpMultipart();
|
void putToHttpMultipart();
|
||||||
|
void putWithoutBody();
|
||||||
|
void putWithoutBody_data();
|
||||||
void postToHttp_data();
|
void postToHttp_data();
|
||||||
void postToHttp();
|
void postToHttp();
|
||||||
void postToHttpSynchronous_data();
|
void postToHttpSynchronous_data();
|
||||||
@ -2699,6 +2701,48 @@ void tst_QNetworkReply::putToHttpSynchronous()
|
|||||||
QCOMPARE(uploadedData, data);
|
QCOMPARE(uploadedData, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void tst_QNetworkReply::putWithoutBody_data()
|
||||||
|
{
|
||||||
|
QTest::addColumn<bool>("client_data");
|
||||||
|
|
||||||
|
QTest::newRow("client_has_data") << true;
|
||||||
|
QTest::newRow("client_does_not_have_data") << false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void tst_QNetworkReply::putWithoutBody()
|
||||||
|
{
|
||||||
|
QFETCH(bool, client_data);
|
||||||
|
|
||||||
|
QBuffer buff;
|
||||||
|
|
||||||
|
if (client_data) {
|
||||||
|
buff.setData("Dummy data from client to server");
|
||||||
|
buff.open(QIODevice::ReadOnly);
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray dataFromServerToClient = QByteArray("Some ridiculous dummy data");
|
||||||
|
QByteArray httpResponse = QByteArray("HTTP/1.0 200 OK\r\nContent-Length: ");
|
||||||
|
httpResponse += QByteArray::number(dataFromServerToClient.size());
|
||||||
|
httpResponse += "\r\n\r\n";
|
||||||
|
httpResponse += dataFromServerToClient;
|
||||||
|
|
||||||
|
MiniHttpServer server(httpResponse);
|
||||||
|
server.doClose = true;
|
||||||
|
|
||||||
|
QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort())));
|
||||||
|
request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("text/plain"));
|
||||||
|
|
||||||
|
QNetworkReplyPtr reply;
|
||||||
|
if (client_data)
|
||||||
|
reply.reset(manager.put(request, &buff));
|
||||||
|
else
|
||||||
|
reply.reset(manager.put(request, nullptr));
|
||||||
|
|
||||||
|
QVERIFY2(waitForFinish(reply) == Success, msgWaitForFinished(reply));
|
||||||
|
QCOMPARE(server.foundContentLength, client_data);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void tst_QNetworkReply::postToHttp_data()
|
void tst_QNetworkReply::postToHttp_data()
|
||||||
{
|
{
|
||||||
putToFile_data();
|
putToFile_data();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user