From a065afa40b15f1d38a7065ea3b8becda5bac23cf Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Tue, 23 Jul 2024 16:38:57 +1000 Subject: [PATCH] wasm: set status code before readyRead is sent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.7 Change-Id: I6f0360158cf6fe728eb49f61dc0ec819924e96e2 Reviewed-by: Morten Johan Sørvig Reviewed-by: Piotr Wierciński (cherry picked from commit cd213bb750cb6619defeb700aea270f016c6cd19) Reviewed-by: Qt Cherry-pick Bot --- src/network/access/qnetworkreplywasmimpl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/access/qnetworkreplywasmimpl.cpp b/src/network/access/qnetworkreplywasmimpl.cpp index 7d2b6a701e5..ed34b688834 100644 --- a/src/network/access/qnetworkreplywasmimpl.cpp +++ b/src/network/access/qnetworkreplywasmimpl.cpp @@ -526,10 +526,10 @@ void QNetworkReplyWasmImplPrivate::downloadSucceeded(emscripten_fetch_t *fetch) } else if (fetchContext->state == FetchContext::State::SENT) { const auto reply = fetchContext->reply; if (reply->state != QNetworkReplyPrivate::Aborted) { - QByteArray buffer(fetch->data, fetch->numBytes); - reply->dataReceived(buffer); QByteArray statusText(fetch->statusText); reply->setStatusCode(fetch->status, statusText); + QByteArray buffer(fetch->data, fetch->numBytes); + reply->dataReceived(buffer); reply->setReplyFinished(); } reply->m_fetch = nullptr; @@ -602,10 +602,10 @@ void QNetworkReplyWasmImplPrivate::downloadFailed(emscripten_fetch_t *fetch) reasonStr = QStringLiteral("Operation canceled"); else reasonStr = QString::fromUtf8(fetch->statusText); - QByteArray buffer(fetch->data, fetch->numBytes); - reply->dataReceived(buffer); QByteArray statusText(fetch->statusText); reply->setStatusCode(fetch->status, statusText); + QByteArray buffer(fetch->data, fetch->numBytes); + reply->dataReceived(buffer); reply->emitReplyError(reply->statusCodeFromHttp(fetch->status, reply->request.url()), reasonStr); reply->setReplyFinished();