From bb8caa0ce3edccec0ed6d6d31c06f20643d4e508 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 16 Feb 2018 13:07:45 -0800
Subject: [PATCH] Update HTTPConnection to not use QIODevice when given a
 QByteArray

---
 .../embedded-webserver/src/HTTPConnection.cpp | 72 ++++++++++---------
 .../embedded-webserver/src/HTTPConnection.h   |  1 +
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
index 6d0126b3d1..3f6f8d64ee 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.cpp
+++ b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -133,57 +133,33 @@ QList<FormData> HTTPConnection::parseFormData() const {
 }
 
 void HTTPConnection::respond(const char* code, const QByteArray& content, const char* contentType, const Headers& headers) {
-    QByteArray data(content);
-    auto device { std::unique_ptr<QBuffer>(new QBuffer()) };
-    device->setBuffer(new QByteArray(content));
-    if (device->open(QIODevice::ReadOnly)) {
-        respond(code, std::move(device), contentType, headers);
-    } else {
-        qCritical() << "Error opening QBuffer to respond to " << _requestUrl.path();
-    }
+    respondWithStatusAndHeaders(code, contentType, headers, content.size());
+
+    _socket->write(content);
+
+    _socket->disconnectFromHost();
+
+    // make sure we receive no further read notifications
+    disconnect(_socket, &QTcpSocket::readyRead, this, nullptr);
 }
 
 void HTTPConnection::respond(const char* code, std::unique_ptr<QIODevice> device, const char* contentType, const Headers& headers) {
     _responseDevice = std::move(device);
 
-    _socket->write("HTTP/1.1 ");
-
     if (_responseDevice->isSequential()) {
         qWarning() << "Error responding to HTTPConnection: sequential IO devices not supported";
-        _socket->write(StatusCode500);
-        _socket->write("\r\n");
+        respondWithStatusAndHeaders(StatusCode500, contentType, headers, 0);
         _socket->disconnect(SIGNAL(readyRead()), this);
         _socket->disconnectFromHost();
         return;
     }
 
-    _socket->write(code);
-    _socket->write("\r\n");
-
-    for (Headers::const_iterator it = headers.constBegin(), end = headers.constEnd();
-            it != end; it++) {
-        _socket->write(it.key());
-        _socket->write(": ");
-        _socket->write(it.value());
-        _socket->write("\r\n");
-    }
-
-    int csize = _responseDevice->size();
-    if (csize > 0) {
-        _socket->write("Content-Length: ");
-        _socket->write(QByteArray::number(csize));
-        _socket->write("\r\n");
-
-        _socket->write("Content-Type: ");
-        _socket->write(contentType);
-        _socket->write("\r\n");
-    }
-    _socket->write("Connection: close\r\n\r\n");
+    int totalToBeWritten = _responseDevice->size();
+    respondWithStatusAndHeaders(code, contentType, headers, totalToBeWritten);
 
     if (_responseDevice->atEnd()) {
         _socket->disconnectFromHost();
     } else {
-        int totalToBeWritten = csize;
         connect(_socket, &QTcpSocket::bytesWritten, this, [this, totalToBeWritten](size_t bytes) mutable {
             constexpr size_t HTTP_RESPONSE_CHUNK_SIZE = 1024 * 10;
             if (!_responseDevice->atEnd()) {
@@ -201,6 +177,32 @@ void HTTPConnection::respond(const char* code, std::unique_ptr<QIODevice> device
     disconnect(_socket, &QTcpSocket::readyRead, this, nullptr);
 }
 
+void HTTPConnection::respondWithStatusAndHeaders(const char* code, const char* contentType, const Headers& headers, int64_t contentLength) {
+    _socket->write("HTTP/1.1 ");
+
+    _socket->write(code);
+    _socket->write("\r\n");
+
+    for (Headers::const_iterator it = headers.constBegin(), end = headers.constEnd();
+            it != end; it++) {
+        _socket->write(it.key());
+        _socket->write(": ");
+        _socket->write(it.value());
+        _socket->write("\r\n");
+    }
+
+    if (contentLength > 0) {
+        _socket->write("Content-Length: ");
+        _socket->write(QByteArray::number(contentLength));
+        _socket->write("\r\n");
+
+        _socket->write("Content-Type: ");
+        _socket->write(contentType);
+        _socket->write("\r\n");
+    }
+    _socket->write("Connection: close\r\n\r\n");
+}
+
 void HTTPConnection::readRequest() {
     if (!_socket->canReadLine()) {
         return;
diff --git a/libraries/embedded-webserver/src/HTTPConnection.h b/libraries/embedded-webserver/src/HTTPConnection.h
index a020dfdca9..ec00864514 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.h
+++ b/libraries/embedded-webserver/src/HTTPConnection.h
@@ -105,6 +105,7 @@ protected slots:
     void readContent ();
 
 protected:
+    void respondWithStatusAndHeaders(const char* code, const char* contentType, const Headers& headers, int64_t size);
 
     /// The parent HTTP manager
     HTTPManager* _parentManager;