You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/01/30 15:47:59 UTC
[tomcat] branch main updated: Align with 10.1.x for ease of maintenance
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 7a4a9a7435 Align with 10.1.x for ease of maintenance
7a4a9a7435 is described below
commit 7a4a9a7435a53e49187386c0d5573bc82d85a330
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 30 15:47:22 2023 +0000
Align with 10.1.x for ease of maintenance
Strictly, this change is not required since in Tomcat 11.0.x onwards,
the concept of parent streams has been removed so a RecycledStream can't
end up in the backlog.
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index cfd6b3ddef..c65edcd049 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1052,6 +1052,7 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
if (stream.getConnectionAllocationRequested() > 0) {
stream.setConnectionAllocationMade(stream.getConnectionAllocationRequested());
stream.setConnectionAllocationRequested(0);
+ result.add(stream);
}
}
// Cast is safe due to test above
@@ -1059,7 +1060,6 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
backLogSize = 0;
super.incrementWindowSize(remaining);
- result.addAll(backLogStreams);
backLogStreams.clear();
} else {
// Can't clear the whole backlog.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org