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

wasm: set status codes from network operation

Browse Source 
Pick-to: 5.15
Fixes: QTBUG-83991
Change-Id: Ie1e88189bee8b6a9dc6cb2a721777a5e1032307a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Lorn Potter 2020-05-07 19:14:36 +10:00
parent 745a7fa31e
commit 3fbf7b34cc
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/network/access/qnetworkreplywasmimpl.cpp
View File

@ -454,15 +454,21 @@ void QNetworkReplyWasmImplPrivate::_q_bufferOutgoingData()
void QNetworkReplyWasmImplPrivate::downloadSucceeded(emscripten_fetch_t *fetch) void QNetworkReplyWasmImplPrivate::downloadSucceeded(emscripten_fetch_t *fetch)
{ {
QByteArray buffer(fetch->data, fetch->numBytes);
QNetworkReplyWasmImplPrivate *reply = QNetworkReplyWasmImplPrivate *reply =
reinterpret_cast<QNetworkReplyWasmImplPrivate*>(fetch->userData); reinterpret_cast<QNetworkReplyWasmImplPrivate*>(fetch->userData);
if (reply) { if (reply) {
QByteArray buffer(fetch->data, fetch->numBytes);
reply->dataReceived(buffer, buffer.size()); reply->dataReceived(buffer, buffer.size());
} }
} }
void QNetworkReplyWasmImplPrivate::setStatusCode(int status, const QByteArray &statusText)
{
Q_Q(QNetworkReplyWasmImpl);
q->setAttribute(QNetworkRequest::HttpStatusCodeAttribute, status);
q->setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, statusText);
}
void QNetworkReplyWasmImplPrivate::stateChange(emscripten_fetch_t *fetch) void QNetworkReplyWasmImplPrivate::stateChange(emscripten_fetch_t *fetch)
{ {
if (fetch->readyState == /*HEADERS_RECEIVED*/ 2) { if (fetch->readyState == /*HEADERS_RECEIVED*/ 2) {
@ -488,14 +494,17 @@ void QNetworkReplyWasmImplPrivate::downloadProgress(emscripten_fetch_t *fetch)
void QNetworkReplyWasmImplPrivate::downloadFailed(emscripten_fetch_t *fetch) void QNetworkReplyWasmImplPrivate::downloadFailed(emscripten_fetch_t *fetch)
{ {
QNetworkReplyWasmImplPrivate *reply = reinterpret_cast<QNetworkReplyWasmImplPrivate*>(fetch->userData); QNetworkReplyWasmImplPrivate *reply = reinterpret_cast<QNetworkReplyWasmImplPrivate*>(fetch->userData);
Q_ASSERT(reply); if (reply) {
QString reasonStr;
if (fetch->status > 600 || reply->state == QNetworkReplyPrivate::Aborted)
reasonStr = QStringLiteral("Operation canceled");
else
reasonStr = QString::fromUtf8(fetch->statusText);
QString reasonStr = QString::fromUtf8(fetch->statusText); QByteArray statusText(fetch->statusText);
reply->setStatusCode(fetch->status, statusText);
reply->setReplyAttributes(reinterpret_cast<quintptr>(fetch->userData), fetch->status, reasonStr);
if (fetch->status >= 400 && !reasonStr.isEmpty())
reply->emitReplyError(reply->statusCodeFromHttp(fetch->status, reply->request.url()), reasonStr); reply->emitReplyError(reply->statusCodeFromHttp(fetch->status, reply->request.url()), reasonStr);
}
if (fetch->status >= 400) if (fetch->status >= 400)
emscripten_fetch_close(fetch); // Also free data on failure. emscripten_fetch_close(fetch); // Also free data on failure.

2
src/network/access/qnetworkreplywasmimpl_p.h
View File

@ -112,6 +112,8 @@ public:
void dataReceived(const QByteArray &buffer, int bufferSize); void dataReceived(const QByteArray &buffer, int bufferSize);
void headersReceived(const QByteArray &buffer); void headersReceived(const QByteArray &buffer);
void setStatusCode(int status, const QByteArray &statusText);
void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request, void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request,
QIODevice *outgoingData); QIODevice *outgoingData);