This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 441e2bbfaa Improve error message
441e2bbfaa is described below
commit 441e2bbfaa2e81c825687091ca640b0b2f27f8b6
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Aug 23 17:38:58 2022 +0100
Improve error message
---
java/org/apache/coyote/http2/Http2Parser.java | 6 ++++--
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 +-
java/org/apache/coyote/http2/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 +-
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index 0fd6acb47d..868e4fe379 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -417,11 +417,13 @@ class Http2Parser {
if (windowSizeIncrement == 0) {
if (streamId == 0) {
throw new ConnectionException(
-
sm.getString("http2Parser.processFrameWindowUpdate.invalidIncrement"),
+
sm.getString("http2Parser.processFrameWindowUpdate.invalidIncrement",
+ connectionId, Integer.toString(streamId)),
Http2Error.PROTOCOL_ERROR);
} else {
throw new StreamException(
-
sm.getString("http2Parser.processFrameWindowUpdate.invalidIncrement"),
+
sm.getString("http2Parser.processFrameWindowUpdate.invalidIncrement",
+ connectionId, Integer.toString(streamId)),
Http2Error.PROTOCOL_ERROR, streamId);
}
}
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 62f3f189bb..098afef83e 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -76,7 +76,7 @@ http2Parser.processFramePriority.invalidParent=Connection
[{0}], Stream [{1}], A
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}]
-http2Parser.processFrameWindowUpdate.invalidIncrement=Window update frame
received with an invalid increment size of [{0}]
+http2Parser.processFrameWindowUpdate.invalidIncrement=Connection [{0}], Stream
[{1}], Window update frame received with an invalid increment size of [0].
http2Parser.swallow.debug=Connection [{0}], Stream [{1}], Swallowed [{2}] bytes
http2Protocol.jmxRegistration.fail=JMX registration for the HTTP/2 protocol
failed
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index be7d040793..4f54e7221a 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -76,7 +76,7 @@ http2Parser.processFramePriority.invalidParent=Connection
[{0}], Flux [{1}], Un
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
-http2Parser.processFrameWindowUpdate.invalidIncrement=La trame de mise à jour
de la fenêtre a été reçue avec un incrément invalide [{0}]
+http2Parser.processFrameWindowUpdate.invalidIncrement=La trame de mise à jour
de la fenêtre a été reçue avec un incrément invalide [0]
http2Parser.swallow.debug=Connection [{0}], Flux [{1}], Avalé [{2}] octets
http2Protocol.jmxRegistration.fail=L'enregistrement dans JMX du protocole
HTTP/2 a échoué
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index f4f7aa9b66..c87c0a167f 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -76,7 +76,7 @@ http2Parser.processFramePriority.invalidParent=コネクション [{0}]、スト
http2Parser.processFramePushPromise=コネクション [{0}]、ストリーム [{1}]、クライアントから
PUSH_PROMISE フレームを送信するべきではありません。
http2Parser.processFrameSettings.ackWithNonZeroPayload=ACKフラグがセットされ、ペイロードが存在する状態で受信されたSettingsフレーム
http2Parser.processFrameWindowUpdate.debug=コネクション [{0}]、ストリーム [{1}]、ウインドウサイズを
[{2}] に拡大します。
-http2Parser.processFrameWindowUpdate.invalidIncrement=無効な増分サイズ [{0}]
で受信されたWindow Updateフレーム
+http2Parser.processFrameWindowUpdate.invalidIncrement=無効な増分サイズ [0]
で受信されたWindow Updateフレーム
http2Parser.swallow.debug=コネクション [{0}]、ストリーム [{1}]、飲み込まれた [{2}] バイト
http2Protocol.jmxRegistration.fail=HTTP/2プロトコルのJMX登録に失敗しました
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 71433d9a00..7fe71cdccc 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -76,7 +76,7 @@ http2Parser.processFramePriority.invalidParent=연결 [{0}], 스트림
[{1}],
http2Parser.processFramePushPromise=연결 [{0}], 스트림 [{1}], Push promise 프레임들이
클라이언트에 의해 전송되어서는 안됩니다.
http2Parser.processFrameSettings.ackWithNonZeroPayload=ACK 플래그가 설정되고 payload가
존재하는, Settings 프레임을 받았습니다.
http2Parser.processFrameWindowUpdate.debug=연결 [{0}], 스트림 [{1}], 윈도우 크기를 [{2}]
만큼 증가 시킵니다.
-http2Parser.processFrameWindowUpdate.invalidIncrement=유효하지 않은 증분 크기인 [{0}]와(과)
함께, 윈도우 변경 프레임을 받았습니다.
+http2Parser.processFrameWindowUpdate.invalidIncrement=유효하지 않은 증분 크기인 [0]와(과)
함께, 윈도우 변경 프레임을 받았습니다.
http2Parser.swallow.debug=연결 [{0}], 스트림 [{1}], [{2}] 바이트를 처리하지 않고 건너뛰었습니다.
http2Protocol.jmxRegistration.fail=HTTP/2 프로토콜을 JMX에 등록하지 못했습니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 503e8a1105..af678a7b45 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -76,7 +76,7 @@
http2Parser.processFramePriority.invalidParent=连接[{0}]，流[{1}]，流可
http2Parser.processFramePushPromise=请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符
http2Parser.processFrameSettings.ackWithNonZeroPayload=接收到带有ACK标志设置和有效负载的设置帧
http2Parser.processFrameWindowUpdate.debug=连接[{0}]，流[{1}]，窗口大小增量[{2}]
-http2Parser.processFrameWindowUpdate.invalidIncrement=接收到的窗口更新帧具有无效的增量大小[{0}]
+http2Parser.processFrameWindowUpdate.invalidIncrement=接收到的窗口更新帧具有无效的增量大小[0]
http2Parser.swallow.debug=连接：[{0}]，流：[{1}]，吞下[{2}]字节
http2Protocol.jmxRegistration.fail=HTTP/2协议注册JMX失败
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
