summaryrefslogtreecommitdiffstats
path: root/src/network/access/qhttp2protocolhandler.cpp
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2017-01-17 09:08:38 +0100
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2017-01-17 18:52:53 +0000
commit80fd1f81882024d13b6ce9688797239892092dfa (patch)
treed88db3a6eb36f4e806188424fe9fbc4ac4ed0c98 /src/network/access/qhttp2protocolhandler.cpp
parentcebf1fea4a6802b8999469f647f52171e87d02b6 (diff)
HTTP/2 - fix SETTINGS frame validation
When testing peer's SETTINGS frames, namely MAX_CONCURRENT_STREAM identifier, we should test against upper limit _new_ values from these frames, not our own pre-set maxConcurrentStreams (it apparently was a typo). Change-Id: I2036e45b0f931914f75ca99142192e2f9385623e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/access/qhttp2protocolhandler.cpp')
-rw-r--r--src/network/access/qhttp2protocolhandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp
index 6460751b00..60313422da 100644
--- a/src/network/access/qhttp2protocolhandler.cpp
+++ b/src/network/access/qhttp2protocolhandler.cpp
@@ -988,7 +988,7 @@ bool QHttp2ProtocolHandler::acceptSetting(Http2::Settings identifier, quint32 ne
}
if (identifier == Settings::MAX_CONCURRENT_STREAMS_ID) {
- if (maxConcurrentStreams > maxPeerConcurrentStreams) {
+ if (newValue > maxPeerConcurrentStreams) {
connectionError(PROTOCOL_ERROR, "SETTINGS invalid number of concurrent streams");
return false;
}