Add missing overloads for custom verbs

When support for custom verbs was added the overloads for the various
body data options were not.

Task-number: QTBUG-54868
Change-Id: I1a495023d957fc71d1e3b77997a2b4b8531c0a0e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Richard J. Moore 2016-07-21 21:09:41 +01:00 committed by Oswald Buddenhagen
parent bbca3cb78d
commit 4bbcc054e0
2 changed files with 43 additions and 0 deletions

View File

@ -1104,6 +1104,47 @@ QNetworkReply *QNetworkAccessManager::sendCustomRequest(const QNetworkRequest &r
return d_func()->postProcess(createRequest(QNetworkAccessManager::CustomOperation, newRequest, data));
}
/*!
\since 5.8
\overload
Sends the contents of the \a data byte array to the destination
specified by \a request.
*/
QNetworkReply *QNetworkAccessManager::sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, const QByteArray &data)
{
QBuffer *buffer = new QBuffer;
buffer->setData(data);
buffer->open(QIODevice::ReadOnly);
QNetworkReply *reply = sendCustomRequest(request, verb, buffer);
buffer->setParent(reply);
return reply;
}
/*!
\since 5.8
\overload
Sends a custom request to the server identified by the URL of \a request.
Sends the contents of the \a multiPart message to the destination
specified by \a request.
This can be used for sending MIME multipart messages for custom verbs.
\sa QHttpMultiPart, QHttpPart, put()
*/
QNetworkReply *QNetworkAccessManager::sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QHttpMultiPart *multiPart)
{
QNetworkRequest newRequest = d_func()->prepareMultipart(request, multiPart);
QIODevice *device = multiPart->d_func()->device;
QNetworkReply *reply = sendCustomRequest(newRequest, verb, device);
return reply;
}
/*!
Returns a new QNetworkReply object to handle the operation \a op
and request \a req. The device \a outgoingData is always 0 for Get and

View File

@ -129,6 +129,8 @@ public:
QNetworkReply *put(const QNetworkRequest &request, QHttpMultiPart *multiPart);
QNetworkReply *deleteResource(const QNetworkRequest &request);
QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = Q_NULLPTR);
QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, const QByteArray &data);
QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QHttpMultiPart *multiPart);
#ifndef QT_NO_BEARERMANAGEMENT
void setConfiguration(const QNetworkConfiguration &config);