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

 Conflicts:
	src/3rdparty/pcre2/qt_attribution.json

Change-Id: Ibae941cb12662f27bd6962ee02bc235971c59a15

1 files changed, 8 insertions, 1 deletions

diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp
index 35aee6e3e1..87a70d8a55 100644
--- a/src/network/access/qhttp2protocolhandler.cpp
+++ b/src/network/access/qhttp2protocolhandler.cpp
@@ -818,7 +818,6 @@ void QHttp2ProtocolHandler::handleGOAWAY()
         // and a NO_ERROR code."
         if (lastStreamID != Http2::lastValidStreamID || errorCode != HTTP2_NO_ERROR)
             return connectionError(PROTOCOL_ERROR, "GOAWAY invalid stream/error code");
-        lastStreamID = 1;
     } else {
         lastStreamID += 2;
     }
@@ -836,6 +835,14 @@ void QHttp2ProtocolHandler::handleGOAWAY()
     QString message;
     qt_error(errorCode, error, message);
 
+    // Even if the GOAWAY frame contains NO_ERROR we must send an error
+    // when terminating streams to ensure users can distinguish from a
+    // successful completion.
+    if (errorCode == HTTP2_NO_ERROR) {
+        error = QNetworkReply::ContentReSendError;
+        message = QLatin1String("Server stopped accepting new streams before this stream was established");
+    }
+
     for (quint32 id = lastStreamID; id < nextID; id += 2) {
         const auto it = activeStreams.find(id);
         if (it != activeStreams.end()) {