diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2010-02-15 13:19:47 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2010-02-16 10:59:11 (GMT) |
| commit | 934b824fbb7a313789de32356664db81dc8576da (patch) | |
| tree | cd8879613788a3f4876bf0150d62203530f209f5 /src/network/access/qnetworkaccessbackend.cpp | |
| parent | e5534b9ba700fa2b25fa63e181e2c5f82469875d (diff) | |
| download | Qt-934b824fbb7a313789de32356664db81dc8576da.zip Qt-934b824fbb7a313789de32356664db81dc8576da.tar.gz Qt-934b824fbb7a313789de32356664db81dc8576da.tar.bz2 | |
QNetworkAccessManager: add method to send custom requests
This method was added to support e.g. HTTP OPTIONS (needed by Webkit);
rather than adding one method for each of those exotic verbs, there is
now a generic version for all.
Reviewed-by: Markus Goetz
Reviewed-by: Andreas Kling
Task-number: QTBUG-8206
Diffstat (limited to 'src/network/access/qnetworkaccessbackend.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccessbackend.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index 8ac64d2..34d576a 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -120,8 +120,11 @@ QNonContiguousByteDevice* QNetworkAccessBackend::createUploadByteDevice() if (reply->outgoingDataBuffer) device = QNonContiguousByteDeviceFactory::create(reply->outgoingDataBuffer); - else + else if (reply->outgoingData) { device = QNonContiguousByteDeviceFactory::create(reply->outgoingData); + } else { + return 0; + } bool bufferDisallowed = reply->request.attribute(QNetworkRequest::DoNotBufferUploadDataAttribute, |