1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Http2: fix streamsToUse logic

Browse Source 
The settings frame with the max streams might be received late
or be revised later, so we cannot assert something on the
relation with the max streams allowed.

Amends 22c99cf498103c86baa5a415ca34630396e5b6aa

Change-Id: I973dfcf91541becc8c3d6363f9065bb1b9183062
Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit b0b2b7d39d9689dfdcb69394d2c1b3a3e20f9999)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2024-03-15 12:34:36 +01:00 committed by Qt Cherry-pick Bot
parent 50af22aa8d
commit fb5ff98d32
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/access/qhttp2protocolhandler.cpp
View File

@ -325,11 +325,10 @@ bool QHttp2ProtocolHandler::sendRequest()
initReplyFromPushPromise(message, key);
}
Q_ASSERT(qint64(maxConcurrentStreams) >= activeStreams.size());
const size_t streamsToUse = std::min(maxConcurrentStreams - size_t(activeStreams.size()),
size_t(requests.size()));
const qint64 streamsToUse = qBound(0, qint64(maxConcurrentStreams) - activeStreams.size(),
requests.size());
auto it = requests.begin();
for (size_t i = 0; i < streamsToUse; ++i) {
for (qint64 i = 0; i < streamsToUse; ++i) {
const qint32 newStreamID = createNewStream(*it);
if (!newStreamID) {
// TODO: actually we have to open a new connection.