diff options
| -rw-r--r-- | src/network/access/qnetworkreplywasmimpl.cpp | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/src/network/access/qnetworkreplywasmimpl.cpp b/src/network/access/qnetworkreplywasmimpl.cpp index a1779146f4..83254889fb 100644 --- a/src/network/access/qnetworkreplywasmimpl.cpp +++ b/src/network/access/qnetworkreplywasmimpl.cpp @@ -61,12 +61,16 @@ QNetworkReplyWasmImplPrivate::QNetworkReplyWasmImplPrivate() , downloadBufferCurrentSize(0) , totalDownloadSize(0) , percentFinished(0) + , m_fetch(0) { } QNetworkReplyWasmImplPrivate::~QNetworkReplyWasmImplPrivate() { - emscripten_fetch_close(m_fetch); + if (m_fetch) { + emscripten_fetch_close(m_fetch); + m_fetch = 0; + } } QNetworkReplyWasmImpl::QNetworkReplyWasmImpl(QObject *parent) @@ -115,12 +119,10 @@ void QNetworkReplyWasmImpl::abort() if (d->state == QNetworkReplyPrivate::Finished || d->state == QNetworkReplyPrivate::Aborted) return; - setError(QNetworkReply::OperationCanceledError, QStringLiteral("Operation canceled")); - + d->state = QNetworkReplyPrivate::Aborted; d->doAbort(); - + d->m_fetch = 0; close(); - d->state = QNetworkReplyPrivate::Aborted; } qint64 QNetworkReplyWasmImpl::bytesAvailable() const @@ -265,7 +267,7 @@ void QNetworkReplyWasmImplPrivate::doSendRequest() attr.onerror = QNetworkReplyWasmImplPrivate::downloadFailed; attr.onprogress = QNetworkReplyWasmImplPrivate::downloadProgress; attr.onreadystatechange = QNetworkReplyWasmImplPrivate::stateChange; - attr.timeoutMSecs = 2 * 6000; // FIXME + attr.timeoutMSecs = QNetworkRequest::DefaultTransferTimeoutConstant; attr.userData = reinterpret_cast<void *>(this); QString dPath = QStringLiteral("/home/web_user/") + request.url().fileName(); @@ -276,14 +278,13 @@ void QNetworkReplyWasmImplPrivate::doSendRequest() void QNetworkReplyWasmImplPrivate::emitReplyError(QNetworkReply::NetworkError errorCode, const QString &errorString) { - Q_UNUSED(errorCode) Q_Q(QNetworkReplyWasmImpl); q->setError(errorCode, errorString); emit q->errorOccurred(errorCode); - - q->setFinished(true); - emit q->finished(); + doAbort(); + m_fetch = 0; + q->close(); } void QNetworkReplyWasmImplPrivate::emitDataReadProgress(qint64 bytesReceived, qint64 bytesTotal) @@ -486,8 +487,13 @@ void QNetworkReplyWasmImplPrivate::downloadProgress(emscripten_fetch_t *fetch) reinterpret_cast<QNetworkReplyWasmImplPrivate*>(fetch->userData); Q_ASSERT(reply); - if (fetch->status < 400) - reply->emitDataReadProgress((fetch->dataOffset + fetch->numBytes), fetch->totalBytes); + if (fetch->status < 400) { + uint64_t bytes = fetch->dataOffset + fetch->numBytes; + uint64_t tBytes = fetch->totalBytes; // totalBytes can be 0 if server not reporting content length + if (tBytes == 0) + tBytes = bytes; + reply->emitDataReadProgress(bytes, tBytes); + } } void QNetworkReplyWasmImplPrivate::downloadFailed(emscripten_fetch_t *fetch) @@ -563,6 +569,9 @@ QNetworkReply::NetworkError QNetworkReplyWasmImplPrivate::statusCodeFromHttp(int code = QNetworkReply::ServiceUnavailableError; break; + case 65535: //emscripten reply when aborted + code = QNetworkReply::OperationCanceledError; + break; default: if (httpStatusCode > 500) { // some kind of server error |