Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I830beea26863323ab78a5d4b093f7763d77ad3da

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/auto/network/access/http2/http2srv.cpp b/tests/auto/network/access/http2/http2srv.cpp
index 1f9ffb8985..6e2220fa67 100644
--- a/tests/auto/network/access/http2/http2srv.cpp
+++ b/tests/auto/network/access/http2/http2srv.cpp
@@ -431,6 +431,13 @@ void Http2Server::readReady()
     if (connectionError)
         return;
 
+    if (redirectSent) {
+        // We are a "single shot" server, working in 'h2' mode,
+        // responding with a redirect code. Don't bother to handle
+        // anything else now.
+        return;
+    }
+
     if (upgradeProtocol) {
         handleProtocolUpgrade();
     } else if (waitingClientPreface) {
@@ -800,6 +807,13 @@ void Http2Server::sendResponse(quint32 streamID, bool emptyBody)
 
     HttpHeader header;
     if (redirectWhileReading) {
+        if (redirectSent) {
+            // This is a "single-shot" server responding with a redirect code.
+            return;
+        }
+
+        redirectSent = true;
+
         qDebug("server received HEADERS frame (followed by DATA frames), redirecting ...");
         Q_ASSERT(targetPort);
         header.push_back({":status", "308"});