This is an automated email from the ASF dual-hosted git repository.
markt 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 26793370bc Rename i18n string after earlier refactoring
26793370bc is described below
commit 26793370bc87045a649f87b1c7e5e74db9303a3c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 2 17:05:01 2024 +0100
Rename i18n string after earlier refactoring
---
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 +-
java/org/apache/coyote/http2/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index f5724e3166..8a6e896a2b 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -990,7 +990,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
msg = sm.getString("stream.writeTimeout");
error = Http2Error.ENHANCE_YOUR_CALM;
} else {
- msg = sm.getString("stream.clientCancel");
+ msg =
sm.getString("upgradeHandler.clientCancel");
error = Http2Error.STREAM_CLOSED;
}
// Close the stream
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 68baa3d265..36168489cb 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -85,7 +85,6 @@ http2Protocol.jmxRegistration.fail=JMX registration for the
HTTP/2 protocol fail
pingManager.roundTripTime=Connection [{0}] Round trip time measured as [{1}]ns
-stream.clientCancel=Client reset the stream before the response was complete
stream.closed=Connection [{0}], Stream [{1}], Unable to write to stream once
it has been closed
stream.header.case=Connection [{0}], Stream [{1}], HTTP header name [{2}] must
be in lower case
stream.header.connection=Connection [{0}], Stream [{1}], HTTP header [{2}] is
not permitted in an HTTP/2 request
@@ -129,6 +128,7 @@ streamStateMachine.invalidReset=Connection [{0}], Stream
[{1}], Stream may not b
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.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.fallToDebug=\n\
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 4d331c4124..8abb2f85aa 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -85,7 +85,6 @@ http2Protocol.jmxRegistration.fail=L'enregistrement dans JMX
du protocole HTTP/2
pingManager.roundTripTime=Connection [{0}] Le temps d''aller retour est de
[{1}]ns
-stream.clientCancel=Le client a réinitialisé la stream avant que la réponse ne
soit complète
stream.closed=Connection [{0}], Flux [{1}], Impossible d''écrire sur un flux
après sa fermeture
stream.header.case=Connection [{0}], Flux [{1}], Le nom d''en-tête HTTP [{2}]
doit être en miniscules
stream.header.connection=Connection [{0}], Flux [{1}], L''en-tête HTTP [{2}]
n''est pas autorisé dans une requête HTTP/2
@@ -129,6 +128,7 @@ streamStateMachine.invalidReset=Connection [{0}], Stream
[{1}], la Stream ne doi
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.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.fallToDebug=\n\
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 98823504ce..584f03ce12 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -85,7 +85,6 @@ http2Protocol.jmxRegistration.fail=HTTP/2プロトコルのJMX登録に失敗し
pingManager.roundTripTime=コネクション [{0}] の往復時間は [{1}] ns でした。
-stream.clientCancel=レスポンスが完了する前にクライアントがストリームをリセットしました
stream.closed=コネクション [{0}]、ストリーム [{1}]、切断したストリームには書き込みできません
stream.header.case=コネクション [{0}]、ストリーム [{1}]、HTTP ヘッダー名 [{2}] は小文字でなければなりません。
stream.header.connection=コネクション [{0}]、ストリーム [{1}]、HTTP/2 のリクエストには HTTP ヘッダー
[{2}] を指定することはできません。
@@ -129,6 +128,7 @@ streamStateMachine.invalidReset=コネクション [{0}]、ストリーム [{1}]
upgradeHandler.allocate.debug=コネクション [{0}]、ストリーム [{1}]、割り当てられた [{2}] バイト
upgradeHandler.allocate.left=コネクション [{0}]、ストリーム [{1}]、[{2}] バイトが未割り当て -
子への割り当てを試みています
+upgradeHandler.clientCancel=レスポンスが完了する前にクライアントがストリームをリセットしました
upgradeHandler.connectionError=接続エラー
upgradeHandler.enableRfc7450Priorities=接続 [{0}] は、RFC 7450
優先順位が初期接続設定フレームで無効にされた後に有効にならない場合があります (RFC 9218 を参照)
upgradeHandler.fallToDebug=\n\
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index a10474fba5..f147271032 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -82,7 +82,6 @@ http2Protocol.jmxRegistration.fail=HTTP/2 프로토콜을 JMX에 등록하지
pingManager.roundTripTime=연결 [{0}]: 라운드 트립 시간이 [{1}] 나노초(ns)로 측정되었습니다.
-stream.clientCancel=응답이 완료되기 전에 클라이언트가 스트림을 리셋했습니다.
stream.closed=연결 [{0}], 스트림 [{1}], 한번 닫힌 스트림에 쓰기를 할 수 없습니다.
stream.header.case=연결 [{0}], 스트림 [{1}], HTTP 헤더 이름 [{2}]은(는) 반드시 소문자여야 합니다.
stream.header.connection=연결 [{0}], 스트림 [{1}], HTTP 헤더 [{2}]은 HTTP/2 요청에서 허용되지
않습니다.
@@ -124,6 +123,7 @@ streamStateMachine.invalidFrame=연결 [{0}], 스트림 [{1}], 상태
[{2}], 프
upgradeHandler.allocate.debug=연결 [{0}], 스트림 [{1}], [{2}] 바이트를 할당함.
upgradeHandler.allocate.left=연결 [{0}], 스트림 [{1}], [{2}] 바이트들이 할당 해제되었습니다 -
자식들에 할당하려 시도합니다.
+upgradeHandler.clientCancel=응답이 완료되기 전에 클라이언트가 스트림을 리셋했습니다.
upgradeHandler.connectionError=연결 오류
upgradeHandler.fallToDebug=\n\
\ 주의: 추가로 발생하는 HTTP/2 스트림 오류들은 디버그 수준의 로그로 기록될 것입니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 3a130b6956..4b0828b76b 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -82,7 +82,6 @@ http2Protocol.jmxRegistration.fail=HTTP/2协议注册JMX失败
pingManager.roundTripTime=连接[{0}]往返时间测量为[{1}]ns
-stream.clientCancel=客户端在响应完成前重置了数据流
stream.closed=连接[{0}]，流[{1}]，一旦关闭就无法写入流
stream.header.case=连接[{0}]，流[{1}]，HTTP标头名称[{2}]必须小写
stream.header.connection=HTTP/2请求中不允许连接[{0}]、流[{1}]、HTTP头[{2}]
@@ -124,6 +123,7 @@ streamStateMachine.invalidFrame=连接[{0}]、流[{1}]、状态[{2}]、帧类型
upgradeHandler.allocate.debug=连接[{0}]，流[{1}]，已分配[{2}]字节
upgradeHandler.allocate.left=连接[{0}]，流[{1}]，[{2}]字节未分配 - 尝试分配给子项
+upgradeHandler.clientCancel=客户端在响应完成前重置了数据流
upgradeHandler.connectionError=连接错误
upgradeHandler.fallToDebug=注意：往后出现 HTTP/2 流的错误将以 DEBUG 日志级别输出。
upgradeHandler.goaway.debug=连接[{0}]，离开，最后的流[{1}]，错误码[{2}]，调试数据[{3}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
