diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-06 09:32:13 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-06 09:32:13 +0200 |
commit | 1a464f35d19fbf6a5cbe93b2a2d52f2f44465913 (patch) | |
tree | 7306fbbb50429d66cf4d3d08e60e7310431b9f85 /src/network | |
parent | 061fbceb777c41b23bc2b8180b2af85d9b35b246 (diff) | |
parent | b6f7230cda02d9b11b309816ca1e41dbd2716fe0 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ic811cd444e523b904211797112bba6aaec85dddd
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/access/qhttp2protocolhandler.cpp | 7 |
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); |