From 800941df899a4418d4ac6cebbcc31a40120167bc Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@gmail.com>
Date: Fri, 10 May 2019 19:11:33 +1000
Subject: wasm: fix empty body on POST
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this also optimizes network post method handling

Task-number: QTBUG-75660
Change-Id: Ibb0d01f2cc2b2bc7802598c4f6f04b04882c12ca
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/network/access/qnetworkreplywasmimpl.cpp | 32 ++++++----------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

(limited to 'src/network')

diff --git a/src/network/access/qnetworkreplywasmimpl.cpp b/src/network/access/qnetworkreplywasmimpl.cpp
index bb6ef07741..9f8a42ad89 100644
--- a/src/network/access/qnetworkreplywasmimpl.cpp
+++ b/src/network/access/qnetworkreplywasmimpl.cpp
@@ -235,7 +235,7 @@ void QNetworkReplyWasmImpl::close()
 void QNetworkReplyWasmImpl::abort()
 {
     Q_D(const QNetworkReplyWasmImpl);
-    setError( QNetworkReply::OperationCanceledError, "Operation canceled" );
+    setError( QNetworkReply::OperationCanceledError, QStringLiteral("Operation canceled"));
     d->doAbort();
 
     close();
@@ -328,8 +328,6 @@ void QNetworkReplyWasmImplPrivate::doSendRequest()
     m_xhr = val::global("XMLHttpRequest").new_();
     std::string verb = q->methodName().toStdString();
 
-    QString extraDataString;
-
     m_xhr.call<void>("open", verb, request.url().toString().toStdString());
 
     m_xhr.set("onerror", val::module_property("qt_QNetworkReplyWasmImplPrivate_requestErrorCallback"));
@@ -348,30 +346,12 @@ void QNetworkReplyWasmImplPrivate::doSendRequest()
     if (outgoingData) // data from post request
         extraData = outgoingData->readAll();
 
-    if (contentType.contains("text") ||
-            contentType.contains("json") ||
-            contentType.contains("form")) {
-        if (extraData.size() > 0)
-            extraDataString.fromUtf8(extraData);
-    }
-    if (contentType.contains("json")) {
-        if (!extraDataString.isEmpty()) {
-            m_xhr.set("responseType", val("json"));
-            dataToSend = val(extraDataString.toStdString());
-        }
-    } else if (contentType.contains("form")) { //construct form data
-        if (!extraDataString.isEmpty()) {
-            val formData = val::global("FormData").new_();
-            QStringList formList = extraDataString.split('&');
-
-            for (auto formEntry : formList) {
-                formData.call<void>("append", formEntry.split('=')[0].toStdString(), formEntry.split('=')[1].toStdString());
-            }
-            dataToSend = formData;
-        }
-    } else {
-        m_xhr.set("responseType", val("blob"));
+    if (!extraData.isEmpty()) {
+        dataToSend = val(typed_memory_view(extraData.size(),
+                                           reinterpret_cast<const unsigned char *>
+                                           (extraData.constData())));
     }
+    m_xhr.set("responseType", val("blob"));
     // set request headers
     for (auto header : request.rawHeaderList()) {
         m_xhr.call<void>("setRequestHeader", header.toStdString(), request.rawHeader(header).toStdString());
-- 
cgit v1.2.3