1 files changed, 68 insertions, 25 deletions

diff --git a/tests/auto/shared/httpreqrep.cpp b/tests/auto/shared/httpreqrep.cpp
index eb2db6890..15a86631c 100644
--- a/tests/auto/shared/httpreqrep.cpp
+++ b/tests/auto/shared/httpreqrep.cpp
@@ -31,11 +31,14 @@ HttpReqRep::HttpReqRep(QTcpSocket *socket, QObject *parent)
     : QObject(parent), m_socket(socket)
 {
     m_socket->setParent(this);
-    connect(m_socket, &QIODevice::readyRead, this, &HttpReqRep::handleReadyRead);
+    connect(m_socket, &QTcpSocket::readyRead, this, &HttpReqRep::handleReadyRead);
+    connect(m_socket, &QTcpSocket::disconnected, this, &HttpReqRep::handleDisconnected);
 }
 
 void HttpReqRep::sendResponse()
 {
+    if (m_state != State::REQUEST_RECEIVED)
+        return;
     m_socket->write("HTTP/1.1 ");
     m_socket->write(QByteArray::number(m_responseStatusCode));
     m_socket->write(" OK?\r\n");
@@ -45,9 +48,21 @@ void HttpReqRep::sendResponse()
         m_socket->write(kv.second);
         m_socket->write("\r\n");
     }
+    m_socket->write("Connection: close\r\n");
     m_socket->write("\r\n");
     m_socket->write(m_responseBody);
-    m_socket->close();
+    m_state = State::DISCONNECTING;
+    m_socket->disconnectFromHost();
+    Q_EMIT responseSent();
+}
+
+void HttpReqRep::close()
+{
+    if (m_state != State::REQUEST_RECEIVED)
+        return;
+    m_state = State::DISCONNECTING;
+    m_socket->disconnectFromHost();
+    Q_EMIT error(QStringLiteral("missing response"));
 }
 
 QByteArray HttpReqRep::requestHeader(const QByteArray &key) const
@@ -60,32 +75,60 @@ QByteArray HttpReqRep::requestHeader(const QByteArray &key) const
 
 void HttpReqRep::handleReadyRead()
 {
-    const auto requestLine = m_socket->readLine();
-    const auto requestLineParts = requestLine.split(' ');
-    if (requestLineParts.size() != 3 || !requestLineParts[2].toUpper().startsWith("HTTP/")) {
-        qWarning("HttpReqRep: invalid request line");
-        Q_EMIT readFinished(false);
-        return;
-    }
-
-    decltype(m_requestHeaders) headers;
-    for (;;) {
-        const auto headerLine = m_socket->readLine();
-        if (headerLine == QByteArrayLiteral("\r\n"))
+    while (m_socket->canReadLine()) {
+        switch (m_state) {
+        case State::RECEIVING_REQUEST: {
+            const auto requestLine = m_socket->readLine();
+            const auto requestLineParts = requestLine.split(' ');
+            if (requestLineParts.size() != 3 || !requestLineParts[2].toUpper().startsWith("HTTP/")) {
+                m_state = State::DISCONNECTING;
+                m_socket->disconnectFromHost();
+                Q_EMIT error(QStringLiteral("invalid request line"));
+                return;
+            }
+            m_requestMethod = requestLineParts[0];
+            m_requestPath = requestLineParts[1];
+            m_state = State::RECEIVING_HEADERS;
+            break;
+        }
+        case State::RECEIVING_HEADERS: {
+            const auto headerLine = m_socket->readLine();
+            if (headerLine == QByteArrayLiteral("\r\n")) {
+                m_state = State::REQUEST_RECEIVED;
+                Q_EMIT requestReceived();
+                return;
+            }
+            int colonIndex = headerLine.indexOf(':');
+            if (colonIndex < 0) {
+                m_state = State::DISCONNECTING;
+                m_socket->disconnectFromHost();
+                Q_EMIT error(QStringLiteral("invalid header line"));
+                return;
+            }
+            auto headerKey = headerLine.left(colonIndex).trimmed().toLower();
+            auto headerValue = headerLine.mid(colonIndex + 1).trimmed().toLower();
+            m_requestHeaders.emplace(headerKey, headerValue);
             break;
-        int colonIndex = headerLine.indexOf(':');
-        if (colonIndex < 0) {
-            qWarning("HttpReqRep: invalid header line");
-            Q_EMIT readFinished(false);
+        }
+        default:
             return;
         }
-        auto headerKey = headerLine.left(colonIndex).trimmed().toLower();
-        auto headerValue = headerLine.mid(colonIndex + 1).trimmed().toLower();
-        headers.emplace(headerKey, headerValue);
     }
+}
 
-    m_requestMethod = requestLineParts[0];
-    m_requestPath = requestLineParts[1];
-    m_requestHeaders = headers;
-    Q_EMIT readFinished(true);
+void HttpReqRep::handleDisconnected()
+{
+    switch (m_state) {
+    case State::RECEIVING_REQUEST:
+    case State::RECEIVING_HEADERS:
+    case State::REQUEST_RECEIVED:
+        Q_EMIT error(QStringLiteral("unexpected disconnect"));
+        break;
+    case State::DISCONNECTING:
+        break;
+    case State::DISCONNECTED:
+        Q_UNREACHABLE();
+    }
+    m_state = State::DISCONNECTED;
+    Q_EMIT closed();
 }