diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-07 10:52:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-07 13:28:29 +0000 |
| commit | 35b25bc91784f5a39ee034a99167d5bfee49f74b (patch) | |
| tree | f6198a2b9f4456c05f3399d60e95da57499b0036 /src/network/access/qhttp2protocolhandler.cpp | |
| parent | aea6ff4f57135b0f2f076e86e22cb87c0a7014fe (diff) | |
| parent | c2b553784dfbe0ece90f79709639e27e74359a7d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/network/access/qhttp2protocolhandler.cpp')
| -rw-r--r-- | src/network/access/qhttp2protocolhandler.cpp | 9 |
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()) { |