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
The following commit(s) were added to refs/heads/main by this push:
new b55774b615 Fix formatting. There should be a space between number and
unit.
b55774b615 is described below
commit b55774b615ece26e4b5d70f53a701aa83131d8d9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Aug 21 16:12:18 2023 -0700
Fix formatting. There should be a space between number and unit.
---
java/org/apache/catalina/connector/Connector.java | 4 ++--
java/org/apache/catalina/ha/deploy/FileMessageFactory.java | 2 +-
.../catalina/tribes/group/interceptors/LocalStrings.properties | 6 +++---
.../catalina/tribes/group/interceptors/LocalStrings_cs.properties | 6 +++---
.../catalina/tribes/group/interceptors/LocalStrings_es.properties | 6 +++---
.../catalina/tribes/group/interceptors/LocalStrings_fr.properties | 6 +++---
.../catalina/tribes/group/interceptors/LocalStrings_ja.properties | 6 +++---
.../catalina/tribes/group/interceptors/LocalStrings_ko.properties | 6 +++---
.../tribes/group/interceptors/LocalStrings_pt_BR.properties | 6 +++---
.../tribes/group/interceptors/LocalStrings_zh_CN.properties | 6 +++---
.../tribes/group/interceptors/MessageDispatchInterceptor.java | 2 +-
java/org/apache/catalina/tribes/io/BufferPool.java | 2 +-
java/org/apache/catalina/util/IOTools.java | 2 +-
java/org/apache/catalina/webresources/LocalStrings.properties | 4 ++--
java/org/apache/catalina/webresources/LocalStrings_fr.properties | 4 ++--
java/org/apache/catalina/webresources/LocalStrings_ja.properties | 2 +-
java/org/apache/catalina/webresources/LocalStrings_ko.properties | 4 ++--
java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties | 4 ++--
.../tomcat/util/http/fileupload/disk/DiskFileItemFactory.java | 2 +-
test/org/apache/catalina/core/TestSwallowAbortedUploads.java | 2 +-
test/org/apache/catalina/tribes/demos/ChannelCreator.java | 2 +-
test/org/apache/tomcat/util/net/TestSsl.java | 4 ++--
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/cluster-interceptor.xml | 2 +-
webapps/docs/config/systemprops.xml | 4 ++--
webapps/docs/security-howto.xml | 2 +-
.../WEB-INF/classes/compressionFilters/CompressionFilter.java | 2 +-
.../compressionFilters/CompressionServletResponseWrapper.java | 2 +-
webapps/manager/WEB-INF/web.xml | 2 +-
29 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index a435252fb8..9202c0aa8b 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -208,13 +208,13 @@ public class Connector extends LifecycleMBeanBase {
protected int maxParameterCount = 1000;
/**
- * Maximum size of a POST which will be automatically parsed by the
container. 2MiB by default.
+ * Maximum size of a POST which will be automatically parsed by the
container. 2 MiB by default.
*/
protected int maxPostSize = 2 * 1024 * 1024;
/**
- * Maximum size of a POST which will be saved by the container during
authentication. 4KiB by default
+ * Maximum size of a POST which will be saved by the container during
authentication. 4 KiB by default
*/
protected int maxSavePostSize = 4 * 1024;
diff --git a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
index bad632dd36..d0c8f46fd0 100644
--- a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
+++ b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
@@ -46,7 +46,7 @@ public class FileMessageFactory {
/**
* The number of bytes that we read from file
*/
- public static final int READ_SIZE = 1024 * 10; // 10KiB
+ public static final int READ_SIZE = 1024 * 10; // 10 KiB
/**
* The file that we are reading/writing
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
index a2187e2520..c3270357ac 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
@@ -92,11 +92,11 @@ throughputInterceptor.report=ThroughputInterceptor
Report[\n\
\tSent:{1} MiB (total)\n\
\tSent:{2} MiB (application)\n\
\tTime:{3} seconds\n\
-\tTx Speed:{4} MiB/sec (total)\n\
-\tTx Speed:{5} MiB/sec (application)\n\
+\tTx Speed:{4} MiB/s (total)\n\
+\tTx Speed:{5} MiB/s (application)\n\
\tError Msg:{6}\n\
\tRx Msg:{7} messages\n\
-\tRx Speed:{8} MiB/sec (since 1st msg)\n\
+\tRx Speed:{8} MiB/s (since 1st msg)\n\
\tReceived:{9} MiB]\n
twoPhaseCommitInterceptor.expiredMessage=Removing expired message [{0}]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_cs.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_cs.properties
index efa7d63d08..074dd42cce 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_cs.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_cs.properties
@@ -49,11 +49,11 @@ throughputInterceptor.report=ThroughputInterceptor Výpis[\n\
\tOdesláno:{1} MiB (celkem)\n\
\tOdesláno:{2} MiB (aplikace)\n\
\tČas:{3} sekund\n\
-\tOdchozí rychlost:{4} MiB/sec (celkem)\n\
-\tOdchozí rychlost:{5} MiB/sec (aplikace)\n\
+\tOdchozí rychlost:{4} MiB/s (celkem)\n\
+\tOdchozí rychlost:{5} MiB/s (aplikace)\n\
\tChybové zprávy:{6}\n\
\tPříchozí zprávy:{7} zpráv\n\
-\tPříchozí rychlost:{8} MiB/sec (od první zprávy)\n\
+\tPříchozí rychlost:{8} MiB/s (od první zprávy)\n\
\tPřijato:{9} MiB]
twoPhaseCommitInterceptor.heartbeat.failed=Nelze provést heartbeat na
TwoPhaseCommit interceptoru.
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_es.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_es.properties
index b54950f929..a528b18cf1 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_es.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_es.properties
@@ -51,11 +51,11 @@ throughputInterceptor.report=ThroughputInterceptor
Reporte[\n\
\tTx Msg:{0} mensajes\n\
\tEnviados:{2} MiB (aplicación)\n\
\tTiempo:{3} segundos\n\
-\tTx Speed:{4} MiB/seg(total)\n\
-\tTx Speed::{5} MiB/seg(aplicación)\n\
+\tTx Speed:{4} MiB/s (total)\n\
+\tTx Speed::{5} MiB/s (aplicación)\n\
\tMsg error:{6}\n\
\tRx Msg:{7} mensajes\n\
-\tRx Speed:{8} MiB/sec (desde 1er msg)\n\
+\tRx Speed:{8} MiB/s (desde 1er msg)\n\
\tRecivido:{9} MiB]
twoPhaseCommitInterceptor.heartbeat.failed=Incapáz de ejecutar heartbeat en el
interceptor TwoPhaseCommit
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
index 994f01abd1..5e7978e023 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
@@ -92,11 +92,11 @@ throughputInterceptor.report=Rapport de l''intercepteur du
débit ("ThroughputIn
\tEnvoyé (Sent) : {1} MiB (total)\n\
\tEnvoyé (Sent) : {2} MiB (application)\n\
\tDurée (Time) : {3} secondes\n\
-\tVitesse d''écriture (Tx Speed) : {4} MiB/sec (total)\n\
-\tVitesse d''écriture (Tx Speed) : {5} MiB/sec (application)\n\
+\tVitesse d''écriture (Tx Speed) : {4} MiB/s (total)\n\
+\tVitesse d''écriture (Tx Speed) : {5} MiB/s (application)\n\
\tMsg d''erreur (Error Msg) : {6}\n\
\tMsg Reçus (Rx Msg) : {7} messages\n\
-\tVitesse de Réception (Rx Speed) : {8} MiB/sec (depuis le 1er message)\n\
+\tVitesse de Réception (Rx Speed) : {8} MiB/s (depuis le 1er message)\n\
\tReçu : {9} MiB]
twoPhaseCommitInterceptor.expiredMessage=Retrait du message expiré [{0}]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
index 4abf3bdd33..bd89a77db3 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
@@ -92,11 +92,11 @@ throughputInterceptor.report=ThroughputInterceptor
Report[\n\
\ 送信済み (Sent):{1} MiB (total)\n\
\ 送信済み (Sent):{2} MiB (application)\n\
\ 時間 (Time):{3} seconds\n\
-\ 送信速度 (Tx Speed):{4} MiB/sec (total)\n\
-\ 送信速度 (Tx Speed):{5} MiB/sec (application)\n\
+\ 送信速度 (Tx Speed):{4} MiB/s (total)\n\
+\ 送信速度 (Tx Speed):{5} MiB/s (application)\n\
\ エラーメッセージ (Error Msg):{6}\n\
\ 受信メッセージ (Rx Msg):{7} messages\n\
-\ 受信速度 (Rx Speed):{8} MiB/sec (since 1st msg)\n\
+\ 受信速度 (Rx Speed):{8} MiB/s (since 1st msg)\n\
\ 受信済み (Received):{9} MiB]
twoPhaseCommitInterceptor.expiredMessage=期限切れのメッセージを取り除きました。 [{0}]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ko.properties
index 4f3a547da2..85f66859a2 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ko.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ko.properties
@@ -92,11 +92,11 @@ throughputInterceptor.report=ThroughputInterceptor의 보고 [\n\
\tSent:{1} MiB (전체)\n\
\tSent:{2} MiB (애플리케이션)\n\
\tTime:{3} 초\n\
-\tTx Speed:{4} MiB/sec (전체)\n\
-\tTx Speed:{5} MiB/sec (애플리케이션)\n\
+\tTx Speed:{4} MiB/s (전체)\n\
+\tTx Speed:{5} MiB/s (애플리케이션)\n\
\tError Msg:{6}\n\
\tRx Msg:{7} 메시지\n\
-\tRx Speed:{8} MiB/sec (첫번째 메시지 이후로)\n\
+\tRx Speed:{8} MiB/s (첫번째 메시지 이후로)\n\
\tReceived:{9} MiB]\n\
\n
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_pt_BR.properties
index ec8a0d39ff..121ef1d4fb 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_pt_BR.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_pt_BR.properties
@@ -30,9 +30,9 @@ throughputInterceptor.report=ThroughputInterceptor Report[\n\
\tEnviado:{1} MiB (total)\n\
\tEnviado:{2} MiB (aplicação)\n\
\tTempo:{3} segundos\n\
-\tTaxa Tx:{4} MiB/seg (total)\n\
-\tTaxa Tx:{5} MiB/seg (aplicação)\n\
+\tTaxa Tx:{4} MiB/s (total)\n\
+\tTaxa Tx:{5} MiB/s (aplicação)\n\
\tMsgs erro:{6}\n\
\tRx Msg:{7} mensagens\n\
-\tTaxa Rx:{8} MiB/seg (desde a primeira mensagem)\n\
+\tTaxa Rx:{8} MiB/s (desde a primeira mensagem)\n\
\tRecebido:{9} MiB]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index ba80e510ca..66bd67188b 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -92,11 +92,11 @@ throughputInterceptor.report=吞吐量拦截器报告[\n\
\ 发送：{1}MiB (总共)\n\
\ 发送：{2}MiB (应用)\n\
\ 耗时：{3}秒\n\
-\ 传输速率：{4}MiB/秒（总共）\n\
-\ 传输速率：{5}MiB/秒（应用）\n\
+\ 传输速率：{4}MiB/s（总共）\n\
+\ 传输速率：{5}MiB/s（应用）\n\
\ 错误消息：{6}\n\
\ 接收消息：{7} 消息数\n\
-\ 接收速率：{8} MiB/秒（从第一个消息开始）\n\
+\ 接收速率：{8} MiB/s（从第一个消息开始）\n\
\ 收到：{9}MiB]\n
twoPhaseCommitInterceptor.expiredMessage=正在删除过期邮件[{0}]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
index 567ef5b8b1..23b4ad86ec 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
@@ -48,7 +48,7 @@ public class MessageDispatchInterceptor extends
ChannelInterceptorBase
protected static final StringManager sm =
StringManager.getManager(MessageDispatchInterceptor.class);
- protected long maxQueueSize = 1024*1024*64; //64MiB
+ protected long maxQueueSize = 1024*1024*64; //64 MiB
protected volatile boolean run = false;
protected boolean useDeepClone = true;
protected boolean alwaysSend = true;
diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java
b/java/org/apache/catalina/tribes/io/BufferPool.java
index 86705f0c91..29e8804f9b 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -28,7 +28,7 @@ public class BufferPool {
private static final Log log = LogFactory.getLog(BufferPool.class);
public static final int DEFAULT_POOL_SIZE =
-
Integer.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE",
100*1024*1024).intValue(); //100MiB
+
Integer.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE",
100*1024*1024).intValue(); //100 MiB
protected static final StringManager sm =
StringManager.getManager(BufferPool.class);
diff --git a/java/org/apache/catalina/util/IOTools.java
b/java/org/apache/catalina/util/IOTools.java
index 5afbd4ceff..7b5507dfbd 100644
--- a/java/org/apache/catalina/util/IOTools.java
+++ b/java/org/apache/catalina/util/IOTools.java
@@ -71,7 +71,7 @@ public class IOTools {
/**
* Read input from input stream and write it to output stream until there
is
* no more input from input stream using a new buffer of the default size
- * (4KiB).
+ * (4 KiB).
*
* @param is input stream the input stream to read from.
* @param os output stream the output stream to write to.
diff --git a/java/org/apache/catalina/webresources/LocalStrings.properties
b/java/org/apache/catalina/webresources/LocalStrings.properties
index 772d2b88f9..0b8472f238 100644
--- a/java/org/apache/catalina/webresources/LocalStrings.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings.properties
@@ -24,8 +24,8 @@ abstractResourceSet.checkPath=The requested path [{0}] is not
valid. It must beg
cache.addFail=Unable to add the resource at [{0}] to the cache for web
application [{1}] because there was insufficient free space available after
evicting expired cache entries - consider increasing the maximum size of the
cache
cache.backgroundEvictFail=The background cache eviction process was unable to
free [{0}] percent of the cache for Context [{1}] - consider increasing the
maximum size of the cache. After eviction approximately [{2}] KiB of data
remained in the cache.
-cache.objectMaxSizeTooBig=The value of [{0}]KiB for objectMaxSize is larger
than the limit of maxSize/20 so has been reduced to [{1}]KiB
-cache.objectMaxSizeTooBigBytes=The value specified for the maximum object size
to cache [{0}]KiB is greater than Integer.MAX_VALUE bytes which is the maximum
size that can be cached. The limit will be set to Integer.MAX_VALUE bytes.
+cache.objectMaxSizeTooBig=The value of [{0}] KiB for objectMaxSize is larger
than the limit of maxSize/20 so has been reduced to [{1}] KiB
+cache.objectMaxSizeTooBigBytes=The value specified for the maximum object size
to cache [{0}] KiB is greater than Integer.MAX_VALUE bytes which is the maximum
size that can be cached. The limit will be set to Integer.MAX_VALUE bytes.
cachedResource.invalidURL=Unable to create an instance of
CachedResourceURLStreamHandler because the URL [{0}] is malformed
diff --git a/java/org/apache/catalina/webresources/LocalStrings_fr.properties
b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
index 5bfbf995ce..646e595fa3 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
@@ -24,8 +24,8 @@ abstractResourceSet.checkPath=Le chemin demandé [{0}] n''est
pas valide, il doi
cache.addFail=Incapable d''ajouter la ressource située [{0}] au cache de
l''application web [{1}] parce qu''il n''y avait pas assez d''espace libre
disponible après l''éviction des entrées de cache expirées - envisagez
d''augmenter la taille maximale du cache
cache.backgroundEvictFail=Le processus d''arrière plan d''éviction du cache
n''a pas pu nettoyer [{0}] pourcents du cache pour le contexte [{1}], il
faudrait augmenter la taille maximale du cache ; après l''éviction,
approximativement [{2}] KO de données restaient dans le cache
-cache.objectMaxSizeTooBig=La valeur [{0}]KiB pour l''objectMaxSize est plus
grade que la limite de maxSize/20 son elle a été réduite à [{1}]KiB\n
-cache.objectMaxSizeTooBigBytes=La valeur de taille d''objet maximale pouvant
être mis en cache de [{0}]KiB est supérieure à Integer.MAX_VALUE qui est le
maximum, la limite a donc été fixée à Integer.MAX_VALUE octets
+cache.objectMaxSizeTooBig=La valeur [{0}] KiB pour l''objectMaxSize est plus
grade que la limite de maxSize/20 son elle a été réduite à [{1}] KiB\n
+cache.objectMaxSizeTooBigBytes=La valeur de taille d''objet maximale pouvant
être mis en cache de [{0}] KiB est supérieure à Integer.MAX_VALUE qui est le
maximum, la limite a donc été fixée à Integer.MAX_VALUE octets
cachedResource.invalidURL=La création d''une instance de
CachedResourceURLStreamHandler a échouée car l''URL [{0}] est malformée
diff --git a/java/org/apache/catalina/webresources/LocalStrings_ja.properties
b/java/org/apache/catalina/webresources/LocalStrings_ja.properties
index 5b4c6ad9d1..7a66dba885 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_ja.properties
@@ -25,7 +25,7 @@ abstractResourceSet.checkPath=リクエストパス [{0}] が無効です。"/"
cache.addFail=有効期限切れの項目を破棄しても利用可能な領域が不足するため、Web アプリケーション [{1}] のキャッシュにリソース
[{0}] を追加できません。最大キャッシュサイズの増加を検討してください。
cache.backgroundEvictFail=コンテキスト [{1}] のバックグラウンドキャッシュ削除処理は全体の [{0}] %
を解放できませんでした。キャッシュサイズの最大値の増加を検討してください。現在は約 [{2}] KiB のデータがキャッシュに残存しています。
cache.objectMaxSizeTooBig=objectMaxSizeの [{0}] KiBの値がmaxSize /
20の制限より大きいため、[{1}] KiBに減少しました
-cache.objectMaxSizeTooBigBytes=キャッシュ可能なオブジェクトサイズの最大値に指定された [{0}]KiB は
Integer.MAX_VALUE バイトを越えています。最大値に Integer.MAX_VALUE を設定します。
+cache.objectMaxSizeTooBigBytes=キャッシュ可能なオブジェクトサイズの最大値に指定された [{0}] KiB は
Integer.MAX_VALUE バイトを越えています。最大値に Integer.MAX_VALUE を設定します。
cachedResource.invalidURL=URL [{0}] は不正です。CachedResourceURLStreamHandler
インスタンスを生成できません
diff --git a/java/org/apache/catalina/webresources/LocalStrings_ko.properties
b/java/org/apache/catalina/webresources/LocalStrings_ko.properties
index e2fbd6e780..6ac49eaedd 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_ko.properties
@@ -24,8 +24,8 @@ abstractResourceSet.checkPath=요청된 경로 [{0}]은(는) 유효하지 않습
cache.addFail=[{0}]에 위치한 리소스를 웹 애플리케이션 [{1}]을(를) 위한 캐시에 추가할 수 없습니다. 왜냐하면 만료된
캐시 엔트리들을 없애버린 이후에도 여유 공간이 충분하지 않기 때문입니다. 캐시의 최대 크기를 증가시키는 것을 고려해 보십시오.
cache.backgroundEvictFail=백그라운드 캐시 퇴거 (cache eviction) 프로세스가, 컨텍스트 [{1}]을(를)
위한 캐시의 [{0}] 퍼센트를 해제시킬 수 없었습니다. 캐시의 최대 크기를 증가시킬 것을 고려해 보십시오. 캐시 퇴거 작업 이후, 대략
[{2}] KiB의 데이터가 캐시에 남아 있습니다.
-cache.objectMaxSizeTooBig=objectMaxSize를 위한 값 [{0}]KiB이, maxSize/20인 최대한계값 보다
커서, [{1}]KiB로 줄여졌습니다.
-cache.objectMaxSizeTooBigBytes=[{0}]KiB를 캐시하기 위해, 최대 객체 크기로서 지정된 값이
Integer.MAX_VALUE 바이트보다 큰데, Integer.MAX_VALUE는 캐시될 수 있는 최대 크기입니다. 한계 값을
Integer.MAX_VALUE 바이트로 설정하겠습니다.
+cache.objectMaxSizeTooBig=objectMaxSize를 위한 값 [{0}] KiB이, maxSize/20인 최대한계값 보다
커서, [{1}] KiB로 줄여졌습니다.
+cache.objectMaxSizeTooBigBytes=[{0}] KiB를 캐시하기 위해, 최대 객체 크기로서 지정된 값이
Integer.MAX_VALUE 바이트보다 큰데, Integer.MAX_VALUE는 캐시될 수 있는 최대 크기입니다. 한계 값을
Integer.MAX_VALUE 바이트로 설정하겠습니다.
cachedResource.invalidURL=URL [{0}]이(가) 유효하지 않기 때문에
CachedResourceURLStreamHandler 인스턴스를 생성할 수 없습니다.
diff --git
a/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
index 01ee578343..7f87c2441b 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
@@ -23,8 +23,8 @@ abstractResource.getContentTooLarge=无法返回[{0}]作为字节数组，因为
abstractResourceSet.checkPath=请求的路径[{0}]无效。必须以“/”开头。
cache.addFail=无法将位于[{0}]的资源添加到Web应用程序[{1}]的缓存中，因为在清除过期缓存条目后可用空间仍不足 -
请考虑增加缓存的最大空间。
-cache.backgroundEvictFail=后台缓存收回进程无法释放上下文[{1}]的缓存的[{0}]%-请考虑增加缓存的最大大小。在逐出之后，缓存中大约保留了[{2}]KiB的数据。
-cache.objectMaxSizeTooBig=objectMaxSize的值[{0}]KiB大于maxSize/20的限制，因此已缩减为[{1}]KiB
+cache.backgroundEvictFail=后台缓存收回进程无法释放上下文[{1}]的缓存的[{0}]%-请考虑增加缓存的最大大小。在逐出之后，缓存中大约保留了[{2}]
KiB的数据。
+cache.objectMaxSizeTooBig=objectMaxSize的值[{0}] KiB大于maxSize/20的限制，因此已缩减为[{1}]
KiB
cache.objectMaxSizeTooBigBytes=为要缓存的最大对象大小[{0}]
KiB指定的值大于Integer.MAX_VALUE字节，后者是可以缓存的最大大小。该限制将设置为Integer.MAX_VALUE字节。
cachedResource.invalidURL=无法创建CachedResourceURLStreamHandler实例，因为URL[{0}]畸形
diff --git
a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
index cf07cad376..aad8795615 100644
--- a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
+++ b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
@@ -34,7 +34,7 @@ import org.apache.tomcat.util.http.fileupload.FileItemFactory;
* <p>If not otherwise configured, the default configuration values are as
* follows:</p>
* <ul>
- * <li>Size threshold is 10KiB.</li>
+ * <li>Size threshold is 10 KiB.</li>
* <li>Repository is the system default temp directory, as returned by
* {@code System.getProperty("java.io.tmpdir")}.</li>
* </ul>
diff --git a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
index a9b2681a48..385bfbaa52 100644
--- a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
+++ b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
@@ -454,7 +454,7 @@ public class TestSwallowAbortedUploads extends
TomcatBaseTest {
// Smarter than the typical client. Attempts to read the response
// even if the request is not fully written.
try {
- // Write (or try to write) 16MiB
+ // Write (or try to write) 16 MiB
for (int i = 0; i < 1024 * 1024; i++) {
writer.write("10\r\n");
writer.write("0123456789ABCDEF\r\n");
diff --git a/test/org/apache/catalina/tribes/demos/ChannelCreator.java
b/test/org/apache/catalina/tribes/demos/ChannelCreator.java
index 3d2753e96d..77009ca86e 100644
--- a/test/org/apache/catalina/tribes/demos/ChannelCreator.java
+++ b/test/org/apache/catalina/tribes/demos/ChannelCreator.java
@@ -81,7 +81,7 @@ public class ChannelCreator {
String transport =
"org.apache.catalina.tribes.transport.nio.PooledParallelSender";
String receiver =
"org.apache.catalina.tribes.transport.nio.NioReceiver";
boolean async = false;
- int asyncsize = 1024 * 1024 * 50; // 50MiB
+ int asyncsize = 1024 * 1024 * 50; // 50 MiB
boolean throughput = false;
boolean failuredetect = false;
diff --git a/test/org/apache/tomcat/util/net/TestSsl.java
b/test/org/apache/tomcat/util/net/TestSsl.java
index 61e9789996..e9425e39aa 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -123,7 +123,7 @@ public class TestSsl extends TomcatBaseTest {
private static final int POST_DATA_SIZE = 16 * 1024 * 1024;
private static final byte[] POST_DATA;
static {
- POST_DATA = new byte[POST_DATA_SIZE]; // 16MiB
+ POST_DATA = new byte[POST_DATA_SIZE]; // 16 MiB
Arrays.fill(POST_DATA, (byte) 1);
}
@@ -166,7 +166,7 @@ public class TestSsl extends TomcatBaseTest {
os.write("POST /post HTTP/1.1\r\n".getBytes());
os.write("Host: localhost\r\n".getBytes());
os.write(("Content-Length: " +
Integer.valueOf(POST_DATA.length) + "\r\n\r\n").getBytes());
- // Write in 128KiB blocks
+ // Write in 128 KiB blocks
for (int i = 0; i < POST_DATA.length / (128 * 1024);
i++) {
os.write(POST_DATA, 0, 1024 * 128);
Thread.sleep(10);
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index aa002f80b0..bbccae65d0 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -717,7 +717,7 @@
application write buffer size + network read buffer size +
network write buffer size</code><br/>
The value is in bytes, the default value is <code>1024*1024*100</code>
- (100MiB).</p>
+ (100 MiB).</p>
</attribute>
<attribute name="socket.processorCache" required="false">
diff --git a/webapps/docs/config/cluster-interceptor.xml
b/webapps/docs/config/cluster-interceptor.xml
index c0404c8220..995af17a43 100644
--- a/webapps/docs/config/cluster-interceptor.xml
+++ b/webapps/docs/config/cluster-interceptor.xml
@@ -132,7 +132,7 @@
is sent synchronously, if <code>false</code> an error is thrown.
</attribute>
<attribute name="maxQueueSize" required="false">
- Size in bytes of the dispatch queue, the default value is <code>
1024*1024*64 (64MiB)</code> sets the maximum queue size for the dispatch queue
+ Size in bytes of the dispatch queue, the default value is <code>
1024*1024*64 (64 MiB)</code> sets the maximum queue size for the dispatch queue
if the queue fills up, one can trigger the behavior, if
<code>alwaysSend</code> is set to true, the message will be sent synchronously
if the flag is false, an error is thrown
</attribute>
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index fb1d5a3a3d..0f5228c095 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -256,7 +256,7 @@
<property name="org.apache.tomcat. websocket.DEFAULT_BUFFER_SIZE">
<p>The default size for buffers used in the Websockets container.</p>
- <p>The default value is <code>8192</code> which corresponds to 8KiB.</p>
+ <p>The default value is <code>8192</code> which corresponds to 8 KiB.</p>
</property>
<property name="org.apache.tomcat. websocket.DEFAULT_ORIGIN_HEADER_VALUE">
@@ -372,7 +372,7 @@
<property name="org.apache.catalina.tribes.io.
BufferPool.DEFAULT_POOL_SIZE">
<p>The size of the buffer pool which is used by Tribes in bytes.</p>
<p>If not specified, the default value of <code>100*1024*1024</code>
- (100MiB) will be used.</p>
+ (100 MiB) will be used.</p>
</property>
</properties>
diff --git a/webapps/docs/security-howto.xml b/webapps/docs/security-howto.xml
index 8a6b51dc5a..5751559455 100644
--- a/webapps/docs/security-howto.xml
+++ b/webapps/docs/security-howto.xml
@@ -257,7 +257,7 @@
<p>The <strong>maxPostSize</strong> attribute controls the maximum size
of a POST request that will be parsed for parameters. The parameters are
- cached for the duration of the request so this is limited to 2MiB by
+ cached for the duration of the request so this is limited to 2 MiB by
default to reduce exposure to a DOS attack.</p>
<p>The <strong>maxSavePostSize</strong> attribute controls the saving of
diff --git
a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
index 5ca01598d1..5ac0054a30 100644
--- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
+++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
@@ -50,7 +50,7 @@ public class CompressionFilter extends GenericFilter {
/**
* Minimal reasonable buffer.
*/
- // 8KiB is what tomcat would use by default anyway
+ // 8 KiB is what tomcat would use by default anyway
private static final int MIN_BUFFER = 8192;
/**
diff --git
a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
index 0837a214c4..0c6a65f6e3 100644
---
a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
+++
b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
@@ -82,7 +82,7 @@ public class CompressionServletResponseWrapper
/**
* The compression buffer size
*/
- protected int compressionBuffer = 8192; // 8KiB default
+ protected int compressionBuffer = 8192; // 8 KiB default
/**
* The mime types to compress
diff --git a/webapps/manager/WEB-INF/web.xml b/webapps/manager/WEB-INF/web.xml
index a25addfd48..d9e83df3f3 100644
--- a/webapps/manager/WEB-INF/web.xml
+++ b/webapps/manager/WEB-INF/web.xml
@@ -53,7 +53,7 @@
</init-param>
-->
<multipart-config>
- <!-- 50MiB max -->
+ <!-- 50 MiB max -->
<max-file-size>52428800</max-file-size>
<max-request-size>52428800</max-request-size>
<file-size-threshold>0</file-size-threshold>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
