This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 10ab1c6ced Fix typos
10ab1c6ced is described below
commit 10ab1c6ced53b8e32ff27304c94a1f10305daffd
Author: k-tamura <[email protected]>
AuthorDate: Fri Aug 14 14:13:39 2026 +0900
Fix typos
---
java/org/apache/coyote/http2/Http2Parser.java | 4 ++--
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 2 +-
java/org/apache/coyote/http2/LocalStrings.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_fr.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ja.properties | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index 938a802b98..05c631da96 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -287,7 +287,7 @@ class Http2Parser {
// The padding does not count towards the size of payload that is
read below.
payloadSize -= padLength;
- // Any RFC 7450 priority data was read into the byte[] optional
above. It is ignored.
+ // Any RFC 7540 priority data was read into the byte[] optional
above. It is ignored.
}
readHeaderPayload(streamId, payloadSize, buffer);
@@ -306,7 +306,7 @@ class Http2Parser {
protected void readPriorityFrame(int streamId, ByteBuffer buffer) throws
IOException {
- // RFC 7450 priority frames are ignored. Still need to treat as
overhead.
+ // RFC 7540 priority frames are ignored. Still need to treat as
overhead.
try {
swallowPayload(streamId, FrameType.PRIORITY.getId(), 5, false,
buffer);
} catch (ConnectionException ignore) {
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 0a6bc8b3cc..ab220a5930 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1852,7 +1852,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
} 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),
+ throw new
ConnectionException(sm.getString("upgradeHandler.enableRfc7540Priorities",
connectionId),
Http2Error.PROTOCOL_ERROR);
}
} else {
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 8837f20c6f..7216df4800 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -146,7 +146,7 @@ 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.clientCancel=Client reset the stream before the response was
complete
upgradeHandler.connectionError=Connection error
-upgradeHandler.enableRfc7450Priorities=Connection [{0}], RFC 7450 priorities
may not be enabled after being disabled in the initial connection settings
frame (see RFC 9218)
+upgradeHandler.enableRfc7540Priorities=Connection [{0}], RFC 7540 priorities
may not be enabled after being disabled in the initial connection settings
frame (see RFC 9218)
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 f374143e82..a4d62c6758 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -146,7 +146,7 @@ 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.clientCancel=Le client a réinitialisé la stream avant que la
réponse ne soit complète
upgradeHandler.connectionError=Erreur de la connection
-upgradeHandler.enableRfc7450Priorities=Connection [{0}], les priorités RFC
7450 ne doivent pas être activées après avoir été désactivées dans la trame
initiale des paramètres de connection (voir la RFC 9218)
+upgradeHandler.enableRfc7540Priorities=Connection [{0}], les priorités RFC
7540 ne doivent pas être activées après avoir été désactivées dans la trame
initiale des paramètres de connection (voir la RFC 9218)
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 c6439af5e7..a6c07e3025 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -146,7 +146,7 @@ upgradeHandler.allocate.debug=コネクション [{0}]、ストリーム [{1}]
upgradeHandler.allocate.left=コネクション [{0}]、ストリーム [{1}]、[{2}] バイトが未割り当て -
子への割り当てを試みています
upgradeHandler.clientCancel=レスポンスが完了する前にクライアントがストリームをリセットしました
upgradeHandler.connectionError=接続エラー
-upgradeHandler.enableRfc7450Priorities=接続 [{0}] は、RFC 7450
優先順位が初期接続設定フレームで無効にされた後に有効にならない場合があります (RFC 9218 を参照)
+upgradeHandler.enableRfc7540Priorities=接続 [{0}] は、RFC 7540
優先順位が初期接続設定フレームで無効にされた後に有効にならない場合があります (RFC 9218 を参照)
upgradeHandler.fallToDebug=\n\
\ 注: 以降のHTTP/2 ストリームエラーの発生はDEBUGレベルでログに出力されます。
upgradeHandler.goaway.debug=コネクション [{0}]、Goaway、最終ストリーム [{1}]、エラーコード
[{2}]、デバッグデータ [{3}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
