Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev

1 files changed, 4 insertions, 3 deletions

diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp
index 0cdcee6b59..5420e713b5 100644
--- a/src/network/access/qhttp2protocolhandler.cpp
+++ b/src/network/access/qhttp2protocolhandler.cpp
@@ -917,10 +917,11 @@ void QHttp2ProtocolHandler::handleContinuedHEADERS()
         if (activeStreams.contains(streamID)) {
             Stream &stream = activeStreams[streamID];
             if (stream.state != Stream::halfClosedLocal
-                && stream.state != Stream::remoteReserved) {
+                && stream.state != Stream::remoteReserved
+                && stream.state != Stream::open) {
                 // We can receive HEADERS on streams initiated by our requests
-                // (these streams are in halfClosedLocal state) or remote-reserved
-                // streams from a server's PUSH_PROMISE.
+                // (these streams are in halfClosedLocal or open state) or
+                // remote-reserved streams from a server's PUSH_PROMISE.
                 finishStreamWithError(stream, QNetworkReply::ProtocolFailure,
                                       QLatin1String("HEADERS on invalid stream"));
                 sendRST_STREAM(streamID, CANCEL);