This is an automated email from the ASF dual-hosted git repository.
mgrigorov 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 8dcf599 HTTP2 log statement fixes:
8dcf599 is described below
commit 8dcf599a0df839226ba18af11e996a8413a04d3a
Author: Martin Tzvetanov Grigorov <[email protected]>
AuthorDate: Wed Sep 30 14:55:09 2020 +0300
HTTP2 log statement fixes:
1) http2Parser.processFrameData.lengths: remove comma between name and value
2) stream.header.duplicate: fix the index of the third argument
3) upgradeHandler.initialWindowSize.invalid: remove it, it is not used in
.java code
(cherry picked from commit 8185e79203e9ecb074ea26a1f3e53b497b47ad2b)
---
java/org/apache/coyote/http2/LocalStrings.properties | 5 ++---
java/org/apache/coyote/http2/LocalStrings_fr.properties | 3 +--
java/org/apache/coyote/http2/LocalStrings_ja.properties | 3 +--
java/org/apache/coyote/http2/LocalStrings_ko.properties | 3 +--
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 3 +--
5 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index c629a40..ca6e5af 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -60,7 +60,7 @@ http2Parser.processFrame=Connection [{0}], Stream [{1}],
Frame type [{2}], Flags
http2Parser.processFrame.tooMuchPadding=Connection [{0}], Stream [{1}], The
padding length [{2}] was too big for the payload [{3}]
http2Parser.processFrame.unexpectedType=Expected frame type [{0}] but received
frame type [{1}]
http2Parser.processFrameContinuation.notExpected=Connection [{0}],
Continuation frame received for stream [{1}] when no headers were in progress
-http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data
length, [{2}], Padding length [{3}]
+http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data
length [{2}], Padding length [{3}]
http2Parser.processFrameData.window=Connection [{0}], Client sent more data
than stream window allowed
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
@@ -80,7 +80,7 @@ stream.header.case=Connection [{0}], Stream [{1}], HTTP
header name [{2}] must b
stream.header.connection=Connection [{0}], Stream [{1}], HTTP header
[connection] is not permitted in an HTTP/2 request
stream.header.contentLength=Connection [{0}], Stream [{1}], The content length
header value [{2}] does not agree with the size of the data received [{3}]
stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value
[{3}]
-stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple
[{3}] headers
+stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple
[{2}] headers
stream.header.empty=Connection [{0}], Stream [{1}], Invalid empty header name
stream.header.invalid=Connection [{0}], Stream [{1}], The header [{2}]
contained invalid value [{3}]
stream.header.noPath=Connection [{0}], Stream [{1}], The [:path] pseudo header
was empty
@@ -120,7 +120,6 @@ upgradeHandler.connectionError=Connection error
upgradeHandler.dependency.invalid=Connection [{0}], Stream [{1}], Streams may
not depend on themselves
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error
code [{2}], Debug data [{3}]
upgradeHandler.init=Connection [{0}], State [{1}]
-upgradeHandler.initialWindowSize.invalid=Connection [{0}], Illegal value of
[{1}] ignored for initial window size
upgradeHandler.invalidPreface=Connection [{0}], Invalid connection preface
upgradeHandler.ioerror=Connection [{0}]
upgradeHandler.noAllocation=Connection [{0}], Stream [{1}], Timeout waiting
for allocation
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 04fc51a..7f53857 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -79,7 +79,7 @@ stream.header.case=Connection [{0}], Flux [{1}], Le nom
d''en-tête HTTP [{2}] d
stream.header.connection=Connection [{0}], Flux [{1}], L''en-tête HTTP
[connection] n''est pas autorisé dans une requête HTTP/2
stream.header.contentLength=Connection [{0}], Flux [{1}], La valeur de
l''en-tête content-length [{2}] ne correspond pas à la taille des données reçue
[{3}]
stream.header.debug=Connection [{0}], Flux [{1}], en-tête HTTP [{2}], valeur
[{3}]
-stream.header.duplicate=Connection [{0}], Flux [{1}], Reçu plusieurs en-têtes
[{3}]
+stream.header.duplicate=Connection [{0}], Flux [{1}], Reçu plusieurs en-têtes
[{2}]
stream.header.empty=Connection [{0}], Flux [{1}], Le nom d''en-tête nul est
invalide
stream.header.invalid=Connection [{0}], Flux [{1}], L''en-tête[{2}] contenait
la valeur invalide [{3}]
stream.header.noPath=Connection [{0}], flux [{1}], Le [:path] pseudo en-tête
est vide
@@ -118,7 +118,6 @@ upgradeHandler.connectionError=Erreur de la connection
upgradeHandler.dependency.invalid=Connection [{0}], Flux [{1}], Un flux ne
peut dépendre de lui-même
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Dernier flux [{1}], Code
d''erreur [{2}], Données de débogage [{3}]
upgradeHandler.init=Connection [{0}], Etat [{1}]
-upgradeHandler.initialWindowSize.invalid=Connection [{0}], La valeur [{1}]
initiale de la taille de fenêtre est invalide
upgradeHandler.invalidPreface=Connection [{0}], Préface de connection invalide
upgradeHandler.ioerror=Connection [{0}]
upgradeHandler.noAllocation=Connection [{0}], Flux [{1}], Temps d''attente
maximum dépassé lors de l''allocation
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index ef526b7..6dc03d8 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -79,7 +79,7 @@ stream.header.case=コネクション [{0}]、ストリーム [{1}]、HTTP ヘ
stream.header.connection=コネクション [{0}]、ストリーム [{1}]、HTTP/2 のリクエストには HTTP ヘッダー
[connection] を指定することはできません。
stream.header.contentLength=コネクション [{0}]、ストリーム [{1}]、content length ヘッダーの値
[{2}] と受信したデータ長 [{3}] は一致しません。
stream.header.debug=コネクション [{0}]、ストリーム [{1}]、HTTP ヘッダー [{2}]、値は [{3}]
-stream.header.duplicate=コネクション [{0}]、ストリーム [{1}]、ヘッダー [{3}] を複数受信しました。
+stream.header.duplicate=コネクション [{0}]、ストリーム [{1}]、ヘッダー [{2}] を複数受信しました。
stream.header.empty=接続 [{0}]、ストリーム [{1}]、無効な空ヘッダ名です
stream.header.invalid=コネクション [{0}]、ストリーム [{1}]、ヘッダー [{2}] に不正な値 [{3}] が含まれています。
stream.header.noPath=コネクション [{0}]、ストリーム [{1}]、疑似ヘッダー [:path] が空です。
@@ -118,7 +118,6 @@ upgradeHandler.connectionError=接続エラー
upgradeHandler.dependency.invalid=コネクション [{0}]、ストリーム
[{1}]、ストリームは自分自身に依存するべきではありません。
upgradeHandler.goaway.debug=コネクション[{0}]、Goaway、最終ストリーム[{1}]、エラーコード[{2}]、デバッグデータ[{3}]
upgradeHandler.init=コネクション[{0}]、状態[{1}]
-upgradeHandler.initialWindowSize.invalid=コネクション[{0}]、[{1}]の無効な値は初期ウィンドウサイズで無視されました
upgradeHandler.invalidPreface=コネクション[{0}]、無効なConnection Preface
upgradeHandler.ioerror=コネクション[{0}]
upgradeHandler.noAllocation=接続 [{0}]、ストリーム [{1}]、割り当ての待機がタイムアウトしました
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 76d9ffe..48aa092 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -79,7 +79,7 @@ stream.header.case=연결 [{0}], 스트림 [{1}], HTTP 헤더 이름 [{2}]은(
stream.header.connection=연결 [{0}], 스트림 [{1}], HTTP 헤더 [connection]은 HTTP/2
요청에서 허용되지 않습니다.
stream.header.contentLength=연결 [{0}], 스트림 [{1}], 해당 Content-Length 헤더 값
[{2}]은(는) 수신된 데이터의 크기 [{3}]와(과) 일치하지 않습니다.
stream.header.debug=연결 [{0}], 스트림 [{1}], HTTP 헤더: [{2}], 값: [{3}]
-stream.header.duplicate=연결 [{0}], 스트림 [{1}], 여러 개의 [{3}] 헤더들을 받았습니다.
+stream.header.duplicate=연결 [{0}], 스트림 [{1}], 여러 개의 [{2}] 헤더들을 받았습니다.
stream.header.empty=연결 [{0}], 스트림 [{1}], 헤더 이름이 빈 문자열이어서 유효하지 않습니다.
stream.header.invalid=연결 [{0}], 스트림 [{1}], 헤더 [{2}]이(가) 유효하지 않은 값을 포함했습니다:
[{3}]
stream.header.noPath=연결 [{0}], 스트림 [{1}], [:path] 가상 헤더가 비어 있었습니다.
@@ -118,7 +118,6 @@ upgradeHandler.connectionError=연결 오류
upgradeHandler.dependency.invalid=연결 [{0}], 스트림 [{1}], 스트림들은 자기 자신들에 의존해서는
안됩니다.
upgradeHandler.goaway.debug=연결 [{0}], Goaway, 마지막 스트림 [{1}], 오류 코드 [{2}], 디버그
데이터 [{3}]
upgradeHandler.init=연결 [{0}], 상태 [{1}]
-upgradeHandler.initialWindowSize.invalid=연결 [{0}]: 값 [{1}]은(는), 초기 윈도우 크기로서
불허되므로, 무시됩니다.
upgradeHandler.invalidPreface=연결 [{0}]: 유효하지 않은 연결 preface
upgradeHandler.ioerror=연결 [{0}]
upgradeHandler.noAllocation=연결 [{0}], 스트림 [{1}], 연결 할당을 위해 대기하는 중 제한 시간 초과
되었습니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index a524bb3..8c6f104 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -80,7 +80,7 @@ stream.header.case=连接[{0}]，流[{1}]，HTTP标头名称[{2}]必须小写
stream.header.connection=HTTP/2请求中不允许连接{0}、流{1}、HTTP头[连接]
stream.header.contentLength=连接{0}，流{1}，内容长度头值{2}与接收的数据大小{3}不一致
stream.header.debug=连接[{0}]，流[{1}]，HTTP标头[{2}]，值[{3}]
-stream.header.duplicate=连接[{0}]，流[{1}]，收到多个[{3}]头
+stream.header.duplicate=连接[{0}]，流[{1}]，收到多个[{2}]头
stream.header.empty=连接[{0}]，流[{1}]，无效的空头名称
stream.header.invalid=连接[{0}]，流[{1}]，头[{2}]包含无效值[{3}]
stream.header.noPath=连接[{0}]，流[{1}]，[：path]伪标头为空
@@ -119,7 +119,6 @@ upgradeHandler.connectionError=连接错误
upgradeHandler.dependency.invalid=连接{0}，流{1}，流可能不依赖于自身
upgradeHandler.goaway.debug=连接[{0}]，离开，最后的流[{1}]，错误码[{2}]，调试数据[{3}]
upgradeHandler.init=连接[{0}]，状态[{1}]
-upgradeHandler.initialWindowSize.invalid=连接{0}，初始窗口大小忽略了非法值{1}。
upgradeHandler.invalidPreface=连接[{0}]，连接前言无效
upgradeHandler.ioerror=连接[{0}]
upgradeHandler.noAllocation=连接[{0}]，流[{1}]，等待分配超时
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
