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/20 19:04:49 UTC
[tomcat] branch main updated (e0b25a379e -> 31ab0b3974)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from e0b25a379e Update terminology - thanks to review by kkolinko
new bed84c18da Fix logic
new abf5114ab3 Add NO_RFC7540_PRIORITIES setting to enum
new a68294971e Send setting to disable RFC 7540 settings by default
new 89f7e83ac7 Ensure RFC 7540 priorities are not re-enabled
new f35647a02f Don't process priority frames
new fb22e14158 Remove RFC 7450 priorities tests
new 14d3637bec Implement new allocation algorithm
new f59c112ff0 Remove unused code
new 6448ade045 Remove unnecessary i18n strings
new 7b6eed79a0 Process received priority headers
new 77d5efdc46 Add support for reading priority update frame
new 31ab0b3974 Add a unit test for RFC 9218 priority handling
The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/coyote/http2/AbstractNonZeroStream.java | 94 -----
java/org/apache/coyote/http2/AbstractStream.java | 47 ---
.../coyote/http2/ConnectionSettingsBase.java | 16 +
java/org/apache/coyote/http2/Constants.java | 6 +-
java/org/apache/coyote/http2/FrameType.java | 25 +-
java/org/apache/coyote/http2/Http2AsyncParser.java | 3 +
java/org/apache/coyote/http2/Http2Parser.java | 80 ++--
.../apache/coyote/http2/Http2UpgradeHandler.java | 358 ++++++------------
.../apache/coyote/http2/LocalStrings.properties | 9 +-
.../apache/coyote/http2/LocalStrings_cs.properties | 1 -
.../apache/coyote/http2/LocalStrings_es.properties | 3 -
.../apache/coyote/http2/LocalStrings_fr.properties | 5 -
.../apache/coyote/http2/LocalStrings_ja.properties | 5 -
.../apache/coyote/http2/LocalStrings_ko.properties | 5 -
.../coyote/http2/LocalStrings_zh_CN.properties | 5 -
java/org/apache/coyote/http2/Setting.java | 4 +
java/org/apache/coyote/http2/Stream.java | 36 +-
.../apache/tomcat/util/http/parser/Priority.java | 2 +-
test/org/apache/coyote/http2/Http2TestBase.java | 47 ++-
.../apache/coyote/http2/TestAbstractStream.java | 407 ---------------------
.../apache/coyote/http2/TestHttp2Section_5_3.java | 258 -------------
test/org/apache/coyote/http2/TestRfc9218.java | 165 +++++++++
22 files changed, 458 insertions(+), 1123 deletions(-)
delete mode 100644 test/org/apache/coyote/http2/TestAbstractStream.java
delete mode 100644 test/org/apache/coyote/http2/TestHttp2Section_5_3.java
create mode 100644 test/org/apache/coyote/http2/TestRfc9218.java
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 10/12: Process received priority headers
Posted by ma...@apache.org.
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
commit 7b6eed79a0aea84ffb20332a13bb2ed6ed190bba
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 9 15:00:39 2022 +0000
Process received priority headers
---
java/org/apache/coyote/http2/Stream.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/java/org/apache/coyote/http2/Stream.java b/java/org/apache/coyote/http2/Stream.java
index f255029993..88017a7fb5 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -17,6 +17,7 @@
package org.apache.coyote.http2;
import java.io.IOException;
+import java.io.StringReader;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
@@ -42,6 +43,7 @@ import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.parser.Host;
+import org.apache.tomcat.util.http.parser.Priority;
import org.apache.tomcat.util.net.ApplicationBufferHandler;
import org.apache.tomcat.util.net.WriteBuffer;
import org.apache.tomcat.util.res.StringManager;
@@ -419,6 +421,16 @@ class Stream extends AbstractNonZeroStream implements HeaderEmitter {
}
break;
}
+ case "priority": {
+ try {
+ Priority p = Priority.parsePriority(new StringReader(value));
+ setUrgency(p.getUrgency());
+ setIncremental(p.getIncremental());
+ } catch (IOException ioe) {
+ // Not possible with StringReader
+ }
+ break;
+ }
default: {
if (headerState == HEADER_STATE_TRAILER &&
!handler.getProtocol().isTrailerHeaderAllowed(name)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 12/12: Add a unit test for RFC 9218 priority handling
Posted by ma...@apache.org.
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
commit 31ab0b3974e6f0eaa429b16b049b60cc30db5579
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 20 17:06:12 2023 +0000
Add a unit test for RFC 9218 priority handling
---
test/org/apache/coyote/http2/Http2TestBase.java | 27 ++++
test/org/apache/coyote/http2/TestRfc9218.java | 165 ++++++++++++++++++++++++
2 files changed, 192 insertions(+)
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java b/test/org/apache/coyote/http2/Http2TestBase.java
index b068520a80..4dc566fb9a 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -947,6 +947,33 @@ public abstract class Http2TestBase extends TomcatBaseTest {
}
+ void sendPriorityUpdate(int streamId, int urgency, boolean incremental) throws IOException {
+ // Need to know the payload length first
+ StringBuilder sb = new StringBuilder("u=");
+ sb.append(urgency);
+ if (incremental) {
+ sb.append(", i");
+ }
+ byte[] payload = sb.toString().getBytes(StandardCharsets.US_ASCII);
+
+ byte[] priorityUpdateFrame = new byte[13 + payload.length];
+
+ // length
+ ByteUtil.setThreeBytes(priorityUpdateFrame, 0, 4 + payload.length);
+ // type
+ priorityUpdateFrame[3] = FrameType.PRIORITY_UPDATE.getIdByte();
+ // Stream ID
+ ByteUtil.set31Bits(priorityUpdateFrame, 5, 0);
+
+ // Payload
+ ByteUtil.set31Bits(priorityUpdateFrame, 9, streamId);
+ System.arraycopy(payload, 0, priorityUpdateFrame, 13, payload.length);
+
+ os.write(priorityUpdateFrame);
+ os.flush();
+ }
+
+
void sendSettings(int streamId, boolean ack, SettingValue... settings) throws IOException {
// length
int settingsCount;
diff --git a/test/org/apache/coyote/http2/TestRfc9218.java b/test/org/apache/coyote/http2/TestRfc9218.java
new file mode 100644
index 0000000000..85dd834eee
--- /dev/null
+++ b/test/org/apache/coyote/http2/TestRfc9218.java
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.coyote.http2;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestRfc9218 extends Http2TestBase {
+
+ @Test
+ public void testPriority() throws Exception {
+ http2Connect();
+
+ /*
+ * This test uses small window updates and data frames that will trigger the excessive overhead protection so
+ * disable it.
+ */
+ http2Protocol.setOverheadWindowUpdateThreshold(0);
+ http2Protocol.setOverheadDataThreshold(0);
+
+ // Default connection window size is 64k - 1. Initial request will have used 8k (56k -1). Increase it to 57k.
+ sendWindowUpdate(0, 1 + 1024);
+
+ // Consume 56k of the connection window
+ for (int i = 3; i < 17; i += 2) {
+ sendSimpleGetRequest(i);
+ readSimpleGetResponse();
+ }
+
+ // At this point the connection window should be 1k
+
+ // Process a request on stream 17. This should consume the connection window.
+ sendSimpleGetRequest(17);
+ // 17-headers, 17-1k-body
+ parser.readFrame();
+ parser.readFrame();
+ output.clearTrace();
+
+ // Send additional requests. Connection window is empty so only headers will be returned.
+ sendSimpleGetRequest(19);
+ sendSimpleGetRequest(21);
+
+ // 19-headers, 21-headers
+ parser.readFrame();
+ parser.readFrame();
+ output.clearTrace();
+
+ // At this point 17, 19 and 21 are all blocked because the connection window is zero.
+ // 17 - 7k body left
+ // 19 - 8k body left
+ // 21 - 8k body left
+
+ // Add 1k to the connection window. Should be used for stream 17.
+ sendWindowUpdate(0, 1024);
+ parser.readFrame();
+ Assert.assertEquals("17-Body-1024\n", output.getTrace());
+ output.clearTrace();
+
+ // 17 - 6k body left
+ // 19 - 8k body left
+ // 21 - 8k body left
+
+ // Re-order the priorities
+ sendPriorityUpdate(19, 2, false);
+ sendPriorityUpdate(21, 1, false);
+
+ // Add 1k to the connection window. Should be used for stream 21.
+ sendWindowUpdate(0, 1024);
+ parser.readFrame();
+
+ Assert.assertEquals("21-Body-1024\n", output.getTrace());
+ output.clearTrace();
+
+ // 17 - 6k body left
+ // 19 - 8k body left
+ // 21 - 7k body left
+
+ // Re-order the priorities
+ sendPriorityUpdate(17, 3, true);
+ sendPriorityUpdate(19, 3, true);
+ sendPriorityUpdate(21, 3, true);
+
+ // Add 3k to the connection window. Should be split between 17, 19 and 21.
+ sendWindowUpdate(0, 1024 * 3);
+ parser.readFrame();
+ parser.readFrame();
+ parser.readFrame();
+
+ String trace = output.getTrace();
+ Assert.assertTrue(trace.contains("17-Body-877\n"));
+ trace = trace.replace("17-Body-877\n", "");
+ Assert.assertTrue(trace.contains("19-Body-1170\n"));
+ trace = trace.replace("19-Body-1170\n", "");
+ Assert.assertTrue(trace.contains("21-Body-1024\n"));
+ trace = trace.replace("21-Body-1024\n", "");
+ Assert.assertEquals(0, trace.length());
+ output.clearTrace();
+
+ // 1 byte unallocated in connection window
+ // 17 - 5267 body left
+ // 19 - 7022 body left
+ // 21 - 6144 body left
+
+ // Add 1 byte to the connection window. Due to rounding up, each stream should get 1 byte.
+ sendWindowUpdate(0, 1);
+ parser.readFrame();
+ parser.readFrame();
+ parser.readFrame();
+
+ trace = output.getTrace();
+ Assert.assertTrue(trace.contains("17-Body-1\n"));
+ trace = trace.replace("17-Body-1\n", "");
+ Assert.assertTrue(trace.contains("19-Body-1\n"));
+ trace = trace.replace("19-Body-1\n", "");
+ Assert.assertTrue(trace.contains("21-Body-1\n"));
+ trace = trace.replace("21-Body-1\n", "");
+ Assert.assertEquals(0, trace.length());
+ output.clearTrace();
+
+ // 1 byte over allocated in connection window
+ // 17 - 5266 body left
+ // 19 - 7021 body left
+ // 21 - 6143 body left
+
+ // Re-order the priorities
+ sendPriorityUpdate(17, 2, true);
+
+ /*
+ * Add 8k to the connection window. Should clear the connection window over allocation and fully allocate 17
+ * with the remainder split equally between 17 and 21.
+ */
+ sendWindowUpdate(0, 1024 * 8);
+ parser.readFrame();
+ parser.readFrame();
+ parser.readFrame();
+
+ trace = output.getTrace();
+ System.out.println(trace);
+ Assert.assertTrue(trace.contains("17-Body-5266\n"));
+ trace = trace.replace("17-Body-5266\n", "");
+ Assert.assertTrue(trace.contains("17-EndOfStream\n"));
+ trace = trace.replace("17-EndOfStream\n", "");
+ Assert.assertTrue(trace.contains("19-Body-1560\n"));
+ trace = trace.replace("19-Body-1560\n", "");
+ Assert.assertTrue(trace.contains("21-Body-1365\n"));
+ trace = trace.replace("21-Body-1365\n", "");
+ Assert.assertEquals(0, trace.length());
+
+ // Test doesn't read the read of the body for streams 19 and 21.
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/12: Don't process priority frames
Posted by ma...@apache.org.
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
commit f35647a02f2c6dced285dd839a907bd9377938da
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 6 19:16:41 2022 +0000
Don't process priority frames
---
java/org/apache/coyote/http2/Http2Parser.java | 39 +++++++---------------
.../apache/coyote/http2/Http2UpgradeHandler.java | 31 ++---------------
.../apache/coyote/http2/LocalStrings.properties | 1 -
.../apache/coyote/http2/LocalStrings_fr.properties | 1 -
.../apache/coyote/http2/LocalStrings_ja.properties | 1 -
.../apache/coyote/http2/LocalStrings_ko.properties | 1 -
.../coyote/http2/LocalStrings_zh_CN.properties | 1 -
test/org/apache/coyote/http2/Http2TestBase.java | 13 ++++----
8 files changed, 20 insertions(+), 68 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java b/java/org/apache/coyote/http2/Http2Parser.java
index 60669491d5..a68ce25dcb 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -254,12 +254,8 @@ class Http2Parser {
Integer.toString(payloadSize)), Http2Error.PROTOCOL_ERROR);
}
}
- if (priority) {
- boolean exclusive = ByteUtil.isBit7Set(optional[optionalPos]);
- int parentStreamId = ByteUtil.get31Bits(optional, optionalPos);
- int weight = ByteUtil.getOneByte(optional, optionalPos + 4) + 1;
- output.reprioritise(streamId, parentStreamId, exclusive, weight);
- }
+
+ // Ignore RFC 7450 priority data if present
payloadSize -= optionalLen;
payloadSize -= padLength;
@@ -277,24 +273,15 @@ class Http2Parser {
}
- protected void readPriorityFrame(int streamId, ByteBuffer buffer) throws Http2Exception, IOException {
- byte[] payload = new byte[5];
- if (buffer == null) {
- input.fill(true, payload);
- } else {
- buffer.get(payload);
- }
-
- boolean exclusive = ByteUtil.isBit7Set(payload[0]);
- int parentStreamId = ByteUtil.get31Bits(payload, 0);
- int weight = ByteUtil.getOneByte(payload, 4) + 1;
-
- if (streamId == parentStreamId) {
- throw new StreamException(sm.getString("http2Parser.processFramePriority.invalidParent",
- connectionId, Integer.valueOf(streamId)), Http2Error.PROTOCOL_ERROR, streamId);
+ protected void readPriorityFrame(int streamId, ByteBuffer buffer) throws IOException {
+ // RFC 7450 priority frames are ignored. Still need to treat as overhead.
+ try {
+ swallowPayload(streamId, FrameType.PRIORITY.getId(), 5, false, buffer);
+ } catch (ConnectionException e) {
+ // Will never happen because swallowPayload() is called with isPadding set
+ // to false
}
-
- output.reprioritise(streamId, parentStreamId, exclusive, weight);
+ output.increaseOverheadCount(FrameType.PRIORITY);
}
@@ -780,10 +767,6 @@ class Http2Parser {
void headersContinue(int payloadSize, boolean endOfHeaders);
void headersEnd(int streamId) throws Http2Exception;
- // Priority frames (also headers)
- void reprioritise(int streamId, int parentStreamId, boolean exclusive, int weight)
- throws Http2Exception;
-
// Reset frames
void reset(int streamId, long errorCode) throws Http2Exception;
@@ -815,5 +798,7 @@ class Http2Parser {
* frame
*/
void onSwallowedUnknownFrame(int streamId, int frameTypeId, int flags, int size) throws IOException;
+
+ void increaseOverheadCount(FrameType frameType);
}
}
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index c89fe44c1f..a2405994a8 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1489,7 +1489,8 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
}
- private void increaseOverheadCount(FrameType frameType) {
+ @Override
+ public void increaseOverheadCount(FrameType frameType) {
// An overhead frame increases the overhead count by
// overheadCountFactor. By default, this means an overhead frame
// increases the overhead count by 10. A simple browser request is
@@ -1708,34 +1709,6 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
}
- @Override
- public void reprioritise(int streamId, int parentStreamId,
- boolean exclusive, int weight) throws Http2Exception {
- if (streamId == parentStreamId) {
- throw new ConnectionException(sm.getString("upgradeHandler.dependency.invalid",
- getConnectionId(), Integer.valueOf(streamId)), Http2Error.PROTOCOL_ERROR);
- }
-
- increaseOverheadCount(FrameType.PRIORITY);
-
- synchronized (priorityTreeLock) {
- // Need to look up stream and parent stream inside the lock else it
- // is possible for a stream to be recycled before it is
- // reprioritised. This can result in incorrect references to the
- // non-recycled stream being retained after reprioritisation.
- AbstractNonZeroStream abstractNonZeroStream = getAbstractNonZeroStream(streamId);
- if (abstractNonZeroStream == null) {
- abstractNonZeroStream = createRemoteStream(streamId);
- }
- AbstractStream parentStream = getAbstractNonZeroStream(parentStreamId);
- if (parentStream == null) {
- parentStream = this;
- }
- abstractNonZeroStream.rePrioritise(parentStream, exclusive, weight);
- }
- }
-
-
@Override
public void headersContinue(int payloadSize, boolean endOfHeaders) {
// Generally, continuation frames don't impact the overhead count but if
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 7f7bf3a8c6..547a1880d1 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -129,7 +129,6 @@ upgradeHandler.allocate.debug=Connection [{0}], Stream [{1}], allocated [{2}] by
upgradeHandler.allocate.left=Connection [{0}], Stream [{1}], [{2}] bytes unallocated - trying to allocate to children
upgradeHandler.allocate.recipient=Connection [{0}], Stream [{1}], potential recipient [{2}] with weight [{3}]
upgradeHandler.connectionError=Connection error
-upgradeHandler.dependency.invalid=Connection [{0}], Stream [{1}], Streams may not depend on themselves
upgradeHandler.fallToDebug=\n\
\ Note: further occurrences of HTTP/2 stream errors will be logged at DEBUG level.
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error code [{2}], Debug data [{3}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 292e61e67a..e8551e4370 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -128,7 +128,6 @@ upgradeHandler.allocate.debug=Connection [{0}], Flux [{1}], [{2}] octets alloué
upgradeHandler.allocate.left=Connection [{0}], Flux [{1}], [{2}] octets désalloués, essai d''allocation aux enfants
upgradeHandler.allocate.recipient=Connection [{0}], Flux [{1}], receveur potentiel [{2}] avec poids [{3}]
upgradeHandler.connectionError=Erreur de la connection
-upgradeHandler.dependency.invalid=Connection [{0}], Flux [{1}], Un flux ne peut dépendre de lui-même
upgradeHandler.fallToDebug=\n\
\ Note: les occurrences suivantes d'erreurs de stream HTTP/2 seront enregistrées au niveau DEBUG.
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Dernier flux [{1}], Code d''erreur [{2}], Données de débogage [{3}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 726b3fc7ba..b0e237d260 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -128,7 +128,6 @@ upgradeHandler.allocate.debug=コネクション [{0}]、ストリーム [{1}]
upgradeHandler.allocate.left=コネクション [{0}]、ストリーム [{1}]、[{2}] バイトが未割り当て - 子への割り当てを試みています
upgradeHandler.allocate.recipient=コネクション [{0}]、ストリーム [{1}]、重み [{3}] の潜在的な受信者 [{2}]
upgradeHandler.connectionError=接続エラー
-upgradeHandler.dependency.invalid=コネクション [{0}]、ストリーム [{1}]、ストリームは自分自身に依存するべきではありません。
upgradeHandler.fallToDebug=注: HTTP/2 ストリームのエラーがさらに発生すると、DEBUG レベルでログに記録されます。
upgradeHandler.goaway.debug=コネクション [{0}]、Goaway、最終ストリーム [{1}]、エラーコード [{2}]、デバッグデータ [{3}]
upgradeHandler.init=コネクション[{0}]、状態[{1}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 7fe71cdccc..e8b1825382 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -127,7 +127,6 @@ upgradeHandler.allocate.debug=연결 [{0}], 스트림 [{1}], [{2}] 바이트를
upgradeHandler.allocate.left=연결 [{0}], 스트림 [{1}], [{2}] 바이트들이 할당 해제되었습니다 - 자식들에 할당하려 시도합니다.
upgradeHandler.allocate.recipient=연결 [{0}], 스트림 [{1}], 가중치 [{3}]의 잠재적 수신자 [{2}]
upgradeHandler.connectionError=연결 오류
-upgradeHandler.dependency.invalid=연결 [{0}], 스트림 [{1}], 스트림들은 자기 자신들에 의존해서는 안됩니다.
upgradeHandler.goaway.debug=연결 [{0}], Goaway, 마지막 스트림 [{1}], 오류 코드 [{2}], 디버그 데이터 [{3}]
upgradeHandler.init=연결 [{0}], 상태 [{1}]
upgradeHandler.invalidPreface=연결 [{0}]: 유효하지 않은 연결 preface
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index e457333ff2..d0713e931a 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -128,7 +128,6 @@ upgradeHandler.allocate.debug=连接[{0}]，流[{1}]，已分配[{2}]字节
upgradeHandler.allocate.left=连接[{0}]，流[{1}]，[{2}]字节未分配 - 尝试分配给子项
upgradeHandler.allocate.recipient=(:连接[{0}]，流[{1}]，潜在接收者[{2}]，权重为[{3}]
upgradeHandler.connectionError=连接错误
-upgradeHandler.dependency.invalid=连接{0}，流{1}，流可能不依赖于自身
upgradeHandler.goaway.debug=连接[{0}]，离开，最后的流[{1}]，错误码[{2}]，调试数据[{3}]
upgradeHandler.init=连接[{0}]，状态[{1}]
upgradeHandler.invalidPreface=连接[{0}]，连接前言无效
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java b/test/org/apache/coyote/http2/Http2TestBase.java
index 301450011c..24d85fdc1e 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -1129,13 +1129,6 @@ public abstract class Http2TestBase extends TomcatBaseTest {
return this;
}
- @Override
- public void reprioritise(int streamId, int parentStreamId, boolean exclusive, int weight) {
- lastStreamId = Integer.toString(streamId);
- trace.append(lastStreamId + "-Reprioritise-[" + parentStreamId + "]-[" + exclusive +
- "]-[" + weight + "]\n");
- }
-
@Override
public void emitHeader(String name, String value) {
@@ -1288,6 +1281,12 @@ public abstract class Http2TestBase extends TomcatBaseTest {
public long getBytesRead() {
return bytesRead;
}
+
+
+ @Override
+ public void increaseOverheadCount(FrameType frameType) {
+ // NO-OP. Client doesn't track overhead.
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 06/12: Remove RFC 7450 priorities tests
Posted by ma...@apache.org.
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
commit fb22e14158226b6074c2af636725f38f0b0ae44d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 6 19:45:04 2022 +0000
Remove RFC 7450 priorities tests
---
.../apache/coyote/http2/TestAbstractStream.java | 407 ---------------------
.../apache/coyote/http2/TestHttp2Section_5_3.java | 258 -------------
2 files changed, 665 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestAbstractStream.java b/test/org/apache/coyote/http2/TestAbstractStream.java
deleted file mode 100644
index 79dca9ab23..0000000000
--- a/test/org/apache/coyote/http2/TestAbstractStream.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.coyote.http2;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.CompletionHandler;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import org.apache.tomcat.util.net.ApplicationBufferHandler;
-import org.apache.tomcat.util.net.NioChannel;
-import org.apache.tomcat.util.net.NioEndpoint;
-import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.SendfileDataBase;
-import org.apache.tomcat.util.net.SendfileState;
-import org.apache.tomcat.util.net.SocketWrapperBase;
-
-/*
- * This tests use A=1, B=2, etc to map stream IDs to the names used in the
- * figures.
- */
-public class TestAbstractStream {
-
- @Test
- public void testDependenciesFig3() {
- // Setup
- Http2UpgradeHandler handler =
- new Http2UpgradeHandler(new Http2Protocol(), null, null, new TesterSocketWrapper());
- Stream a = new Stream(Integer.valueOf(1), handler);
- Stream b = new Stream(Integer.valueOf(2), handler);
- Stream c = new Stream(Integer.valueOf(3), handler);
- Stream d = new Stream(Integer.valueOf(4), handler);
- b.rePrioritise(a, false, 16);
- c.rePrioritise(a, false, 16);
-
- // Action
- d.rePrioritise(a, false, 16);
-
- // Check parents
- Assert.assertEquals(handler, a.getParentStream());
- Assert.assertEquals(a, b.getParentStream());
- Assert.assertEquals(a, c.getParentStream());
- Assert.assertEquals(a, d.getParentStream());
-
- // Check children
- Assert.assertEquals(3, a.getChildStreams().size());
- Assert.assertTrue(a.getChildStreams().contains(b));
- Assert.assertTrue(a.getChildStreams().contains(c));
- Assert.assertTrue(a.getChildStreams().contains(d));
- Assert.assertEquals(0, b.getChildStreams().size());
- Assert.assertEquals(0, c.getChildStreams().size());
- Assert.assertEquals(0, d.getChildStreams().size());
- }
-
-
- @Test
- public void testDependenciesFig4() {
- // Setup
- Http2UpgradeHandler handler =
- new Http2UpgradeHandler(new Http2Protocol(), null, null, new TesterSocketWrapper());
- Stream a = new Stream(Integer.valueOf(1), handler);
- Stream b = new Stream(Integer.valueOf(2), handler);
- Stream c = new Stream(Integer.valueOf(3), handler);
- Stream d = new Stream(Integer.valueOf(4), handler);
- b.rePrioritise(a, false, 16);
- c.rePrioritise(a, false, 16);
-
- // Action
- d.rePrioritise(a, true, 16);
-
- // Check parents
- Assert.assertEquals(handler, a.getParentStream());
- Assert.assertEquals(d, b.getParentStream());
- Assert.assertEquals(d, c.getParentStream());
- Assert.assertEquals(a, d.getParentStream());
-
- // Check children
- Assert.assertEquals(1, a.getChildStreams().size());
- Assert.assertTrue(a.getChildStreams().contains(d));
- Assert.assertEquals(2, d.getChildStreams().size());
- Assert.assertTrue(d.getChildStreams().contains(b));
- Assert.assertTrue(d.getChildStreams().contains(c));
- Assert.assertEquals(0, b.getChildStreams().size());
- Assert.assertEquals(0, c.getChildStreams().size());
- }
-
-
- @Test
- public void testDependenciesFig5NonExclusive() {
- // Setup
- Http2UpgradeHandler handler =
- new Http2UpgradeHandler(new Http2Protocol(), null, null, new TesterSocketWrapper());
- Stream a = new Stream(Integer.valueOf(1), handler);
- Stream b = new Stream(Integer.valueOf(2), handler);
- Stream c = new Stream(Integer.valueOf(3), handler);
- Stream d = new Stream(Integer.valueOf(4), handler);
- Stream e = new Stream(Integer.valueOf(5), handler);
- Stream f = new Stream(Integer.valueOf(6), handler);
- b.rePrioritise(a, false, 16);
- c.rePrioritise(a, false, 16);
- d.rePrioritise(c, false, 16);
- e.rePrioritise(c, false, 16);
- f.rePrioritise(d, false, 16);
-
- // Action
- a.rePrioritise(d, false, 16);
-
- // Check parents
- Assert.assertEquals(handler, d.getParentStream());
- Assert.assertEquals(d, f.getParentStream());
- Assert.assertEquals(d, a.getParentStream());
- Assert.assertEquals(a, b.getParentStream());
- Assert.assertEquals(a, c.getParentStream());
- Assert.assertEquals(c, e.getParentStream());
-
- // Check children
- Assert.assertEquals(2, d.getChildStreams().size());
- Assert.assertTrue(d.getChildStreams().contains(a));
- Assert.assertTrue(d.getChildStreams().contains(f));
- Assert.assertEquals(0, f.getChildStreams().size());
- Assert.assertEquals(2, a.getChildStreams().size());
- Assert.assertTrue(a.getChildStreams().contains(b));
- Assert.assertTrue(a.getChildStreams().contains(c));
- Assert.assertEquals(0, b.getChildStreams().size());
- Assert.assertEquals(1, c.getChildStreams().size());
- Assert.assertTrue(c.getChildStreams().contains(e));
- Assert.assertEquals(0, e.getChildStreams().size());
- }
-
-
- @Test
- public void testDependenciesFig5Exclusive() {
- // Setup
- Http2UpgradeHandler handler =
- new Http2UpgradeHandler(new Http2Protocol(), null, null, new TesterSocketWrapper());
- Stream a = new Stream(Integer.valueOf(1), handler);
- Stream b = new Stream(Integer.valueOf(2), handler);
- Stream c = new Stream(Integer.valueOf(3), handler);
- Stream d = new Stream(Integer.valueOf(4), handler);
- Stream e = new Stream(Integer.valueOf(5), handler);
- Stream f = new Stream(Integer.valueOf(6), handler);
- b.rePrioritise(a, false, 16);
- c.rePrioritise(a, false, 16);
- d.rePrioritise(c, false, 16);
- e.rePrioritise(c, false, 16);
- f.rePrioritise(d, false, 16);
-
- // Action
- a.rePrioritise(d, true, 16);
-
- // Check parents
- Assert.assertEquals(handler, d.getParentStream());
- Assert.assertEquals(d, a.getParentStream());
- Assert.assertEquals(a, b.getParentStream());
- Assert.assertEquals(a, c.getParentStream());
- Assert.assertEquals(a, f.getParentStream());
- Assert.assertEquals(c, e.getParentStream());
-
- // Check children
- Assert.assertEquals(1, d.getChildStreams().size());
- Assert.assertTrue(d.getChildStreams().contains(a));
- Assert.assertEquals(3, a.getChildStreams().size());
- Assert.assertTrue(a.getChildStreams().contains(b));
- Assert.assertTrue(a.getChildStreams().contains(c));
- Assert.assertTrue(a.getChildStreams().contains(f));
- Assert.assertEquals(0, b.getChildStreams().size());
- Assert.assertEquals(0, f.getChildStreams().size());
- Assert.assertEquals(1, c.getChildStreams().size());
- Assert.assertTrue(c.getChildStreams().contains(e));
- Assert.assertEquals(0, e.getChildStreams().size());
- }
-
-
- @Test
- public void testCircular01() {
- // Setup
- Http2UpgradeHandler handler =
- new Http2UpgradeHandler(new Http2Protocol(), null, null, new TesterSocketWrapper());
- Stream a = new Stream(Integer.valueOf(1), handler);
- Stream b = new Stream(Integer.valueOf(2), handler);
- Stream c = new Stream(Integer.valueOf(3), handler);
-
- b.rePrioritise(a, false, 16);
- c.rePrioritise(b, false, 16);
-
- // Action
- a.rePrioritise(c, false, 16);
-
- // Check parents
- Assert.assertEquals(c, a.getParentStream());
- Assert.assertEquals(a, b.getParentStream());
- Assert.assertEquals(handler, c.getParentStream());
-
- // Check children
- Assert.assertEquals(1, handler.getChildStreams().size());
- Assert.assertTrue(handler.getChildStreams().contains(c));
- Assert.assertEquals(1, a.getChildStreams().size());
- Assert.assertTrue(a.getChildStreams().contains(b));
- Assert.assertEquals(0, b.getChildStreams().size());
- Assert.assertEquals(1, c.getChildStreams().size());
- Assert.assertTrue(c.getChildStreams().contains(a));
- }
-
-
- @Test
- public void testCircular02() {
- // Setup
- Http2UpgradeHandler handler =
- new Http2UpgradeHandler(new Http2Protocol(), null, null, new TesterSocketWrapper());
- Stream a = new Stream(Integer.valueOf(1), handler);
- Stream b = new Stream(Integer.valueOf(2), handler);
- Stream c = new Stream(Integer.valueOf(3), handler);
- Stream d = new Stream(Integer.valueOf(4), handler);
- Stream e = new Stream(Integer.valueOf(5), handler);
- Stream f = new Stream(Integer.valueOf(6), handler);
-
- b.rePrioritise(a, false, 16);
- c.rePrioritise(b, false, 16);
- e.rePrioritise(d, false, 16);
- f.rePrioritise(e, false, 16);
-
- // Action
- a.rePrioritise(f, false, 16);
- d.rePrioritise(c, false, 16);
-
- // Check parents
- Assert.assertEquals(f, a.getParentStream());
- Assert.assertEquals(a, b.getParentStream());
- Assert.assertEquals(handler, c.getParentStream());
- Assert.assertEquals(c, d.getParentStream());
- Assert.assertEquals(d, e.getParentStream());
- Assert.assertEquals(e, f.getParentStream());
-
- // Check children
- Assert.assertEquals(1, handler.getChildStreams().size());
- Assert.assertTrue(handler.getChildStreams().contains(c));
- Assert.assertEquals(1, a.getChildStreams().size());
- Assert.assertTrue(a.getChildStreams().contains(b));
- Assert.assertEquals(0, b.getChildStreams().size());
- Assert.assertEquals(1, c.getChildStreams().size());
- Assert.assertTrue(c.getChildStreams().contains(d));
- Assert.assertEquals(1, d.getChildStreams().size());
- Assert.assertTrue(d.getChildStreams().contains(e));
- Assert.assertEquals(1, e.getChildStreams().size());
- Assert.assertTrue(e.getChildStreams().contains(f));
- Assert.assertEquals(1, f.getChildStreams().size());
- Assert.assertTrue(f.getChildStreams().contains(a));
- }
-
-
- // https://bz.apache.org/bugzilla/show_bug.cgi?id=61682
- @Test
- public void testCircular03() {
- // Setup
- Http2UpgradeHandler handler =
- new Http2UpgradeHandler(new Http2Protocol(), null, null, new TesterSocketWrapper());
- Stream a = new Stream(Integer.valueOf(1), handler);
- Stream b = new Stream(Integer.valueOf(3), handler);
- Stream c = new Stream(Integer.valueOf(5), handler);
- Stream d = new Stream(Integer.valueOf(7), handler);
-
- // Action
- b.rePrioritise(a, false, 16);
- c.rePrioritise(a, false, 16);
- d.rePrioritise(b, false, 16);
- c.rePrioritise(handler, false, 16);
- a.rePrioritise(c, false, 16);
-
- // Check parents
- Assert.assertEquals(c, a.getParentStream());
- Assert.assertEquals(a, b.getParentStream());
- Assert.assertEquals(handler, c.getParentStream());
- Assert.assertEquals(b, d.getParentStream());
-
- // This triggers the StackOverflowError
- Assert.assertTrue(c.isDescendant(d));
-
- // Check children
- Assert.assertEquals(1, handler.getChildStreams().size());
- Assert.assertTrue(handler.getChildStreams().contains(c));
- Assert.assertEquals(1, c.getChildStreams().size());
- Assert.assertTrue(c.getChildStreams().contains(a));
- Assert.assertEquals(1, a.getChildStreams().size());
- Assert.assertTrue(a.getChildStreams().contains(b));
- Assert.assertEquals(1, b.getChildStreams().size());
- Assert.assertTrue(b.getChildStreams().contains(d));
- Assert.assertEquals(0, d.getChildStreams().size());
- }
-
-
- private static class TesterSocketWrapper extends SocketWrapperBase<NioChannel> {
-
- public TesterSocketWrapper() {
- super(null, new NioEndpoint());
- }
-
- @Override
- protected void populateRemoteHost() {
- }
-
- @Override
- protected void populateRemoteAddr() {
- }
-
- @Override
- protected void populateRemotePort() {
- }
-
- @Override
- protected void populateLocalName() {
- }
-
- @Override
- protected void populateLocalAddr() {
- }
-
- @Override
- protected void populateLocalPort() {
- }
-
- @Override
- public int read(boolean block, byte[] b, int off, int len) throws IOException {
- return 0;
- }
-
- @Override
- public int read(boolean block, ByteBuffer to) throws IOException {
- return 0;
- }
-
- @Override
- public boolean isReadyForRead() throws IOException {
- return false;
- }
-
- @Override
- public void setAppReadBufHandler(ApplicationBufferHandler handler) {
- }
-
- @Override
- protected void doClose() {
- }
-
- @Override
- protected boolean flushNonBlocking() throws IOException {
- return false;
- }
-
- @Override
- protected void doWrite(boolean block, ByteBuffer from) throws IOException {
- }
-
- @Override
- public void registerReadInterest() {
- }
-
- @Override
- public void registerWriteInterest() {
- }
-
- @Override
- public SendfileDataBase createSendfileData(String filename, long pos, long length) {
- return null;
- }
-
- @Override
- public SendfileState processSendfile(SendfileDataBase sendfileData) {
- return null;
- }
-
- @Override
- public void doClientAuth(SSLSupport sslSupport) throws IOException {
- }
-
- @Override
- public SSLSupport getSslSupport() {
- return null;
- }
-
- @Override
- protected <A> SocketWrapperBase<NioChannel>.OperationState<A> newOperationState(
- boolean read, ByteBuffer[] buffers, int offset, int length, BlockingMode block,
- long timeout, TimeUnit unit, A attachment, CompletionCheck check,
- CompletionHandler<Long, ? super A> handler, Semaphore semaphore,
- SocketWrapperBase<NioChannel>.VectoredIOCompletionHandler<A> completion) {
- return null;
- }
- }
-}
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_3.java b/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
deleted file mode 100644
index 32fdb9fed6..0000000000
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.coyote.http2;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Unit tests for Section 5.3 of
- * <a href="https://tools.ietf.org/html/rfc7540">RFC 7540</a>.
- * <br>
- * The order of tests in this class is aligned with the order of the
- * requirements in the RFC.
- *
- * Note: Unit tests for the examples described by each of the figures may be
- * found in {@link TestAbstractStream}.
- */
-public class TestHttp2Section_5_3 extends Http2TestBase {
-
- // Section 5.3.1
-
- @Test
- public void testStreamDependsOnSelf() throws Exception {
- http2Connect();
-
- sendPriority(3, 3, 15);
-
- parser.readFrame();
-
- Assert.assertEquals("3-RST-[1]\n", output.getTrace());
- }
-
-
- // Section 5.3.2
-
- @Test
- public void testWeighting() throws Exception {
-
- http2Connect();
-
- // This test uses small window updates that will trigger the excessive
- // overhead protection so disable it.
- http2Protocol.setOverheadWindowUpdateThreshold(0);
- // May also see (rarely, depends on timing) sequential 1 byte data
- // frames on the same Stream
- http2Protocol.setOverheadDataThreshold(0);
-
-
- // Default connection window size is 64k - 1. Initial request will have
- // used 8k (56k -1). Increase it to 57k
- sendWindowUpdate(0, 1 + 1024);
-
- // Use up 56k of the connection window
- for (int i = 3; i < 17; i += 2) {
- sendSimpleGetRequest(i);
- readSimpleGetResponse();
- }
-
- // Set the default window size to 1024 bytes
- sendSettings(0, false, new SettingValue(4, 1024));
- // Wait for the ack
- parser.readFrame();
- // Debugging Gump failure
- log.info(output.getTrace());
- output.clearTrace();
-
- // At this point the connection window should be 1k and any new stream
- // should have a window of 1k as well
-
- // Set up streams A=17, B=19, C=21
- sendPriority(17, 0, 15);
- sendPriority(19, 17, 3);
- sendPriority(21, 17, 11);
-
- // First, process a request on stream 17. This should consume both
- // stream 17's window and the connection window.
- sendSimpleGetRequest(17);
- // 17-headers, 17-1k-body
- parser.readFrame();
- // Debugging Gump failure
- log.info(output.getTrace());
- parser.readFrame();
- // Debugging Gump failure
- log.info(output.getTrace());
- output.clearTrace();
-
- // Send additional requests. Connection window is empty so only headers
- // will be returned.
- sendSimpleGetRequest(19);
- sendSimpleGetRequest(21);
-
- // Open up the flow control windows for stream 19 & 21 to more than the
- // size of a simple request (8k)
- sendWindowUpdate(19, 16*1024);
- sendWindowUpdate(21, 16*1024);
-
- // Read some frames
- // 19-headers, 21-headers
- parser.readFrame();
- // Debugging Gump failure
- log.info(output.getTrace());
- parser.readFrame();
- // Debugging Gump failure
- log.info(output.getTrace());
- output.clearTrace();
-
- // At this point 17 is blocked because the stream window is zero and
- // 19 & 21 are blocked because the connection window is zero.
- //
- // To test allocation, the connection window size is increased by 1.
- // This should result in an allocation of 1 byte each to streams 19 and
- // 21 but because each stream is processed in a separate thread it is
- // not guaranteed that both streams will be blocked when the connection
- // window size is increased. The test therefore sends 1 byte window
- // updates until a small body has been seen from each stream. Then the
- // tests sends a larger (1024 byte) window update and checks that it is
- // correctly distributed between the streams.
- //
- // The test includes a margin to allow for the potential differences in
- // response caused by timing differences on the server.
- //
- // The loop below handles 0, 1 or 2 stream being blocked
- // - If 0 streams are blocked the connection window will be set to one
- // and that will be consumed by the first stream to attempt to write.
- // That body frame will be read by the client. The stream will then be
- // blocked and the loop will start again.
- // - If 1 stream is blocked, the connection window will be set to one
- // which will then be consumed by the blocked stream. After writing
- // the single byte the stream will again be blocked and the loop will
- // start again.
- // - If 2 streams are blocked the connection window will be set to one
- // but one byte will be permitted for both streams (due to rounding in
- // the allocation). The window size should be -1 (see below). Two
- // frames (one for each stream will be written) one of which will be
- // consumed by the client. The loop will start again and the Window
- // size incremented to zero. No data will be written by the streams
- // but the second data frame written in the last iteration of the loop
- // will be read. The loop will then exit since frames from both
- // streams will have been observed.
- boolean seen19 = false;
- boolean seen21 = false;
- while (!seen19 || !seen21) {
- sendWindowUpdate(0, 1);
- parser.readFrame();
- // Debugging Gump failure
- log.info(output.getTrace());
- int[] data = parseBodyFrame(output.getTrace());
- if (data[0] == 19) {
- seen19 = true;
- } else if (data[0] == 21) {
- seen21 = true;
- } else {
- // Unexpected stream
- Assert.fail("Unexpected stream: [" + output.getTrace() + "]");
- }
- // A value of more than 1 here is unlikely but possible depending on
- // how threads are scheduled. This has been observed as high as 21
- // on ci.apache.org so allow a margin and use 30.
- if (data[1] > 30) {
- // Larger than expected body size
- Assert.fail("Larger than expected body: [" + output.getTrace() + "] " + data[1]);
- }
- output.clearTrace();
- }
-
- // Need to give both server side threads enough time to request an
- // allocation from the connection flow control window before sending
- // the next window update.
- Thread.sleep(1000);
-
- sendWindowUpdate(0, 1024);
- parser.readFrame();
-
- // Make sure you have read the big comment before the loop above. It is
- // possible that the timing of the server threads is such that there are
- // still small body frames to read.
- int[] data = parseBodyFrame(output.getTrace());
- while (data[1] < 20) {
- // Debugging Gump failure
- log.info(output.getTrace());
- output.clearTrace();
- parser.readFrame();
- data = parseBodyFrame(output.getTrace());
- }
-
- // Should now have two larger body frames. One has already been read.
- seen19 = false;
- seen21 = false;
- while (!seen19 && !seen21) {
- // Debugging Gump failure
- log.info(output.getTrace());
- if (data[0] == 19) {
- seen19 = true;
- // If everything works instantly this should be 256 but allow a
- // fairly large margin for timing differences
- if (data[1] < 216 || data[1] > 296) {
- Assert.fail("Unexpected body size: [" + output.getTrace() + "]");
- }
- } else if (data[0] == 21) {
- seen21 = true;
- // If everything works instantly this should be 768 but allow a
- // fairly large margin for timing differences
- if (data[1] < 728 || data[1] > 808) {
- Assert.fail("Unexpected body size: [" + output.getTrace() + "]");
- }
- } else {
- Assert.fail("Unexpected stream: [" + output.getTrace() + "]");
- }
- output.clearTrace();
- parser.readFrame();
- data = parseBodyFrame(output.getTrace());
- }
- // Debugging Gump failure
- log.info(output.getTrace());
- output.clearTrace();
-
- // Release everything and read all the remaining data
- sendWindowUpdate(0, 1024 * 1024);
- sendWindowUpdate(17, 1024 * 1024);
-
- // Read remaining frames
- // 17-7k-body, 19~8k-body, 21~8k-body
- for (int i = 0; i < 3; i++) {
- parser.readFrame();
- // Debugging Gump failure
- log.info(output.getTrace());
- }
- }
-
-
- private int[] parseBodyFrame(String output) {
- String[] parts = output.trim().split("-");
- if (parts.length != 3 || !"Body".equals(parts[1])) {
- Assert.fail("Unexpected output: [" + output + "]");
- }
-
- int[] result = new int[2];
-
- result[0] = Integer.parseInt(parts[0]);
- result[1] = Integer.parseInt(parts[2]);
-
- return result;
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 07/12: Implement new allocation algorithm
Posted by ma...@apache.org.
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
commit 14d3637bec7708d6a359165db889b6362d03925a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Dec 7 11:14:46 2022 +0000
Implement new allocation algorithm
Currently using defaults as priorities aren't read yet.
---
.../apache/coyote/http2/AbstractNonZeroStream.java | 55 +---
java/org/apache/coyote/http2/AbstractStream.java | 47 ----
java/org/apache/coyote/http2/Constants.java | 6 +-
.../apache/coyote/http2/Http2UpgradeHandler.java | 310 +++++++--------------
.../apache/coyote/http2/LocalStrings.properties | 2 -
.../apache/coyote/http2/LocalStrings_cs.properties | 1 -
.../apache/coyote/http2/LocalStrings_es.properties | 2 -
.../apache/coyote/http2/LocalStrings_fr.properties | 2 -
.../apache/coyote/http2/LocalStrings_ja.properties | 2 -
.../apache/coyote/http2/LocalStrings_ko.properties | 2 -
.../coyote/http2/LocalStrings_zh_CN.properties | 2 -
java/org/apache/coyote/http2/Stream.java | 24 +-
12 files changed, 129 insertions(+), 326 deletions(-)
diff --git a/java/org/apache/coyote/http2/AbstractNonZeroStream.java b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
index 0876fc88c6..5a9c3e3a48 100644
--- a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
+++ b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
@@ -17,7 +17,6 @@
package org.apache.coyote.http2;
import java.nio.ByteBuffer;
-import java.util.Iterator;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -36,8 +35,6 @@ abstract class AbstractNonZeroStream extends AbstractStream {
protected final StreamStateMachine state;
- private volatile int weight = Constants.DEFAULT_WEIGHT;
-
AbstractNonZeroStream(String connectionId, Integer identifier) {
super(identifier);
@@ -51,12 +48,6 @@ abstract class AbstractNonZeroStream extends AbstractStream {
}
- @Override
- final int getWeight() {
- return weight;
- }
-
-
/*
* General method used when reprioritising a stream and care needs to be
* taken not to create circular references.
@@ -71,27 +62,7 @@ abstract class AbstractNonZeroStream extends AbstractStream {
parent.getIdAsString(), Integer.toString(weight)));
}
- // Check if new parent is a descendant of this stream
- if (isDescendant(parent)) {
- parent.detachFromParent();
- // Cast is always safe since any descendant of this stream must be
- // an instance of AbstractNonZeroStream
- getParentStream().addChild((AbstractNonZeroStream) parent);
- }
-
- if (exclusive) {
- // Need to move children of the new parent to be children of this
- // stream. Slightly convoluted to avoid concurrent modification.
- Iterator<AbstractNonZeroStream> parentsChildren = parent.getChildStreams().iterator();
- while (parentsChildren.hasNext()) {
- AbstractNonZeroStream parentsChild = parentsChildren.next();
- parentsChildren.remove();
- this.addChild(parentsChild);
- }
- }
- detachFromParent();
- parent.addChild(this);
- this.weight = weight;
+ // TODO
}
@@ -109,29 +80,7 @@ abstract class AbstractNonZeroStream extends AbstractStream {
parent.getIdAsString(), Integer.toString(weight)));
}
- parent.addChild(this);
- this.weight = weight;
- }
-
-
- /*
- * Used when "recycling" a stream and replacing a Stream instance with a
- * RecycledStream instance.
- *
- * Replace this stream with the provided stream in the parent/child
- * hierarchy.
- *
- * Changes to the priority tree need to be synchronized at the connection
- * level. This is the caller's responsibility.
- */
- void replaceStream(AbstractNonZeroStream replacement) {
- getParentStream().addChild(replacement);
- detachFromParent();
- for (AbstractNonZeroStream child : getChildStreams()) {
- replacement.addChild(child);
- }
- getChildStreams().clear();
- replacement.weight = weight;
+ // TODO
}
diff --git a/java/org/apache/coyote/http2/AbstractStream.java b/java/org/apache/coyote/http2/AbstractStream.java
index dc651d30e9..d3533c5bd8 100644
--- a/java/org/apache/coyote/http2/AbstractStream.java
+++ b/java/org/apache/coyote/http2/AbstractStream.java
@@ -16,9 +16,6 @@
*/
package org.apache.coyote.http2;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -35,8 +32,6 @@ abstract class AbstractStream {
private final Integer identifier;
private final String idAsString;
- private volatile AbstractStream parentStream = null;
- private final Set<AbstractNonZeroStream> childStreams = ConcurrentHashMap.newKeySet();
private long windowSize = ConnectionSettingsBase.DEFAULT_INITIAL_WINDOW_SIZE;
private volatile int connectionAllocationRequested = 0;
@@ -64,46 +59,6 @@ abstract class AbstractStream {
}
- final void detachFromParent() {
- if (parentStream != null) {
- parentStream.getChildStreams().remove(this);
- parentStream = null;
- }
- }
-
-
- final void addChild(AbstractNonZeroStream child) {
- child.setParentStream(this);
- childStreams.add(child);
- }
-
-
- final boolean isDescendant(AbstractStream stream) {
- // Is the passed in Stream a descendant of this Stream?
- // Start at the passed in Stream and work up
- AbstractStream parent = stream.getParentStream();
- while (parent != null && parent != this) {
- parent = parent.getParentStream();
- }
- return parent != null;
- }
-
-
- final AbstractStream getParentStream() {
- return parentStream;
- }
-
-
- final void setParentStream(AbstractStream parentStream) {
- this.parentStream = parentStream;
- }
-
-
- final Set<AbstractNonZeroStream> getChildStreams() {
- return childStreams;
- }
-
-
final synchronized void setWindowSize(long windowSize) {
this.windowSize = windowSize;
}
@@ -181,6 +136,4 @@ abstract class AbstractStream {
abstract String getConnectionId();
-
- abstract int getWeight();
}
diff --git a/java/org/apache/coyote/http2/Constants.java b/java/org/apache/coyote/http2/Constants.java
index 739ae7eb12..e1ee63bb34 100644
--- a/java/org/apache/coyote/http2/Constants.java
+++ b/java/org/apache/coyote/http2/Constants.java
@@ -19,7 +19,11 @@ package org.apache.coyote.http2;
public class Constants {
// Prioritisation
- public static final int DEFAULT_WEIGHT = 16;
+ public static final int DEFAULT_URGENCY = 3;
+ public static final boolean DEFAULT_INCREMENTAL = false;
+ // Range 0 to 7 inclusive
+ public static final int URGENCY_RANGE = 8;
+
// Parsing
static final int DEFAULT_HEADER_READ_BUFFER_SIZE = 1024;
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index a2405994a8..a5ebde3b26 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -20,15 +20,15 @@ import java.io.EOFException;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Queue;
import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentNavigableMap;
import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
@@ -94,8 +94,6 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
private static final HeaderSink HEADER_SINK = new HeaderSink();
- private final Object priorityTreeLock = new Object();
-
protected final String connectionId;
protected final Http2Protocol protocol;
@@ -131,7 +129,7 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
private final AtomicInteger nextLocalStreamId = new AtomicInteger(2);
private final PingManager pingManager = getPingManager();
private volatile int newStreamsSinceLastPrune = 0;
- private final Set<AbstractStream> backLogStreams = ConcurrentHashMap.newKeySet();
+ private final Set<Stream> backLogStreams = new HashSet<>();
private long backLogSize = 0;
// The time at which the connection will timeout unless data arrives before
// then. -1 means no timeout.
@@ -954,11 +952,6 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
stream.setConnectionAllocationRequested(reservation);
backLogSize += reservation;
backLogStreams.add(stream);
- // Add the parents as well
- AbstractStream parent = stream.getParentStream();
- while (parent != null && backLogStreams.add(parent)) {
- parent = parent.getParentStream();
- }
}
} else if (windowSize < reservation) {
allocation = (int) windowSize;
@@ -1070,8 +1063,7 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
private synchronized Set<AbstractStream> releaseBackLog(int increment) throws Http2Exception {
Set<AbstractStream> result = new HashSet<>();
- int remaining = increment;
- if (backLogSize < remaining) {
+ if (backLogSize < increment) {
// Can clear the whole backlog
for (AbstractStream stream : backLogStreams) {
if (stream.getConnectionAllocationRequested() > 0) {
@@ -1079,23 +1071,90 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
stream.setConnectionAllocationRequested(0);
}
}
- remaining -= backLogSize;
+ // Cast is safe due to test above
+ int remaining = increment - (int) backLogSize;
backLogSize = 0;
super.incrementWindowSize(remaining);
result.addAll(backLogStreams);
backLogStreams.clear();
} else {
- allocate(this, remaining);
- Iterator<AbstractStream> streamIter = backLogStreams.iterator();
- while (streamIter.hasNext()) {
- AbstractStream stream = streamIter.next();
- if (stream.getConnectionAllocationMade() > 0) {
- backLogSize -= stream.getConnectionAllocationMade();
- backLogSize -= stream.getConnectionAllocationRequested();
- stream.setConnectionAllocationRequested(0);
- result.add(stream);
- streamIter.remove();
+ // Can't clear the whole backlog.
+ // Need streams in priority order
+ Set<Stream> orderedStreams = new ConcurrentSkipListSet<>(Comparator.comparingInt(Stream::getUrgency)
+ .thenComparing(Stream::getIncremental).thenComparing(Stream::getIdAsInt));
+ orderedStreams.addAll(backLogStreams);
+
+ // Iteration 1. Need to work out how much we can clear.
+ long urgencyWhereAllocationIsExhausted = 0;
+ long requestedAllocationForIncrementalStreams = 0;
+ int remaining = increment;
+ Iterator<Stream> orderedStreamsIterator = orderedStreams.iterator();
+ while (orderedStreamsIterator.hasNext()) {
+ Stream s = orderedStreamsIterator.next();
+ if (urgencyWhereAllocationIsExhausted < s.getUrgency()) {
+ if (remaining < 1) {
+ break;
+ }
+ requestedAllocationForIncrementalStreams = 0;
+ }
+ urgencyWhereAllocationIsExhausted = s.getUrgency();
+ if (s.getIncremental()) {
+ requestedAllocationForIncrementalStreams += s.getConnectionAllocationRequested();
+ remaining -= s.getConnectionAllocationRequested();
+ } else {
+ remaining -= s.getConnectionAllocationRequested();
+ if (remaining < 1) {
+ break;
+ }
+ }
+ }
+
+ // Iteration 2. Allocate.
+ // Reset for second iteration
+ remaining = increment;
+ orderedStreamsIterator = orderedStreams.iterator();
+ while (orderedStreamsIterator.hasNext()) {
+ Stream s = orderedStreamsIterator.next();
+ if (s.getUrgency() < urgencyWhereAllocationIsExhausted) {
+ // Can fully allocate
+ remaining = allocate(s, remaining);
+ result.add(s);
+ orderedStreamsIterator.remove();
+ backLogStreams.remove(s);
+ } else if (requestedAllocationForIncrementalStreams == 0) {
+ // Allocation ran out in non-incremental streams so fully
+ // allocate in iterator order until allocation is exhausted
+ remaining = allocate(s, remaining);
+ result.add(s);
+ if (s.getConnectionAllocationRequested() == 0) {
+ // Fully allocated
+ orderedStreamsIterator.remove();
+ backLogStreams.remove(s);
+ }
+ if (remaining < 1) {
+ break;
+ }
+ } else {
+ // Allocation ran out in incremental streams. Distribute
+ // remaining allocation between the incremental streams at
+ // this urgency level.
+ if (s.getUrgency() != urgencyWhereAllocationIsExhausted) {
+ break;
+ }
+
+ int share = (int) (s.getConnectionAllocationRequested() * remaining / requestedAllocationForIncrementalStreams);
+ if (share == 0) {
+ share = 1;
+ }
+ allocate(s, share);
+ result.add(s);
+ if (s.getConnectionAllocationRequested() == 0) {
+ // Fully allocated (unlikely but possible due to
+ // rounding if only a few bytes required).
+ orderedStreamsIterator.remove();
+ backLogStreams.remove(s);
+ }
}
}
}
@@ -1123,67 +1182,12 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
leftToAllocate = leftToAllocate - allocatedThisTime;
}
- if (leftToAllocate == 0) {
- return 0;
- }
-
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.allocate.left",
getConnectionId(), stream.getIdAsString(), Integer.toString(leftToAllocate)));
}
- // Recipients are children of the current stream that are in the
- // backlog.
- Set<AbstractStream> recipients = new HashSet<>(stream.getChildStreams());
- recipients.retainAll(backLogStreams);
-
- // Loop until we run out of allocation or recipients
- while (leftToAllocate > 0) {
- if (recipients.size() == 0) {
- if (stream.getConnectionAllocationMade() == 0) {
- backLogStreams.remove(stream);
- }
- if (stream.getIdAsInt() == 0) {
- throw new IllegalStateException();
- }
- return leftToAllocate;
- }
-
- int totalWeight = 0;
- for (AbstractStream recipient : recipients) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.allocate.recipient",
- getConnectionId(), stream.getIdAsString(), recipient.getIdAsString(),
- Integer.toString(recipient.getWeight())));
- }
- totalWeight += recipient.getWeight();
- }
-
- // Use an Iterator so fully allocated children/recipients can be
- // removed.
- Iterator<AbstractStream> iter = recipients.iterator();
- int allocated = 0;
- while (iter.hasNext()) {
- AbstractStream recipient = iter.next();
- int share = leftToAllocate * recipient.getWeight() / totalWeight;
- if (share == 0) {
- // This is to avoid rounding issues triggering an infinite
- // loop. It will cause a very slight over allocation but
- // HTTP/2 should cope with that.
- share = 1;
- }
- int remainder = allocate(recipient, share);
- // Remove recipients that receive their full allocation so that
- // they are excluded from the next allocation round.
- if (remainder > 0) {
- iter.remove();
- }
- allocated += (share - remainder);
- }
- leftToAllocate -= allocated;
- }
-
- return 0;
+ return leftToAllocate;
}
@@ -1289,7 +1293,6 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
// maximum number of concurrent streams.
long max = localSettings.getMaxConcurrentStreams();
- // Only need ~+10% for streams that are in the priority tree,
// Ideally need to retain information for a "significant" amount of time
// after sending END_STREAM (RFC 7540, page 20) so we detect potential
// connection error. 5x seems reasonable. The client will have had
@@ -1307,100 +1310,23 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
}
int toClose = size - (int) max;
- if (toClose < 1) {
- return;
- }
- // Need to try and close some streams.
- // Try to close streams in this order
- // 1. Completed streams used for a request with no children
- // 2. Completed streams used for a request with children
- // 3. Closed final streams
- //
- // The pruning halts as soon as enough streams have been pruned.
-
- // Use these sets to track the different classes of streams
- TreeSet<Integer> candidatesStepTwo = new TreeSet<>();
- TreeSet<Integer> candidatesStepThree = new TreeSet<>();
-
- // Step 1
- // Iterator is in key order so we automatically have the oldest streams
- // first
- // Tests depend on parent/child relationship between streams so need to
- // lock on priorityTreeLock to ensure a consistent view.
- synchronized (priorityTreeLock) {
- for (AbstractNonZeroStream stream : streams.values()) {
- // Never remove active streams
- if (stream instanceof Stream && ((Stream) stream).isActive()) {
- continue;
- }
-
- if (stream.isClosedFinal()) {
- // This stream went from IDLE to CLOSED and is likely to have
- // been created by the client as part of the priority tree.
- // Candidate for step 3.
- candidatesStepThree.add(stream.getIdentifier());
- } else if (stream.getChildStreams().size() == 0) {
- // Prune it
- AbstractStream parent = stream.getParentStream();
- streams.remove(stream.getIdentifier());
- stream.detachFromParent();
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.pruned", connectionId, stream.getIdAsString()));
- }
- if (--toClose < 1) {
- return;
- }
-
- // If removing this child made the parent childless then see if
- // the parent can be removed.
- // Don't try and remove Stream 0 as that is the connection
- // Don't try and remove 'newer' streams. We'll get to them as we
- // work through the ordered list of streams.
- while (toClose > 0 && parent.getIdAsInt() > 0 && parent.getIdAsInt() < stream.getIdAsInt() &&
- parent.getChildStreams().isEmpty()) {
- // This cast is safe since we know parent ID > 0 therefore
- // this isn't the connection
- stream = (AbstractNonZeroStream) parent;
- parent = stream.getParentStream();
- streams.remove(stream.getIdentifier());
- stream.detachFromParent();
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.pruned", connectionId, stream.getIdAsString()));
- }
- if (--toClose < 1) {
- return;
- }
- // Also need to remove this stream from the step 2 list
- candidatesStepTwo.remove(stream.getIdentifier());
- }
- } else {
- // Closed, with children. Candidate for step 2.
- candidatesStepTwo.add(stream.getIdentifier());
- }
- }
- }
-
- // Process the P2 list
- for (Integer streamIdToRemove : candidatesStepTwo) {
- removeStreamFromPriorityTree(streamIdToRemove);
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.pruned", connectionId, streamIdToRemove));
- }
- if (--toClose < 1) {
+ // Need to try and prune some streams. Prune streams starting with the
+ // oldest. Pruning stops as soon as enough streams have been pruned.
+ // Iterator is in key order.
+ for (AbstractNonZeroStream stream : streams.values()) {
+ if (toClose < 1) {
return;
}
- }
-
- while (toClose > 0 && candidatesStepThree.size() > 0) {
- Integer streamIdToRemove = candidatesStepThree.pollLast();
- removeStreamFromPriorityTree(streamIdToRemove);
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.prunedPriority", connectionId, streamIdToRemove));
+ if (stream instanceof Stream && ((Stream) stream).isActive()) {
+ continue;
}
- if (--toClose < 1) {
- return;
+ streams.remove(stream.getIdentifier());
+ toClose--;
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("upgradeHandler.pruned", connectionId, stream.getIdAsString()));
}
+
}
if (toClose > 0) {
@@ -1410,33 +1336,6 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
}
- private void removeStreamFromPriorityTree(Integer streamIdToRemove) {
- synchronized (priorityTreeLock) {
- AbstractNonZeroStream streamToRemove = streams.remove(streamIdToRemove);
- // Move the removed Stream's children to the removed Stream's
- // parent.
- Set<AbstractNonZeroStream> children = streamToRemove.getChildStreams();
- if (children.size() == 1) {
- // Shortcut
- children.iterator().next().rePrioritise(
- streamToRemove.getParentStream(), streamToRemove.getWeight());
- } else {
- int totalWeight = 0;
- for (AbstractNonZeroStream child : children) {
- totalWeight += child.getWeight();
- }
- for (AbstractNonZeroStream child : children) {
- children.iterator().next().rePrioritise(
- streamToRemove.getParentStream(),
- streamToRemove.getWeight() * child.getWeight() / totalWeight);
- }
- }
- streamToRemove.detachFromParent();
- children.clear();
- }
- }
-
-
void push(Request request, Stream associatedStream) throws IOException {
if (localSettings.getMaxConcurrentStreams() < activeRemoteStreamCount.incrementAndGet()) {
// If there are too many open streams, simply ignore the push
@@ -1471,12 +1370,6 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
}
- @Override
- protected final int getWeight() {
- return 0;
- }
-
-
private void reduceOverheadCount(FrameType frameType) {
// A non-overhead frame reduces the overhead count by
// Http2Protocol.DEFAULT_OVERHEAD_REDUCTION_FACTOR. A simple browser
@@ -1909,15 +1802,10 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
void replaceStream(AbstractNonZeroStream original, AbstractNonZeroStream replacement) {
- synchronized (priorityTreeLock) {
- AbstractNonZeroStream current = streams.get(original.getIdentifier());
- // Might already have been recycled or removed from the priority
- // tree entirely. Only replace it if the full stream is still in the
- // priority tree.
- if (current instanceof Stream) {
- streams.put(original.getIdentifier(), replacement);
- original.replaceStream(replacement);
- }
+ AbstractNonZeroStream current = streams.get(original.getIdentifier());
+ // Only replace the stream if it currently uses the full implementation.
+ if (current instanceof Stream) {
+ streams.put(original.getIdentifier(), replacement);
}
}
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 547a1880d1..3670d60f42 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -127,7 +127,6 @@ streamStateMachine.invalidFrame=Connection [{0}], Stream [{1}], State [{2}], Fra
upgradeHandler.allocate.debug=Connection [{0}], Stream [{1}], allocated [{2}] bytes
upgradeHandler.allocate.left=Connection [{0}], Stream [{1}], [{2}] bytes unallocated - trying to allocate to children
-upgradeHandler.allocate.recipient=Connection [{0}], Stream [{1}], potential recipient [{2}] with weight [{3}]
upgradeHandler.connectionError=Connection error
upgradeHandler.fallToDebug=\n\
\ Note: further occurrences of HTTP/2 stream errors will be logged at DEBUG level.
@@ -144,7 +143,6 @@ upgradeHandler.prefaceReceived=Connection [{0}], Connection preface received fro
upgradeHandler.pruneIncomplete=Connection [{0}], Stream [{1}], Failed to fully prune the connection because there are [{2}] too many active streams
upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams. Limit is [{1}] and there are currently [{2}] streams.
upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
-upgradeHandler.prunedPriority=Connection [{0}] Pruned unused stream [{1}] that may have been part of the priority tree
upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from backlog
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received due to [{2}]
upgradeHandler.enableRfc7450Priorities=Connection [{0}], RFC 7450 priorities may not be enabled after being disabled in the initial connection settings frame (see RFC 9218)
diff --git a/java/org/apache/coyote/http2/LocalStrings_cs.properties b/java/org/apache/coyote/http2/LocalStrings_cs.properties
index 88e888b023..b07e9902d1 100644
--- a/java/org/apache/coyote/http2/LocalStrings_cs.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_cs.properties
@@ -31,7 +31,6 @@ http2Parser.processFramePushPromise=Connection [{0}], Stream [{1}], Rámec pro P
upgradeHandler.pingFailed=Spojení [{0}] pro odeslání příkazu ping na klienta selhalo
upgradeHandler.prefaceReceived=Spojení [{0}], přírava spojení přijata od klienta
upgradeHandler.pruneIncomplete=Plné omezení spojení [{0}] selhalo, neboť streamy byly aktivní / použité v prioritním stromu. Existuje [{2}] příliš mnoho streamů
-upgradeHandler.prunedPriority=Spojení [{0}] omezilo nepoužívaný stream [{1}], který mohl být částí prioritního stromu
upgradeHandler.rst.debug=Spojení [{0}], Stream [{1}], Chyba [{2}], Zpráva [{3}], RST (zavírání streamu)
upgradeHandler.sendPrefaceFail=Spojení [{0}], selhalo odeslánízahájení klientovi
upgradeHandler.socketCloseFailed=Chyba zavírání socketu
diff --git a/java/org/apache/coyote/http2/LocalStrings_es.properties b/java/org/apache/coyote/http2/LocalStrings_es.properties
index acd5243110..2664cc5f8c 100644
--- a/java/org/apache/coyote/http2/LocalStrings_es.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_es.properties
@@ -44,12 +44,10 @@ streamProcessor.error.connection=Conexión [{0}], Flujo [{1}], Ha ocurrido un er
streamStateMachine.debug.change=Conexión [{0}], Flujo [{1}], Estado cambió de [{2}] a [{3}]
upgradeHandler.allocate.left=Conexión [{0}], Flujo [{1}], [{2}] bytes no asignados - tratando de asignar en el hijo
-upgradeHandler.allocate.recipient=Conexión [{0}], Flujo [{1}], recipiente potencial [{2}] con peso [{3}]
upgradeHandler.ioerror=Conexión [{0}]
upgradeHandler.pingFailed=Conexión [{0}] falló al hacer ping al cliente
upgradeHandler.prefaceReceived=Conexión [{0}], Pre face de conexión recibida del cliente\n
upgradeHandler.pruneIncomplete=La conexión [{0}] Falló al podar completamente la conexión porque existen flujos activos / usados en el árbol de priorida. Existen [{2}] muchos flujos
-upgradeHandler.prunedPriority=La conexión [{0}] ha cortado el flujo en desuso [{1}] el cual podía ser parte del árbol prioritario
upgradeHandler.rst.debug=Conexión [{0}], Flujo [{1}], Error [{2}], Mensaje [{3}], RST (cerrando flujo)
upgradeHandler.sendPrefaceFail=La conexión [{0}], Falló al enviar el prefacio al cliente\n
upgradeHandler.socketCloseFailed=Error cerrando el socket
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index e8551e4370..9044d4f47f 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -126,7 +126,6 @@ streamStateMachine.invalidFrame=Connection [{0}], Flux [{1}], Etat [{2}], Type d
upgradeHandler.allocate.debug=Connection [{0}], Flux [{1}], [{2}] octets alloués
upgradeHandler.allocate.left=Connection [{0}], Flux [{1}], [{2}] octets désalloués, essai d''allocation aux enfants
-upgradeHandler.allocate.recipient=Connection [{0}], Flux [{1}], receveur potentiel [{2}] avec poids [{3}]
upgradeHandler.connectionError=Erreur de la connection
upgradeHandler.fallToDebug=\n\
\ Note: les occurrences suivantes d'erreurs de stream HTTP/2 seront enregistrées au niveau DEBUG.
@@ -143,7 +142,6 @@ upgradeHandler.prefaceReceived=Connection [{0}], préface de la connection recue
upgradeHandler.pruneIncomplete=Connexion [{0}], Flux [{1}], Erreur lors de l''élimination complète de la connexion parce que des flux sont encore actifs / utilisés dans l''arbre de priorité, il y a [{2}] flux en trop
upgradeHandler.pruneStart=Connection [{0}] Début de l''élimination des anciens flux, la limite est de [{1}] et il y a actuellement [{2}] flux
upgradeHandler.pruned=Connection [{0}] Elimination du flux terminé [{1}]
-upgradeHandler.prunedPriority=La connexion [{0}] a élagué le flux inutilisé [{1}] qui faisait peut-être partie de l''arbre de priorité
upgradeHandler.releaseBacklog=Connection [{0}], Flux [{1}] enlevée de la file d''attente
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset a été reçu à cause de [{2}]
upgradeHandler.rst.debug=Connexion [{0}], Flux [{1}], Erreur [{2}], Message [{3}], RST (fermeture du flux)
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index b0e237d260..a9b7b8b59d 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -126,7 +126,6 @@ streamStateMachine.invalidFrame=コネクション [{0}]、ストリーム [{1}]
upgradeHandler.allocate.debug=コネクション [{0}]、ストリーム [{1}]、割り当てられた [{2}] バイト
upgradeHandler.allocate.left=コネクション [{0}]、ストリーム [{1}]、[{2}] バイトが未割り当て - 子への割り当てを試みています
-upgradeHandler.allocate.recipient=コネクション [{0}]、ストリーム [{1}]、重み [{3}] の潜在的な受信者 [{2}]
upgradeHandler.connectionError=接続エラー
upgradeHandler.fallToDebug=注: HTTP/2 ストリームのエラーがさらに発生すると、DEBUG レベルでログに記録されます。
upgradeHandler.goaway.debug=コネクション [{0}]、Goaway、最終ストリーム [{1}]、エラーコード [{2}]、デバッグデータ [{3}]
@@ -142,7 +141,6 @@ upgradeHandler.prefaceReceived=コネクション [{0}]、クライアントか
upgradeHandler.pruneIncomplete=コネクション [{0}]、ストリーム [{1}]、コネクションを削除できませんでした。アクティブなストリーム数 [{2}] は多すぎます。
upgradeHandler.pruneStart=コネクション [{0}] 古いストリームのプルーニングを開始します。 上限は [{1}] で、現在 [{2}] ストリームがあります。
upgradeHandler.pruned=コネクション [{0}]、完了したストリーム [{1}] は削除します。
-upgradeHandler.prunedPriority=コネクション [{0}]、優先度木に登録されていた可能性のある未使用のストリーム [{1}] を取り除きました。
upgradeHandler.releaseBacklog=コネクション [{0}]、ストリーム [{1}] はバックログから解放されました
upgradeHandler.reset.receive=Connection[{0}]、Stream[{1}]、[{2}]のためにリセットを受信しました
upgradeHandler.rst.debug=コネクション [{0}]、ストリーム [{1}]、エラー [{2}]、メッセージ [{3}]、RST (ストリームを切断します)
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index e8b1825382..a8adb1f976 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -125,7 +125,6 @@ streamStateMachine.invalidFrame=연결 [{0}], 스트림 [{1}], 상태 [{2}], 프
upgradeHandler.allocate.debug=연결 [{0}], 스트림 [{1}], [{2}] 바이트를 할당함.
upgradeHandler.allocate.left=연결 [{0}], 스트림 [{1}], [{2}] 바이트들이 할당 해제되었습니다 - 자식들에 할당하려 시도합니다.
-upgradeHandler.allocate.recipient=연결 [{0}], 스트림 [{1}], 가중치 [{3}]의 잠재적 수신자 [{2}]
upgradeHandler.connectionError=연결 오류
upgradeHandler.goaway.debug=연결 [{0}], Goaway, 마지막 스트림 [{1}], 오류 코드 [{2}], 디버그 데이터 [{3}]
upgradeHandler.init=연결 [{0}], 상태 [{1}]
@@ -140,7 +139,6 @@ upgradeHandler.prefaceReceived=연결 [{0}]: 연결 preface를 클라이언트
upgradeHandler.pruneIncomplete=연결 [{0}]: 스트림들이 Priority tree에서 활성화되어 있거나 사용되고 있기 때문에, 해당 연결을 완전히 제거하지 못했습니다. 너무 많은 스트림들이 존재합니다: [{2}].
upgradeHandler.pruneStart=연결 [{0}]: 이전 스트림들에 대한 가지치기를 시작합니다. 한계값은 [{1}] 이고, 현재 [{2}]개의 스트림들이 존재합니다.
upgradeHandler.pruned=연결 [{0}]이(가) 완료된 스트림 [{1}]을(를) 제거했습니다.
-upgradeHandler.prunedPriority=연결 [{0}]이(가) 사용되지 않는 스트림 [{1}]을(를) 제거합니다. 해당 스트림은 priority tree의 일부였을 수 있습니다.
upgradeHandler.releaseBacklog=연결 [{0}], 스트림 [{1}]이(가) 백로그로부터 해제되었습니다.
upgradeHandler.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 리셋을 수신했습니다.
upgradeHandler.rst.debug=연결 [{0}], 스트림 [{1}], 오류 [{2}], 메시지 [{3}], RST (스트림을 닫습니다)
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index d0713e931a..ec4c7612ba 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -126,7 +126,6 @@ streamStateMachine.invalidFrame=连接{0}、流{1}、状态{2}、帧类型{3}
upgradeHandler.allocate.debug=连接[{0}]，流[{1}]，已分配[{2}]字节
upgradeHandler.allocate.left=连接[{0}]，流[{1}]，[{2}]字节未分配 - 尝试分配给子项
-upgradeHandler.allocate.recipient=(:连接[{0}]，流[{1}]，潜在接收者[{2}]，权重为[{3}]
upgradeHandler.connectionError=连接错误
upgradeHandler.goaway.debug=连接[{0}]，离开，最后的流[{1}]，错误码[{2}]，调试数据[{3}]
upgradeHandler.init=连接[{0}]，状态[{1}]
@@ -141,7 +140,6 @@ upgradeHandler.prefaceReceived=连接[{0}]，从客户端收到连接准备。
upgradeHandler.pruneIncomplete=连接[{0}]，流[{1}]，无法完全修剪连接，因为有[{2}]个活动流太多
upgradeHandler.pruneStart=连接[{0}]正在开始修剪旧流。限制为[{1}]，当前有[{2}]个流。
upgradeHandler.pruned=连接[{0}]已修剪完成的流[{1}]
-upgradeHandler.prunedPriority=连接[{0}]已经成为了属于优先级树中未使用的流[{1}]
upgradeHandler.releaseBacklog=连接[{0}]，流[{1}]已从待办事项列表中释放
upgradeHandler.reset.receive=连接[{0}],流[{1}],由于[{2}]而重置
upgradeHandler.rst.debug=连接[{0}]，流[{1}]，错误[{2}]，消息[{3}]，RST（关闭流）
diff --git a/java/org/apache/coyote/http2/Stream.java b/java/org/apache/coyote/http2/Stream.java
index 53850fc384..f255029993 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -95,6 +95,9 @@ class Stream extends AbstractNonZeroStream implements HeaderEmitter {
private Object pendingWindowUpdateForStreamLock = new Object();
private int pendingWindowUpdateForStream = 0;
+ private volatile int urgency = Constants.DEFAULT_URGENCY;
+ private volatile boolean incremental = Constants.DEFAULT_INCREMENTAL;
+
Stream(Integer identifier, Http2UpgradeHandler handler) {
this(identifier, handler, null);
@@ -104,7 +107,6 @@ class Stream extends AbstractNonZeroStream implements HeaderEmitter {
Stream(Integer identifier, Http2UpgradeHandler handler, Request coyoteRequest) {
super(handler.getConnectionId(), identifier);
this.handler = handler;
- handler.addChild(this);
setWindowSize(handler.getRemoteSettings().getInitialWindowSize());
if (coyoteRequest == null) {
// HTTP/2 new request
@@ -833,6 +835,26 @@ class Stream extends AbstractNonZeroStream implements HeaderEmitter {
}
+ public int getUrgency() {
+ return urgency;
+ }
+
+
+ public void setUrgency(int urgency) {
+ this.urgency = urgency;
+ }
+
+
+ public boolean getIncremental() {
+ return incremental;
+ }
+
+
+ public void setIncremental(boolean incremental) {
+ this.incremental = incremental;
+ }
+
+
class StreamOutputBuffer implements HttpOutputBuffer, WriteBuffer.Sink {
private final ByteBuffer buffer = ByteBuffer.allocate(8 * 1024);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/12: Ensure RFC 7540 priorities are not re-enabled
Posted by ma...@apache.org.
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
commit 89f7e83ac7664fad5eaeb5bd6df11ba3e368acab
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 6 18:14:00 2022 +0000
Ensure RFC 7540 priorities are not re-enabled
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 5 +++++
java/org/apache/coyote/http2/LocalStrings.properties | 1 +
2 files changed, 6 insertions(+)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 8d402c64b9..c89fe44c1f 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1835,6 +1835,11 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
h2e.getError(), stream.getIdAsInt()));
}
}
+ } else if (setting == Setting.NO_RFC7540_PRIORITIES) {
+ // This should not be changed after the initial setting
+ if (value != ConnectionSettingsBase.DEFAULT_NO_RFC7540_PRIORITIES) {
+ throw new ConnectionException(sm.getString("upgradeHandler.enableRfc7450Priorities", connectionId), Http2Error.PROTOCOL_ERROR);
+ }
} else {
remoteSettings.set(setting, value);
}
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 7587a86f33..7f7bf3a8c6 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -148,6 +148,7 @@ upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
upgradeHandler.prunedPriority=Connection [{0}] Pruned unused stream [{1}] that may have been part of the priority tree
upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from backlog
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received due to [{2}]
+upgradeHandler.enableRfc7450Priorities=Connection [{0}], RFC 7450 priorities may not be enabled after being disabled in the initial connection settings frame (see RFC 9218)
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], Message [{3}], RST (closing stream)
upgradeHandler.sendPrefaceFail=Connection [{0}], Failed to send preface to client
upgradeHandler.sendfile.reservation=Connection [{0}], Stream [{1}], Connection reservation [{2}], Stream reservation [{3}] prior to sendfile write
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/12: Add NO_RFC7540_PRIORITIES setting to enum
Posted by ma...@apache.org.
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
commit abf5114ab3c230bdd3c033c50e56004b3e486164
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 6 18:00:48 2022 +0000
Add NO_RFC7540_PRIORITIES setting to enum
---
java/org/apache/coyote/http2/Setting.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/coyote/http2/Setting.java b/java/org/apache/coyote/http2/Setting.java
index 54b99dacba..29dc73f201 100644
--- a/java/org/apache/coyote/http2/Setting.java
+++ b/java/org/apache/coyote/http2/Setting.java
@@ -23,6 +23,7 @@ enum Setting {
INITIAL_WINDOW_SIZE(4),
MAX_FRAME_SIZE(5),
MAX_HEADER_LIST_SIZE(6),
+ NO_RFC7540_PRIORITIES(9),
UNKNOWN(Integer.MAX_VALUE);
private final int id;
@@ -60,6 +61,9 @@ enum Setting {
case 6: {
return MAX_HEADER_LIST_SIZE;
}
+ case 9: {
+ return NO_RFC7540_PRIORITIES;
+ }
default: {
return Setting.UNKNOWN;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 11/12: Add support for reading priority update frame
Posted by ma...@apache.org.
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
commit 77d5efdc462052205a05c9382494c4383dd5f938
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 9 15:49:32 2022 +0000
Add support for reading priority update frame
---
java/org/apache/coyote/http2/FrameType.java | 25 +++++++------
java/org/apache/coyote/http2/Http2AsyncParser.java | 3 ++
java/org/apache/coyote/http2/Http2Parser.java | 41 ++++++++++++++++++++++
.../apache/coyote/http2/Http2UpgradeHandler.java | 12 +++++++
.../apache/coyote/http2/LocalStrings.properties | 2 ++
test/org/apache/coyote/http2/Http2TestBase.java | 7 ++++
6 files changed, 79 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/coyote/http2/FrameType.java b/java/org/apache/coyote/http2/FrameType.java
index 8734944595..acd60eaa2c 100644
--- a/java/org/apache/coyote/http2/FrameType.java
+++ b/java/org/apache/coyote/http2/FrameType.java
@@ -22,17 +22,18 @@ import org.apache.tomcat.util.res.StringManager;
enum FrameType {
- DATA (0, false, true, null, false),
- HEADERS (1, false, true, null, true),
- PRIORITY (2, false, true, (x) -> x == 5, false),
- RST (3, false, true, (x) -> x == 4, false),
- SETTINGS (4, true, false, (x) -> x % 6 == 0, true),
- PUSH_PROMISE (5, false, true, (x) -> x >= 4, true),
- PING (6, true, false, (x) -> x == 8, false),
- GOAWAY (7, true, false, (x) -> x >= 8, false),
- WINDOW_UPDATE (8, true, true, (x) -> x == 4, true),
- CONTINUATION (9, false, true, null, true),
- UNKNOWN (256, true, true, null, false);
+ DATA ( 0, false, true, null, false),
+ HEADERS ( 1, false, true, null, true),
+ PRIORITY ( 2, false, true, (x) -> x == 5, false),
+ RST ( 3, false, true, (x) -> x == 4, false),
+ SETTINGS ( 4, true, false, (x) -> x % 6 == 0, true),
+ PUSH_PROMISE ( 5, false, true, (x) -> x >= 4, true),
+ PING ( 6, true, false, (x) -> x == 8, false),
+ GOAWAY ( 7, true, false, (x) -> x >= 8, false),
+ WINDOW_UPDATE ( 8, true, true, (x) -> x == 4, true),
+ CONTINUATION ( 9, false, true, null, true),
+ PRIORITY_UPDATE ( 16, true, false, (x) -> x >= 4, true),
+ UNKNOWN (256, true, true, null, false);
private static final StringManager sm = StringManager.getManager(FrameType.class);
@@ -107,6 +108,8 @@ enum FrameType {
return WINDOW_UPDATE;
case 9:
return CONTINUATION;
+ case 16:
+ return PRIORITY_UPDATE;
default:
return UNKNOWN;
}
diff --git a/java/org/apache/coyote/http2/Http2AsyncParser.java b/java/org/apache/coyote/http2/Http2AsyncParser.java
index a2043557b7..e05eeea4a2 100644
--- a/java/org/apache/coyote/http2/Http2AsyncParser.java
+++ b/java/org/apache/coyote/http2/Http2AsyncParser.java
@@ -276,6 +276,9 @@ class Http2AsyncParser extends Http2Parser {
case CONTINUATION:
readContinuationFrame(streamId, flags, payloadSize, payload);
break;
+ case PRIORITY_UPDATE:
+ readPriorityUpdateFrame(payloadSize, payload);
+ break;
case UNKNOWN:
readUnknownFrame(streamId, frameTypeId, flags, payloadSize, payload);
}
diff --git a/java/org/apache/coyote/http2/Http2Parser.java b/java/org/apache/coyote/http2/Http2Parser.java
index a68ce25dcb..bf3689d9c0 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -16,7 +16,11 @@
*/
package org.apache.coyote.http2;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
@@ -27,6 +31,7 @@ import org.apache.coyote.http2.HpackDecoder.HeaderEmitter;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteBufferUtils;
+import org.apache.tomcat.util.http.parser.Priority;
import org.apache.tomcat.util.res.StringManager;
class Http2Parser {
@@ -121,6 +126,9 @@ class Http2Parser {
case CONTINUATION:
readContinuationFrame(streamId, flags, payloadSize, null);
break;
+ case PRIORITY_UPDATE:
+ readPriorityUpdateFrame(payloadSize, null);
+ break;
case UNKNOWN:
readUnknownFrame(streamId, frameTypeId, flags, payloadSize, null);
}
@@ -441,6 +449,36 @@ class Http2Parser {
}
+ protected void readPriorityUpdateFrame(int payloadSize, ByteBuffer buffer) throws Http2Exception, IOException {
+ // Identify prioritized stream ID
+ byte[] payload = new byte[payloadSize];
+ if (buffer == null) {
+ input.fill(true, payload);
+ } else {
+ buffer.get(payload);
+ }
+
+ int prioritizedStreamID = ByteUtil.get31Bits(payload, 0);
+
+ if (prioritizedStreamID == 0) {
+ throw new ConnectionException(
+ sm.getString("http2Parser.processFramePriorityUpdate.streamZero"), Http2Error.PROTOCOL_ERROR);
+ }
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(payload, 4, payloadSize - 4);
+ Reader r = new BufferedReader(new InputStreamReader(bais, StandardCharsets.US_ASCII));
+ Priority p = Priority.parsePriority(r);
+
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("http2Parser.processFramePriorityUpdate.debug", connectionId,
+ Integer.toString(prioritizedStreamID), Integer.toString(p.getUrgency()),
+ Boolean.valueOf(p.getIncremental())));
+ }
+
+ output.priorityUpdate(prioritizedStreamID, p);
+ }
+
+
protected void readHeaderPayload(int streamId, int payloadSize, ByteBuffer buffer)
throws Http2Exception, IOException {
@@ -783,6 +821,9 @@ class Http2Parser {
// Window size
void incrementWindowSize(int streamId, int increment) throws Http2Exception;
+ // Priority update
+ void priorityUpdate(int prioritizedStreamID, Priority p) throws Http2Exception;
+
/**
* Notification triggered when the parser swallows the payload of an
* unknown frame.
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index a5ebde3b26..14e7d67327 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -48,6 +48,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.http.parser.Priority;
import org.apache.tomcat.util.log.UserDataHelper;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
@@ -1794,6 +1795,17 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
}
+ @Override
+ public void priorityUpdate(int prioritizedStreamID, Priority p) throws Http2Exception {
+ AbstractNonZeroStream abstractNonZeroStream = getAbstractNonZeroStream(prioritizedStreamID, true);
+ if (abstractNonZeroStream instanceof Stream) {
+ Stream stream = (Stream) abstractNonZeroStream;
+ stream.setUrgency(p.getUrgency());
+ stream.setIncremental(p.getIncremental());
+ }
+ }
+
+
@Override
public void onSwallowedUnknownFrame(int streamId, int frameTypeId, int flags, int size)
throws IOException {
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 7dfa1676f6..6d6c5a33b5 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -73,6 +73,8 @@ http2Parser.processFrameData.window=Connection [{0}], Client sent more data than
http2Parser.processFrameHeaders.decodingDataLeft=Data left over after HPACK decoding - it should have been consumed
http2Parser.processFrameHeaders.decodingFailed=There was an error during the HPACK decoding of HTTP headers
http2Parser.processFrameHeaders.payload=Connection [{0}], Stream [{1}], Processing headers payload of size [{2}]
+http2Parser.processFramePriorityUpdate.debug=Connection [{0}], Stream [{1}], Urgency [{2}], Incremental [{3}]
+http2Parser.processFramePriorityUpdate.streamZero=Connection [{0}], Priority update frame received to prioritize stream zero
http2Parser.processFramePushPromise=Connection [{0}], Stream [{1}], Push promise frames should not be sent by the client
http2Parser.processFrameSettings.ackWithNonZeroPayload=Settings frame received with the ACK flag set and payload present
http2Parser.processFrameWindowUpdate.debug=Connection [{0}], Stream [{1}], Window size increment [{2}]
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java b/test/org/apache/coyote/http2/Http2TestBase.java
index 24d85fdc1e..b068520a80 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -62,6 +62,7 @@ import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.util.compat.JrePlatform;
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.http.parser.Priority;
import org.apache.tomcat.util.net.TesterSupport;
/**
@@ -1233,6 +1234,12 @@ public abstract class Http2TestBase extends TomcatBaseTest {
}
+ @Override
+ public void priorityUpdate(int prioritizedStreamID, Priority p) throws Http2Exception {
+ trace.append(prioritizedStreamID + "-PriorityUpdate-[" + p.getUrgency()+ "]-[" + p.getIncremental()+ "]\n");
+ }
+
+
@Override
public void onSwallowedUnknownFrame(int streamId, int frameTypeId, int flags, int size) {
trace.append(streamId);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/12: Send setting to disable RFC 7540 settings by default
Posted by ma...@apache.org.
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
commit a68294971e894aa81e172cceb6fb35410d6984f4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 6 18:05:38 2022 +0000
Send setting to disable RFC 7540 settings by default
---
java/org/apache/coyote/http2/ConnectionSettingsBase.java | 16 ++++++++++++++++
java/org/apache/coyote/http2/LocalStrings.properties | 1 +
2 files changed, 17 insertions(+)
diff --git a/java/org/apache/coyote/http2/ConnectionSettingsBase.java b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
index ef4a20010a..bd880f669f 100644
--- a/java/org/apache/coyote/http2/ConnectionSettingsBase.java
+++ b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
@@ -45,6 +45,9 @@ abstract class ConnectionSettingsBase<T extends Throwable> {
static final int DEFAULT_MAX_FRAME_SIZE = MIN_MAX_FRAME_SIZE;
static final long DEFAULT_MAX_HEADER_LIST_SIZE = 1 << 15;
+ // Defaults (defined by Tomcat)
+ static final long DEFAULT_NO_RFC7540_PRIORITIES = 1;
+
Map<Setting, Long> current = new ConcurrentHashMap<>();
Map<Setting, Long> pending = new ConcurrentHashMap<>();
@@ -58,6 +61,7 @@ abstract class ConnectionSettingsBase<T extends Throwable> {
current.put(Setting.INITIAL_WINDOW_SIZE, Long.valueOf(DEFAULT_INITIAL_WINDOW_SIZE));
current.put(Setting.MAX_FRAME_SIZE, Long.valueOf(DEFAULT_MAX_FRAME_SIZE));
current.put(Setting.MAX_HEADER_LIST_SIZE, Long.valueOf(DEFAULT_MAX_HEADER_LIST_SIZE));
+ current.put(Setting.NO_RFC7540_PRIORITIES, Long.valueOf(DEFAULT_NO_RFC7540_PRIORITIES));
}
@@ -86,6 +90,9 @@ abstract class ConnectionSettingsBase<T extends Throwable> {
case MAX_HEADER_LIST_SIZE:
// No further validation required
break;
+ case NO_RFC7540_PRIORITIES:
+ validateNoRfc7540Priorities(value);
+ break;
case UNKNOWN:
// Unrecognised. Ignore it.
return;
@@ -212,6 +219,15 @@ abstract class ConnectionSettingsBase<T extends Throwable> {
}
+ private void validateNoRfc7540Priorities(long noRfc7540Priorities) throws T {
+ if (noRfc7540Priorities < 0 || noRfc7540Priorities > 1) {
+ String msg = sm.getString("connectionSettings.noRfc7540PrioritiesInvalid",
+ connectionId, Long.toString(noRfc7540Priorities));
+ throwException(msg, Http2Error.PROTOCOL_ERROR);
+ }
+ }
+
+
abstract void throwException(String msg, Http2Error error) throws T;
abstract String getEndpointName();
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 8972c4fb6e..7587a86f33 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -26,6 +26,7 @@ connectionSettings.debug=Connection [{0}], Endpoint [{1}], Parameter type [{2}]
connectionSettings.enablePushInvalid=Connection [{0}], The requested value for enable push [{1}] is not one of the permitted values (zero or one)
connectionSettings.headerTableSizeLimit=Connection [{0}], Attempted to set a header table size of [{1}] but the limit is 16k
connectionSettings.maxFrameSizeInvalid=Connection [{0}], The requested maximum frame size of [{1}] is outside the permitted range of [{2}] to [{3}]
+connectionSettings.noRfc7540PrioritiesInvalid=Connection [{0}], The requested no RFC 7540 priorities setting [{1}] was not zero or one
connectionSettings.unknown=Connection [{0}], An unknown setting with identifier [{1}] and value [{2}] was ignored
connectionSettings.windowSizeTooBig=Connection [{0}], The requested window size of [{1}] is bigger than the maximum permitted value of [{2}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/12: Fix logic
Posted by ma...@apache.org.
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
commit bed84c18dab26993dd43cd3e28ed7fc0f8f7b737
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 20 14:38:56 2023 +0000
Fix logic
---
java/org/apache/tomcat/util/http/parser/Priority.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/http/parser/Priority.java b/java/org/apache/tomcat/util/http/parser/Priority.java
index 3142ba251c..0690bd0c41 100644
--- a/java/org/apache/tomcat/util/http/parser/Priority.java
+++ b/java/org/apache/tomcat/util/http/parser/Priority.java
@@ -73,7 +73,7 @@ public class Priority {
if (urgencyListMember instanceof SfInteger) {
long urgency = ((SfInteger) urgencyListMember).getVaue().longValue();
// If out of range, ignore it
- if (urgency < 0 || urgency > 7) {
+ if (urgency > -1 && urgency < 8) {
result.setUrgency((int) urgency);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 09/12: Remove unnecessary i18n strings
Posted by ma...@apache.org.
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
commit 6448ade0450e1687adeb245587cde03ace15231b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 8 19:59:27 2022 +0000
Remove unnecessary i18n strings
---
java/org/apache/coyote/http2/LocalStrings.properties | 2 --
java/org/apache/coyote/http2/LocalStrings_es.properties | 1 -
java/org/apache/coyote/http2/LocalStrings_fr.properties | 2 --
java/org/apache/coyote/http2/LocalStrings_ja.properties | 2 --
java/org/apache/coyote/http2/LocalStrings_ko.properties | 2 --
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 --
6 files changed, 11 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 3670d60f42..7dfa1676f6 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -73,7 +73,6 @@ http2Parser.processFrameData.window=Connection [{0}], Client sent more data than
http2Parser.processFrameHeaders.decodingDataLeft=Data left over after HPACK decoding - it should have been consumed
http2Parser.processFrameHeaders.decodingFailed=There was an error during the HPACK decoding of HTTP headers
http2Parser.processFrameHeaders.payload=Connection [{0}], Stream [{1}], Processing headers payload of size [{2}]
-http2Parser.processFramePriority.invalidParent=Connection [{0}], Stream [{1}], A stream may not depend on itself
http2Parser.processFramePushPromise=Connection [{0}], Stream [{1}], Push promise frames should not be sent by the client
http2Parser.processFrameSettings.ackWithNonZeroPayload=Settings frame received with the ACK flag set and payload present
http2Parser.processFrameWindowUpdate.debug=Connection [{0}], Stream [{1}], Window size increment [{2}]
@@ -109,7 +108,6 @@ stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previously read into inp
stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
stream.recycle=Connection [{0}], Stream [{1}] has been recycled
-stream.reprioritisation.debug=Connection [{0}], Stream [{1}], Exclusive [{2}], Parent [{3}], Weight [{4}]
stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to [{2}]
stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_es.properties b/java/org/apache/coyote/http2/LocalStrings_es.properties
index 2664cc5f8c..513511c9ed 100644
--- a/java/org/apache/coyote/http2/LocalStrings_es.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_es.properties
@@ -37,7 +37,6 @@ stream.header.noPath=Conexión [{0}], Flujo [{1}], El [:path] de la seudo cabece
stream.header.unknownPseudoHeader=Conexión [{0}], Flujo [{1}], Se recibió una Pseudo cabecera desconocida [{2}]
stream.inputBuffer.reset=Reinicio de flujo
stream.inputBuffer.signal=Se adicionaron datos al inBuffer cuando el hilo esta esperando. Señalizando al hilo que a continuar
-stream.reprioritisation.debug=Conexión [{0}], Flujo [{1}], Exclusivo [{2}], Padre [{3}], Peso [{4}]
streamProcessor.error.connection=Conexión [{0}], Flujo [{1}], Ha ocurrido un error el procesamiento que fue fatal para la conexión
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 9044d4f47f..6cd75243f5 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -72,7 +72,6 @@ http2Parser.processFrameData.window=Connection [{0}], le client a envoyé plus d
http2Parser.processFrameHeaders.decodingDataLeft=Des données restent après le décodage de HPACK, elles auraient dû être consommées
http2Parser.processFrameHeaders.decodingFailed=Une erreur de décodage HPACK des en-têtes HTTP s'est produite
http2Parser.processFrameHeaders.payload=Connection [{0}], Flux [{1}], Traitement des en-têtes avec une taille de données de [{2}]
-http2Parser.processFramePriority.invalidParent=Connection [{0}], Flux [{1}], Un flux ne peut pas dépendre de lui-même
http2Parser.processFramePushPromise=Connexion [{0}], Flux (Stream) [{1}], les trames de promesse d''envoi ("Push promise frames") ne doivent pas être envoyées par le client.
http2Parser.processFrameSettings.ackWithNonZeroPayload=La trame de paramètres a été reçue avec un indicateur ACK activé et des données présentes
http2Parser.processFrameWindowUpdate.debug=Connection [{0}], Flux [{1}], Incrémentation de [{2}] de la taille de fenêtre
@@ -108,7 +107,6 @@ stream.inputBuffer.swallowUnread=[{0}] bytes qui ont été auparavant lu dans le
stream.notWritable=Connection [{0}], Flux [{1}], Impossible d''écrire sur ce flux
stream.outputBuffer.flush.debug=Connection [{0}], Flux [{1}], envoi des données mises en tampon depuis la position [{2}], writeInProgress [{3}] et closed [{4}]
stream.recycle=Connection [{0}], Stream [{1}] a été recyclée
-stream.reprioritisation.debug=Connection [{0}], Flux [{1}], Exclusive [{2}], Parent [{3}], Poids [{4}]
stream.reset.fail=Connection [{0}], Flux [{1}], Echec de réinitialisation du flux
stream.reset.receive=Connection [{0}], Flux [{1}], Réinitialisation reçue à cause de [{2}]
stream.reset.send=Connection [{0}], Flux [{1}], Réinitialisation envoyée à cause de [{2}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index a9b7b8b59d..e7ba689987 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -72,7 +72,6 @@ http2Parser.processFrameData.window=コネクション [{0}]、クライアン
http2Parser.processFrameHeaders.decodingDataLeft=HPAC をデコードしたのにデータが残っています。すべて使用するべきです
http2Parser.processFrameHeaders.decodingFailed=HTTP ヘッダーの HPACK 復号化中にエラーが発生しました。
http2Parser.processFrameHeaders.payload=コネクション [{0}]、ストリーム [{1}]、サイズ [{2}] のヘッダーペイロードを処理中
-http2Parser.processFramePriority.invalidParent=コネクション [{0}]、ストリーム [{1}]、ストリーム自体に依存しない可能性があります
http2Parser.processFramePushPromise=コネクション [{0}]、ストリーム [{1}]、クライアントから PUSH_PROMISE フレームを送信するべきではありません
http2Parser.processFrameSettings.ackWithNonZeroPayload=ACKフラグがセットされ、ペイロードが存在する状態で受信されたSettingsフレーム
http2Parser.processFrameWindowUpdate.debug=コネクション [{0}]、ストリーム [{1}]、ウインドウサイズを [{2}] に拡大します。
@@ -108,7 +107,6 @@ stream.inputBuffer.swallowUnread=以前に入力ストリームバッファに
stream.notWritable=コネクション [{0}]、ストリーム [{1}]、このストリームには書き込みできません。
stream.outputBuffer.flush.debug=コネクション [{0}]、ストリーム [{1}]、バッファポジション [{2}]で出力をフラッシュ、writeInProgress [{3}]、クローズ [{4}]
stream.recycle=Connection[{0}]、Stream[{1}]はリサイクルされました
-stream.reprioritisation.debug=コネクション [{0}]、ストリーム [{1}]、排他 [{2}]、Parent [{3}]、重み [{4}]
stream.reset.fail=コネクション [{0}]、ストリーム [{1}]、ストリームをリセットできません。
stream.reset.receive=コネクション [{0}]、ストリーム [{1}]、[{2}] のために受信されたリセット
stream.reset.send=コネクション [{0}]、ストリーム [{1}]、[{2}] が原因で RESET を送信しました。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index a8adb1f976..ef5a25563c 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -72,7 +72,6 @@ http2Parser.processFrameData.window=연결 [{0}]: 클라이언트가 스트림
http2Parser.processFrameHeaders.decodingDataLeft=HPACK 디코딩 후 남아있는 데이터 - 반드시 소비되었어야 합니다.
http2Parser.processFrameHeaders.decodingFailed=HTTP 헤더들의 HPACK 디코딩 과정에서 오류가 있었습니다.
http2Parser.processFrameHeaders.payload=연결 [{0}], 스트림 [{1}], 크기가 [{2}]인 헤더들의 payload를 처리합니다.
-http2Parser.processFramePriority.invalidParent=연결 [{0}], 스트림 [{1}], 스트림이 그 자신을 의존할 수는 없습니다.
http2Parser.processFramePushPromise=연결 [{0}], 스트림 [{1}], Push promise 프레임들이 클라이언트에 의해 전송되어서는 안됩니다.
http2Parser.processFrameSettings.ackWithNonZeroPayload=ACK 플래그가 설정되고 payload가 존재하는, Settings 프레임을 받았습니다.
http2Parser.processFrameWindowUpdate.debug=연결 [{0}], 스트림 [{1}], 윈도우 크기를 [{2}] 만큼 증가 시킵니다.
@@ -107,7 +106,6 @@ stream.inputBuffer.swallowUnread=이전에 읽어 입력 스트림 버퍼에 넣
stream.notWritable=연결 [{0}], 스트림 [{1}], 이 스트림은 쓰기 가능하지 않습니다.
stream.outputBuffer.flush.debug=연결 [{0}], 스트림 [{1}], 위치 [{2}]의 버퍼를 출력으로 배출합니다. 쓰기 진행 중 여부: [{3}],닫힘 여부: [{4}]
stream.recycle=연결 [{0}], 스트림 [{1}]이(가) 참조 해제되었습니다.
-stream.reprioritisation.debug=연결 [{0}], 스트림 [{1}], 배타성 [{2}], 부모 [{3}], 가중치 [{4}]
stream.reset.fail=연결 [{0}], 스트림 [{1}], 스트림을 재설정(reset)하지 못했습니다.
stream.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 재설정(reset)을 받았습니다.
stream.reset.send=연결 [{0}], 스트림 [{1}], [{2}](으)로 인하여 재설정(reset)이 전송되었음.
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index ec4c7612ba..21561f1bd0 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -72,7 +72,6 @@ http2Parser.processFrameData.window=连接[{0}]，客户端发送的数据比流
http2Parser.processFrameHeaders.decodingDataLeft=数据在HPACK解码后依然保留 - 它本应该被消费掉
http2Parser.processFrameHeaders.decodingFailed=对HTTP头进行HPACK解码时出错
http2Parser.processFrameHeaders.payload=连接：[{0}]，流：[{1}]，正在处理[{1}]大小的头文件负载
-http2Parser.processFramePriority.invalidParent=连接[{0}]，流[{1}]，流可能不依赖于自身
http2Parser.processFramePushPromise=请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符
http2Parser.processFrameSettings.ackWithNonZeroPayload=接收到带有ACK标志设置和有效负载的设置帧
http2Parser.processFrameWindowUpdate.debug=连接[{0}]，流[{1}]，窗口大小增量[{2}]
@@ -108,7 +107,6 @@ stream.inputBuffer.swallowUnread=先前读取到输入流缓冲区吞入了[{0}]
stream.notWritable=连接[{0}]，流[{1}]，此流不可写
stream.outputBuffer.flush.debug=连接[{0}]，流[{1}]，用缓冲区在位置[{2}]刷新输出，writeInProgress[{3}]并关闭了[{4}]
stream.recycle=连接[{0}]，流[{1}]将被回收
-stream.reprioritisation.debug=连接[{0}]，流[{1}]，独占[{2}]，父[{3}]，权重[{4}]
stream.reset.fail=连接[{0}]，流[{1}]，重置流失败
stream.reset.receive=连接{0}，流{1}，由于{2}而收到重置
stream.reset.send=连接[{0}]，流[{1}]，由于[{2}]将重置发送
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 08/12: Remove unused code
Posted by ma...@apache.org.
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
commit f59c112ff0dc0b69f234b5f45c858550d87bd1ac
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 8 19:49:10 2022 +0000
Remove unused code
---
.../apache/coyote/http2/AbstractNonZeroStream.java | 43 ----------------------
1 file changed, 43 deletions(-)
diff --git a/java/org/apache/coyote/http2/AbstractNonZeroStream.java b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
index 5a9c3e3a48..f6a00e20e0 100644
--- a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
+++ b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
@@ -18,19 +18,12 @@ package org.apache.coyote.http2;
import java.nio.ByteBuffer;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.res.StringManager;
-
/**
* Base class for all streams other than stream 0, the connection. Primarily
* provides functionality shared between full Stream and RecycledStream.
*/
abstract class AbstractNonZeroStream extends AbstractStream {
- private static final Log log = LogFactory.getLog(AbstractNonZeroStream.class);
- private static final StringManager sm = StringManager.getManager(AbstractNonZeroStream.class);
-
protected static final ByteBuffer ZERO_LENGTH_BYTEBUFFER = ByteBuffer.allocate(0);
protected final StreamStateMachine state;
@@ -48,42 +41,6 @@ abstract class AbstractNonZeroStream extends AbstractStream {
}
- /*
- * General method used when reprioritising a stream and care needs to be
- * taken not to create circular references.
- *
- * Changes to the priority tree need to be synchronized at the connection
- * level. This is the caller's responsibility.
- */
- final void rePrioritise(AbstractStream parent, boolean exclusive, int weight) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("stream.reprioritisation.debug",
- getConnectionId(), getIdAsString(), Boolean.toString(exclusive),
- parent.getIdAsString(), Integer.toString(weight)));
- }
-
- // TODO
- }
-
-
- /*
- * Used when removing closed streams from the tree and we know there is no
- * need to check for circular references.
- *
- * Changes to the priority tree need to be synchronized at the connection
- * level. This is the caller's responsibility.
- */
- final void rePrioritise(AbstractStream parent, int weight) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("stream.reprioritisation.debug",
- getConnectionId(), getIdAsString(), Boolean.FALSE,
- parent.getIdAsString(), Integer.toString(weight)));
- }
-
- // TODO
- }
-
-
final boolean isClosedFinal() {
return state.isClosedFinal();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org