(tomcat) branch 9.0.x updated: Fix typo
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 cb241847f4 Fix typo
cb241847f4 is described below
commit cb241847f4f6bd0e210228f18039afb6cbaee17e
Author: Mark Thomas
AuthorDate: Thu Apr 25 14:44:43 2024 +0100
Fix typo
---
test/org/apache/coyote/http11/TestHttp11Processor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 55172aef19..a26a7f96a5 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -737,7 +737,7 @@ public class TestHttp11Processor extends TomcatBaseTest {
public void run() {
if (delayAsyncThread) {
// Makes the difference between calling complete before
-// the request body is received of after.
+// the request body is received or after.
try {
Thread.sleep(1500);
} catch (InterruptedException e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix typo
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 268684e26f Fix typo
268684e26f is described below
commit 268684e26f87998c6e0499caa4f4d393ac5fe76e
Author: Mark Thomas
AuthorDate: Wed Apr 24 17:06:36 2024 +0100
Fix typo
---
test/org/apache/catalina/connector/TestRequest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index 09cc1068f6..3face2f3e8 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -904,7 +904,7 @@ public class TestRequest extends TomcatBaseTest {
@Test
-public void testGetReaderInvalidEbcoding() throws Exception {
+public void testGetReaderInvalidEncoding() throws Exception {
doTestGetReader("X-Invalid", false);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix typo
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 997856b76c Fix typo 997856b76c is described below commit 997856b76c960f98611aa137ff4be377ffbef4f9 Author: Mark Thomas AuthorDate: Wed Apr 3 18:01:25 2024 +0100 Fix typo --- MERGE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MERGE.txt b/MERGE.txt index c63cb30d62..b73dfeeb8e 100644 --- a/MERGE.txt +++ b/MERGE.txt @@ -43,7 +43,7 @@ Codec Sub-tree: src/main/java/org/apache/commons/codec The SHA1 ID / tag for the most recent commit to be merged to Tomcat is: -rel/commons-codec-1.16,.1 (2024-02-09) +rel/commons-codec-1.16.1 (2024-02-09) Note: Only classes required for Base64 encoding/decoding. The rest are removed. FileUpload - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
remm 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 4ffe8d5ecf Fix typo
4ffe8d5ecf is described below
commit 4ffe8d5ecf3b766dae8ddc2f0b7e4d408f0b205e
Author: remm
AuthorDate: Tue Mar 5 14:13:03 2024 +0100
Fix typo
---
java/org/apache/catalina/core/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index eb54a58eb2..87df51ea44 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -55,7 +55,7 @@ applicationFilterConfig.jmxUnregisterFail=JMX de-registration
failed for filter
applicationFilterConfig.preDestroy=Failed the call to preDestroy for the
filter named [{0}] of type [{1}]
applicationFilterConfig.release=Failed to destroy the filter named [{0}] of
type [{1}]
-applicationFilterFactory.noFilterConfig=No filter configuration sound for [{0}]
+applicationFilterFactory.noFilterConfig=No filter configuration found for [{0}]
applicationFilterRegistration.nullInitParam=Unable to set initialisation
parameter for filter due to null name and/or value. Name [{0}], Value [{1}]
applicationFilterRegistration.nullInitParams=Unable to set initialisation
parameters for filter due to null name and/or value. Name [{0}], Value [{1}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix typo
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 1a410a8c78 Fix typo
1a410a8c78 is described below
commit 1a410a8c780480052be5b622edc98ef8e44cff31
Author: Mark Thomas
AuthorDate: Tue Feb 13 10:24:21 2024 +
Fix typo
---
java/org/apache/catalina/core/LocalStrings_fr.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_ja.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_ko.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 19248e1b73..42d794692b 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -266,7 +266,7 @@ standardHost.notContext=Le fils d'un hôte (child of a Host)
doit être un conte
standardHost.nullName=Le nom d'hôte est requis
standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de
l''hôte [{0}] la fera correspondre à CATALINA_BASE, ce qui causera des problèmes
-standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
+standardHostValve.customStatusFailed=La page d''erreur personnalisée [{0}]
n''a pu être redirigée correctement
standardPipeline.basic.start=Erreur lors du démarrage de la nouvelle valve de
base
standardPipeline.basic.stop=Erreur lors de l'arrêt de l'ancienne valve de base
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 77abb407b8..92588f7fb3 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -266,7 +266,7 @@ standardHost.notContext=Host の子供はContextでなければいけません
standardHost.nullName=ホスト名が必要です
standardHost.problematicAppBase=ホスト [{0}]
のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです
-standardHostValue.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
+standardHostValve.customStatusFailed=カスタムエラーページ [{0}] を正しくディスパッチできませんでした
standardPipeline.basic.start=新しい基本 Valve を開始できません。
standardPipeline.basic.stop=古い基本 Valve を停止できません。
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index ef6f975b83..a7f0494553 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -256,7 +256,7 @@ standardHost.notContext=호스트의 자식은 반드시 컨텍스트이어야
standardHost.nullName=호스트 이름이 필수적입니다.
standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문자열을 사용하는 것은, 결국
appBase를 CATALINA_BASE로 설정하게 되는데, 이는 좋은 생각이 아닙니다.
-standardHostValue.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
+standardHostValve.customStatusFailed=커스텀 오류 페이지 [{0}]은(는) 올바르게 디스패치될 수 없었습니다.
standardPipeline.basic.start=새로운 기본 Valve를 시작하는 중 오류 발생
standardPipeline.basic.stop=이전 기본 Valve를 중지시키는 중 오류 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 857e4d8db9..ca67190cb1 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -261,7 +261,7 @@ standardHost.notContext=主机的子节点必须有上下文
standardHost.nullName=主机名是必需的
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
-standardHostValue.customStatusFailed=无法正确调度自定义错误页[{0}]
+standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
standardPipeline.basic.start=启动新基本阀时出错
standardPipeline.basic.stop=停止旧基本阀时出错
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz 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 dc3af5ce56 Fix typo dc3af5ce56 is described below commit dc3af5ce56a33f5b951aac9153e8eb775a8c81c7 Author: Christopher Schultz AuthorDate: Fri Feb 2 14:54:50 2024 -0500 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9530ce2c1b..4d747757f4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -1070,7 +1070,7 @@ 66524 Correct eviction ordering in WebResource cache to -by LRU as intended. (schultz) +be LRU as intended. (schultz) Use server.xml to reduce the default value of - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix typo
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 87f2834c25 Fix typo
87f2834c25 is described below
commit 87f2834c256a26323a6a53d5aa3e10168e073540
Author: Mark Thomas
AuthorDate: Mon Jan 15 13:32:45 2024 +
Fix typo
---
java/org/apache/catalina/ssi/ResponseIncludeWrapper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
index 2271ea7414..50cb5f09d7 100644
--- a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
+++ b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
@@ -77,7 +77,7 @@ public class ResponseIncludeWrapper extends
HttpServletResponseWrapper {
/**
- * Return a printwriter, throws and exception if an OutputStream already
been returned.
+ * Return a printwriter, throws an exception if an OutputStream already
been returned.
*
* @return a PrintWriter object
*
@@ -98,7 +98,7 @@ public class ResponseIncludeWrapper extends
HttpServletResponseWrapper {
/**
- * Return an OutputStream, throws and exception if a printwriter already
been returned.
+ * Return an OutputStream, throws an exception if a printwriter already
been returned.
*
* @return an OutputStream object
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix typo
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 79d4882f3d Fix typo 79d4882f3d is described below commit 79d4882f3da75cf7bb33f5a20107bb99c17f6636 Author: Mark Thomas AuthorDate: Thu Jan 4 16:22:25 2024 + Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 08f43cf46a..7785ab722d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -171,7 +171,7 @@ Background processes should not be run concurrently with lifecycle -oprations of a container. (remm) +operations of a container. (remm) Correct unintended escaping of XML in some WebDAV responses. The XML - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix typo
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 428b6cd3d4 Fix typo 428b6cd3d4 is described below commit 428b6cd3d42c7cfc307c114e10dbcf30e8594bb0 Author: Mark Thomas AuthorDate: Sat Dec 23 13:29:04 2023 + Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 170771d217..2bb1a6f150 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -3963,7 +3963,7 @@ Ensure that the ReadListener's onError() event is triggered if the client closes the connection before sending the -entire request body and the server is ready the request body using +entire request body and the server is reading the request body using non-blocking I/O. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 5524fc999c Fix typo 5524fc999c is described below commit 5524fc999ceec9597064b07ffcb3bcb3faedb2fe Author: Mark Thomas AuthorDate: Wed Oct 11 09:41:18 2023 -0300 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 23d01da0ce..46f8d0cdd9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -116,7 +116,7 @@ -67664: Correct a regression in the clean-up of unencessary +67664: Correct a regression in the clean-up of unnecessary use of fully qualified class names in 9.0.81 that broke the jdbc-pool. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository.
lihan 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 29ef6e183f Fix typo.
29ef6e183f is described below
commit 29ef6e183f956d58eba5820b0b463a990aff4928
Author: lihan
AuthorDate: Thu Aug 10 11:15:06 2023 +0800
Fix typo.
(cherry picked from commit c1388b3ed08f7a72bc5193d5c5242087a9e73e7d)
---
java/org/apache/catalina/connector/Request.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index be6aed055f..2ed59f22a0 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3162,7 +3162,7 @@ public class Request implements HttpServletRequest {
parameters.setQueryStringCharset(charset);
}
// Note: If !useBodyEncodingForURI, the query string encoding is
-// that set towards the start of CoyoyeAdapter.service()
+// that set towards the start of CoyoteAdapter.service()
parameters.handleQueryParameters();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
lihan 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 ef5339cc0d Fix typo
ef5339cc0d is described below
commit ef5339cc0db07614a20fe7a335a2db1b8754cb04
Author: lihan
AuthorDate: Fri Apr 28 10:57:48 2023 +0800
Fix typo
---
test/org/apache/catalina/filters/TestRateLimitFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java
b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index ce7467eb64..7e92351f8d 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -74,7 +74,7 @@ public class TestRateLimitFilter extends TomcatBaseTest {
// Sleep for up to 10s for clients to complete
int count = 0;
while (count < 100 && (tc1.results[24] == 0 || tc2.results[49] == 0 ||
tc3.results[allowedRequests - 1] == 0 ||
-tc3.results[allowedRequests] == 0 ||
tc3.results[allowedRequests - 1] == 0 ||
+tc3.results[allowedRequests] == 0 ||
tc4.results[allowedRequests - 1] == 0 ||
tc4.results[allowedRequests] == 0)) {
Thread.sleep(100);
count++;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 bf3d9069ff Fix typo
bf3d9069ff is described below
commit bf3d9069ffeac8aec2a77a4d9ed2bccb6ca816b7
Author: Mark Thomas
AuthorDate: Wed May 10 20:15:16 2023 +0100
Fix typo
---
java/org/apache/tomcat/util/compat/Jre19Compat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/Jre19Compat.java
b/java/org/apache/tomcat/util/compat/Jre19Compat.java
index fb94810b40..45ce68b666 100644
--- a/java/org/apache/tomcat/util/compat/Jre19Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre19Compat.java
@@ -36,7 +36,7 @@ public class Jre19Compat extends Jre16Compat {
try {
c1 = Class.forName("java.lang.WrongThreadException");
} catch (ClassNotFoundException cnfe) {
-// Must be pre-Java 16
+// Must be pre-Java 19
log.debug(sm.getString("jre19Compat.javaPre19"), cnfe);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 4d63c77b02 Fix typo 4d63c77b02 is described below commit 4d63c77b0276facc52a2eb794e5616d90204fcf7 Author: Mark Thomas AuthorDate: Wed May 3 19:55:20 2023 +0100 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 95dd009e08..0898219add 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -131,7 +131,7 @@ 613: Fix possible partial corrupted file copies when using -file lockig protection or the manager servlet. Submitted +file locking protection or the manager servlet. Submitted by Jack Shirazi. (remm) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo - thanks Chuck
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 d2ac6e2847 Fix typo - thanks Chuck
d2ac6e2847 is described below
commit d2ac6e2847d45c9df03302b69a565b23020a8752
Author: Mark Thomas
AuthorDate: Sun Mar 26 14:32:31 2023 +0100
Fix typo - thanks Chuck
---
java/org/apache/catalina/connector/Request.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index ccf7320508..41fddef382 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2485,7 +2485,7 @@ public class Request implements HttpServletRequest {
/*
* As per PR #594, the manager could be provided by the web
application and calls to findSession() could trigger
- * class loading so set the thread context class loader appropriately
to void ClassNotFoundException.
+ * class loading so set the thread context class loader appropriately
to avoid ClassNotFoundException.
*/
ClassLoader originalClassLoader = context.bind(null);
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 30ac25abcf Fix typo 30ac25abcf is described below commit 30ac25abcf6ce457fc7eea02d67cfb48376f04b4 Author: Mark Thomas AuthorDate: Thu Mar 23 14:38:13 2023 + Fix typo --- webapps/docs/config/cluster-deployer.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/config/cluster-deployer.xml b/webapps/docs/config/cluster-deployer.xml index f956e46fbc..247948721f 100644 --- a/webapps/docs/config/cluster-deployer.xml +++ b/webapps/docs/config/cluster-deployer.xml @@ -84,7 +84,7 @@ attribute will have no effect. -FileMessageFactory instances used by the FarmWarDeployer are only +FileMessageFactory instances used by the FarmWarDeployer are only retained while they are required. When receiving a WAR file, the associated FileMessageFactory instance is deleted once the WAR file has been fully received. To avoid memory leaks under various error @@ -94,7 +94,7 @@ maximum time is exceeded, the FileMessageFactory will be deleted and the WAR file transfer will fail for that node. If a negative value is specified, the FileMessageFactory will only be removed once the WAR file -is fully recieved. If not specified, the default value of 300 (5 +is fully received. If not specified, the default value of 300 (5 minutes) will be used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 64a187283c Fix typo
64a187283c is described below
commit 64a187283c4301db58946fcf2fb6f802a6bf69ef
Author: Mark Thomas
AuthorDate: Mon Mar 6 20:52:05 2023 +
Fix typo
---
test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
index f2c4c20f3d..5572116c96 100644
--- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
+++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
@@ -922,8 +922,8 @@ public class TestAbstractAjpProcessor extends
TomcatBaseTest {
Map> headerMap = new HashMap<>();
for (int i = 0; i < headerCount; i++) {
String headerName = message.readHeaderName();
-String heaverValue = message.readString();
-headerMap.computeIfAbsent(headerName, k -> new
ArrayList<>()).add(heaverValue);
+String headerValue = message.readString();
+headerMap.computeIfAbsent(headerName, k -> new
ArrayList<>()).add(headerValue);
}
return headerMap;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo in changelog
This is an automated email from the ASF dual-hosted git repository. rjung 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 070ab6ce60 Fix typo in changelog 070ab6ce60 is described below commit 070ab6ce60a3199735f673b05e25adf6a4f2119a Author: Rainer Jung AuthorDate: Mon Feb 27 13:31:16 2023 +0100 Fix typo in changelog --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a0c6b8ebd8..3b64ec2b7b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -225,7 +225,7 @@ application to localhost by default. (markt) -66429: Examples. Limit access to the exmaples web application +66429: Examples. Limit access to the examples web application to localhost by default. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo in changelog.
This is an automated email from the ASF dual-hosted git repository. rjung 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 929153dacd Fix typo in changelog. 929153dacd is described below commit 929153dacde36282497db4e5776bca02e8e71b2a Author: Rainer Jung AuthorDate: Fri Jan 20 10:27:32 2023 +0100 Fix typo in changelog. --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2b4c3ffd89..ded49284b6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -139,7 +139,7 @@ name that required escaping when used in a URI path. (markt) -66392: Change the default value of AccessLogValue's +66392: Change the default value of AccessLogValve's file encoding to UTF-8 and update documentation. (lihan) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository.
lihan 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 762b4d3218 Fix typo.
762b4d3218 is described below
commit 762b4d3218ecb0f1b1c85992c5bac58ccaf851e7
Author: lihan
AuthorDate: Tue Nov 1 15:51:11 2022 +0800
Fix typo.
---
java/org/apache/catalina/core/ApplicationDispatcher.java | 2 +-
java/org/apache/catalina/core/StandardHostValve.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 58ed43b75a..d928ae253c 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -333,7 +333,7 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
State state = new State(request, response, false);
if (WRAP_SAME_OBJECT) {
-// Check SRV.9.2 / RequestDispacther Javadoc
+// Check SRV.9.2 / RequestDispatcher Javadoc
checkSameObjects(request, response);
}
diff --git a/java/org/apache/catalina/core/StandardHostValve.java
b/java/org/apache/catalina/core/StandardHostValve.java
index f730d7c035..0383d592b5 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -128,7 +128,7 @@ final class StandardHostValve extends ValveBase {
// Ask this Context to process this request. Requests that are
// already in error must have been routed here to check for
-// application defined error pages so DO NOT forward them to the
the
+// application defined error pages so DO NOT forward them to the
// application for processing.
try {
if (!response.isErrorReportRequired()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo in Javadoc
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 8ac13477c8 Fix typo in Javadoc
8ac13477c8 is described below
commit 8ac13477c82f94fa20f818d185c4836c1c21bca0
Author: Mark Thomas
AuthorDate: Fri Oct 28 10:34:03 2022 +0100
Fix typo in Javadoc
---
java/javax/servlet/jsp/JspContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/javax/servlet/jsp/JspContext.java
b/java/javax/servlet/jsp/JspContext.java
index ccdfd78bcd..f965ef5edf 100644
--- a/java/javax/servlet/jsp/JspContext.java
+++ b/java/javax/servlet/jsp/JspContext.java
@@ -229,7 +229,7 @@ public abstract class JspContext {
/**
* Obtain the ELContext for this JSPContext. Each JSPContext has a
dedicated
- * ELCOntext.
+ * ELContext.
*
* @return the ELContext for this JSPContext
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 3302769bee Fix typo
3302769bee is described below
commit 3302769bee8a44a14474619a19bf65eb631bbe7e
Author: Mark Thomas
AuthorDate: Fri Sep 30 14:30:24 2022 +0100
Fix typo
---
test/org/apache/coyote/http2/TestHttpServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestHttpServlet.java
b/test/org/apache/coyote/http2/TestHttpServlet.java
index 99209b5405..cb98abd23a 100644
--- a/test/org/apache/coyote/http2/TestHttpServlet.java
+++ b/test/org/apache/coyote/http2/TestHttpServlet.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
import org.junit.Test;
/*
- * Implement here rather than jakarta.servlet.http.TestHttpServley because it
+ * Implement here rather than jakarta.servlet.http.TestHttpServlet because it
* needs access to package private classes.
*/
public class TestHttpServlet extends Http2TestBase {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 47ae55e4da Fix typo
47ae55e4da is described below
commit 47ae55e4da70bd4d02c5cbd00fa44a115a93075f
Author: Mark Thomas
AuthorDate: Thu Sep 15 15:37:42 2022 +0100
Fix typo
---
java/javax/servlet/jsp/tagext/TagSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/javax/servlet/jsp/tagext/TagSupport.java
b/java/javax/servlet/jsp/tagext/TagSupport.java
index 762ff520d7..b70cf8207d 100644
--- a/java/javax/servlet/jsp/tagext/TagSupport.java
+++ b/java/javax/servlet/jsp/tagext/TagSupport.java
@@ -273,7 +273,7 @@ public class TagSupport implements IterationTag,
Serializable {
}
/**
- * The parent, if any, of thsi tag.
+ * The parent, if any, of this tag.
*/
private Tag parent;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 5ca4efa991 Fix typo 5ca4efa991 is described below commit 5ca4efa991153fbca152667e6d2d8fe81df001a8 Author: Mark Thomas AuthorDate: Wed Sep 14 14:39:49 2022 +0100 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 09f0b9c0a3..f8a6a5e8f4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -185,7 +185,7 @@ When processing HTTP/2 requests, allow a host header and an -:authority header to be present providing the are +:authority header to be present providing they are consistent. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 f31b707904 Fix typo f31b707904 is described below commit f31b707904212769019d8327f97404df0c98f421 Author: Mark Thomas AuthorDate: Tue Sep 13 09:00:59 2022 +0100 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 599c6f50a6..09f0b9c0a3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -290,7 +290,7 @@ 62312: Add support for authenticating WebSocket clients with an HTTP forward proxy when establishing a connection to a WebSocket -endpoint via a foward proxy that requires authentication. Based on a +endpoint via a forward proxy that requires authentication. Based on a patch provided by Joe Mokos. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
lihan 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 816b1f295b Fix typo
816b1f295b is described below
commit 816b1f295b2b438c33c3856ed18a5c70a74d34a0
Author: lihan
AuthorDate: Wed Aug 24 21:38:13 2022 +0800
Fix typo
---
java/org/apache/catalina/core/StandardEngine.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/StandardEngine.java
b/java/org/apache/catalina/core/StandardEngine.java
index 6aa496baa1..9aa3945cbf 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -67,7 +67,7 @@ public class StandardEngine extends ContainerBase implements
Engine {
super();
pipeline.setBasic(new StandardEngineValve());
-/* Set the jmvRoute using the system property jvmRoute */
+/* Set the jvmRoute using the system property jvmRoute */
try {
setJvmRoute(System.getProperty("jvmRoute"));
} catch(Exception ex) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo - thanks to Han Li
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 4a66bc2d41 Fix typo - thanks to Han Li
4a66bc2d41 is described below
commit 4a66bc2d415244af17cb443fcf8fbeddd51b95bc
Author: Mark Thomas
AuthorDate: Wed Aug 3 12:38:27 2022 +0100
Fix typo - thanks to Han Li
---
java/org/apache/coyote/http2/Stream.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index fa78585a75..1ac42135f7 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -62,7 +62,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private static final Integer HTTP_UPGRADE_STREAM = Integer.valueOf(1);
-private static final Set HTTP_CONNECTION_SPECIFC_HEADERS = new
HashSet<>();
+private static final Set HTTP_CONNECTION_SPECIFIC_HEADERS = new
HashSet<>();
static {
Response response = new Response();
@@ -70,11 +70,11 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
StreamProcessor.prepareHeaders(null, response, true, null, null);
ACK_HEADERS = response.getMimeHeaders();
-HTTP_CONNECTION_SPECIFC_HEADERS.add("connection");
-HTTP_CONNECTION_SPECIFC_HEADERS.add("proxy-connection");
-HTTP_CONNECTION_SPECIFC_HEADERS.add("keep-alive");
-HTTP_CONNECTION_SPECIFC_HEADERS.add("transfer-encoding");
-HTTP_CONNECTION_SPECIFC_HEADERS.add("upgrade");
+HTTP_CONNECTION_SPECIFIC_HEADERS.add("connection");
+HTTP_CONNECTION_SPECIFIC_HEADERS.add("proxy-connection");
+HTTP_CONNECTION_SPECIFIC_HEADERS.add("keep-alive");
+HTTP_CONNECTION_SPECIFIC_HEADERS.add("transfer-encoding");
+HTTP_CONNECTION_SPECIFIC_HEADERS.add("upgrade");
}
private volatile long contentLengthReceived = 0;
@@ -296,7 +296,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
getConnectionId(), getIdAsString(), name));
}
-if (HTTP_CONNECTION_SPECIFC_HEADERS.contains(name)) {
+if (HTTP_CONNECTION_SPECIFIC_HEADERS.contains(name)) {
throw new HpackException(sm.getString("stream.header.connection",
getConnectionId(), getIdAsString(), name));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 b5ec61e01e Fix typo b5ec61e01e is described below commit b5ec61e01eb4a583e1c8619ebeaa1cff47add530 Author: Mark Thomas AuthorDate: Thu Jul 21 09:14:38 2022 +0100 Fix typo --- webapps/docs/changelog.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 8da9d71bb5..67edae49fc 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -130,8 +130,8 @@ (markt) -Deprecated the jmvRoute system property used to configure a -default value for the jmvRoute attribute of an Engine. +Deprecated the jvmRoute system property used to configure a +default value for the jvmRoute attribute of an Engine. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 c3248fec6d Fix typo
c3248fec6d is described below
commit c3248fec6de7069e6c4ecf28fb3aed73ba19c071
Author: Youyu Song
AuthorDate: Thu Jun 2 15:50:10 2022 +0800
Fix typo
---
java/org/apache/catalina/tribes/transport/nio/NioReceiver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
index e026d71129..9ccda36f8d 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
@@ -366,7 +366,7 @@ public class NioReceiver extends ReceiverBase implements
Runnable, NioReceiverMB
Selector selector = this.selector.get();
if (selector != null) {
try {
-// Unlock the thread if is is blocked waiting for input
+// Unlock the thread if it is blocked waiting for input
selector.wakeup();
// Wait for the receiver thread to finish
int count = 0;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 7e91d87 Fix typo
7e91d87 is described below
commit 7e91d8720535bc406422bfe51dce835b256067f8
Author: Mark Thomas
AuthorDate: Wed Mar 16 17:38:28 2022 +
Fix typo
---
java/org/apache/catalina/ha/deploy/LocalStrings_de.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
index d09bce9..c317ec2 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
@@ -21,5 +21,5 @@ farmWarDeployer.undeployEnd=Undeployment von [{0}] beendet.
fileMessageFactory.duplicateMessage=Doppelte Nachricht empfangen. Ist der
Timeout für den Sender zu niedrig? Context: [{0}] Dateiname: [{1}] Daten: [{2}]
Datenlänge [{3}]
-warWatcher.cantListWatchDir=Dateien in WatchDir [{0}] können nicht gelistet
werdenm: Prüfen Sie dass Lesezugriff auf das Verzeichnis besteht
+warWatcher.cantListWatchDir=Dateien in WatchDir [{0}] können nicht gelistet
werden: Prüfen Sie dass Lesezugriff auf das Verzeichnis besteht.
warWatcher.checkingWar=WAR-Datei [{0}] wird geprüft.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 a7bc2a9 Fix typo a7bc2a9 is described below commit a7bc2a9d6bf730f194ce6735e781f83b196a0add Author: Mark Thomas AuthorDate: Wed Mar 9 13:57:46 2022 + Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b94e0d7..c5e8512 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -139,7 +139,7 @@ Throw IOException rather than IllegalStateException when the application attempts to -write to an GHTTP/2 stream after the client has closed the stream. +write to an HTTP/2 stream after the client has closed the stream. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 7a16614 Fix typo 7a16614 is described below commit 7a16614f81eab51218114cd398501a1015ed0829 Author: Mark Thomas AuthorDate: Wed Jan 5 19:14:41 2022 + Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d16831d..35a4abb 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -3486,7 +3486,7 @@ 63932: By default, do not compress content that has a strong -ETag. This behaviour is configuration for the HTTP/1.1 and HTTP/2 +ETag. This behaviour is configurable for the HTTP/1.1 and HTTP/2 connectors via the new Connector attribute noCompressionStrongETag. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 9dacff1 Fix typo
9dacff1 is described below
commit 9dacff145f762e89319a587f3284b87bdfd89bc6
Author: Mark Thomas
AuthorDate: Thu Dec 16 09:20:27 2021 +
Fix typo
---
java/org/apache/tomcat/websocket/server/LocalStrings.properties | 2 +-
java/org/apache/tomcat/websocket/server/UpgradeUtil.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings.properties
b/java/org/apache/tomcat/websocket/server/LocalStrings.properties
index 3698b90..0b6dfb1 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings.properties
@@ -22,7 +22,7 @@ serverContainer.missingAnnotation=Cannot deploy POJO class
[{0}] as it is not an
serverContainer.servletContextMissing=No ServletContext was specified
upgradeUtil.incompatibleRsv=Extensions were specified that have incompatible
RSV bit usage
-upgradeUtil.pojoMpaFail=Unable to complete method mapping for POJO class [{0}]
+upgradeUtil.pojoMapFail=Unable to complete method mapping for POJO class [{0}]
uriTemplate.duplicateParameter=The parameter [{0}] appears more than once in
the path which is not permitted
uriTemplate.emptySegment=The path [{0}] contains one or more empty segments
which is not permitted
diff --git a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
index 8e52d66..492ef6f 100644
--- a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
+++ b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
@@ -215,7 +215,7 @@ public class UpgradeUtil {
}
} catch (DeploymentException e) {
throw new ServletException(
-sm.getString("upgradeUtil.pojoMpaFail",
sec.getEndpointClass().getName()), e);
+sm.getString("upgradeUtil.pojoMapFail",
sec.getEndpointClass().getName()), e);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo (spotted by rjung)
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 465f7fb Fix typo (spotted by rjung) 465f7fb is described below commit 465f7fb31ee7e4615833c9f4b2ea3afab556a358 Author: Mark Thomas AuthorDate: Wed Dec 15 10:10:04 2021 + Fix typo (spotted by rjung) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index e0168ee..85b1587 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -126,7 +126,7 @@ 65724: Fix missing messages for some -PropertyNotWtriableExceptions caused by a typo in the name +PropertyNotWritableExceptions caused by a typo in the name used for a resource string. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 a7823f3 Fix typo a7823f3 is described below commit a7823f38c17b1df4a41d306f72da7f8f1b6772f9 Author: Mark Thomas AuthorDate: Tue Dec 7 14:10:18 2021 + Fix typo --- webapps/docs/config/http.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 9e2a751..ccac9cb 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -176,7 +176,7 @@ The maximum size in bytes of the request body which will be saved/buffered by the container during FORM or CLIENT-CERT authentication - or during HTTP/1.1 upgarde. For both types of authentication, the request + or during HTTP/1.1 upgrade. For both types of authentication, the request body will be saved/buffered before the user is authenticated. For CLIENT-CERT authentication, the request body is buffered for the duration of the SSL handshake and the buffer emptied when the request is processed. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 ec075e4 Fix typo
ec075e4 is described below
commit ec075e4b92c7a042c1467efe82e845897079d5b8
Author: Mark Thomas
AuthorDate: Thu Nov 18 19:22:39 2021 +
Fix typo
---
java/javax/servlet/http/Cookie.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/javax/servlet/http/Cookie.java
b/java/javax/servlet/http/Cookie.java
index b1e23c0..e0ff6a0 100644
--- a/java/javax/servlet/http/Cookie.java
+++ b/java/javax/servlet/http/Cookie.java
@@ -324,7 +324,7 @@ public class Cookie implements Cloneable, Serializable {
* using any protocol.
*
* @return true if the browser uses a secure protocol;
- * otherwise, true
+ * otherwise, false
* @see #setSecure
*/
public boolean getSecure() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 9803980 Fix typo 9803980 is described below commit 9803980ca5ed74c6bfdaee4c0e661a236df966c5 Author: Mark Thomas AuthorDate: Thu Nov 18 10:22:09 2021 + Fix typo --- webapps/docs/config/resources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml index 12e74cb..64a1610 100644 --- a/webapps/docs/config/resources.xml +++ b/webapps/docs/config/resources.xml @@ -326,7 +326,7 @@ Cache Strategy Additional control over the caching of static resources can be obtained by - configuring a custom cache strategy. To configure a custom cache straegy, + configuring a custom cache strategy. To configure a custom cache strategy, nest a CacheStrategy element inside the Resources element with the following attributes: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 96c3f84 Fix typo 96c3f84 is described below commit 96c3f84a9cdece0013e7bfc535ced353f8c0ba5b Author: Mark Thomas AuthorDate: Thu Sep 23 18:30:59 2021 +0100 Fix typo --- java/javax/servlet/jsp/PageContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/javax/servlet/jsp/PageContext.java b/java/javax/servlet/jsp/PageContext.java index 9a7a6af..6c8284e 100644 --- a/java/javax/servlet/jsp/PageContext.java +++ b/java/javax/servlet/jsp/PageContext.java @@ -201,7 +201,7 @@ public abstract class PageContext * the "out" name in page scope with this newly created object. * * - * This method should not be used by page or tag library authors. + * This method should not be used by page or tag library authors. * * @param servlet The Servlet that is associated with this PageContext * @param request The currently pending request for this Servlet - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 abbe9f0 Fix typo abbe9f0 is described below commit abbe9f07c386b173099c05a28c554f832a72aef5 Author: Mark Thomas AuthorDate: Fri Sep 17 21:39:40 2021 +0100 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b13acc0..13465ac 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -116,7 +116,7 @@ -65563: Correct parsing of HTTP Content-Rnage +65563: Correct parsing of HTTP Content-Range headers. Tomcat was incorrectly requiring an = character after bytes. Fix based on pull request 449 by Thierry Guérin. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 7bc0ebb Fix typo
7bc0ebb is described below
commit 7bc0ebbd9c0f3b6c2b5db30437badb5d6b0eaae4
Author: dastan
AuthorDate: Tue Sep 14 19:37:03 2021 +0600
Fix typo
---
java/org/apache/tomcat/websocket/WsSession.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 595eec2..b728d51 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -191,7 +191,7 @@ public class WsSession implements Session {
* @param wsRemoteEndpoint The other / remote end point
* @param wsWebSocketContainer The container that created this session
* @param requestUri The URI used to connect to this end point or
- * null is this is a client
session
+ * null if this is a client
session
* @param requestParameterMap The parameters associated with the request
* that initiated this session or
* null if this is a client
session
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo - thanks to Mikael Sterner
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 d17eb43 Fix typo - thanks to Mikael Sterner d17eb43 is described below commit d17eb43f36781a3b81725f587bbc49f6dc5541db Author: Mark Thomas AuthorDate: Fri Aug 6 09:53:14 2021 +0200 Fix typo - thanks to Mikael Sterner --- webapps/docs/config/http.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 054b8e6..9bf7402 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1592,7 +1592,7 @@ The type of certificate. This is used to identify the ciphers that are compatible with the certificate. It must be one of UNDEFINED, - RSA, DSS or EC. If only one + RSA, DSA or EC. If only one Certificate is nested within a SSLHostConfig then this attribute is not required and will default to UNDEFINED. If multiple Certificates are - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo (#433)
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 0dffb1d Fix typo (#433)
0dffb1d is described below
commit 0dffb1d93d6df01dfa62606ea536b0ef6aaf459c
Author: Shi.Kun <34267068+pachul...@users.noreply.github.com>
AuthorDate: Tue Jul 13 15:21:42 2021 +0800
Fix typo (#433)
* Fix typo
add missing words
---
java/javax/servlet/ServletSecurityElement.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/java/javax/servlet/ServletSecurityElement.java
b/java/javax/servlet/ServletSecurityElement.java
index 875d103..d7e0116 100644
--- a/java/javax/servlet/ServletSecurityElement.java
+++ b/java/javax/servlet/ServletSecurityElement.java
@@ -71,6 +71,7 @@ public class ServletSecurityElement extends
HttpConstraintElement {
* @param httpConstraintElement Default constraint
* @param httpMethodConstraints Method constraints
* @throws IllegalArgumentException if a method name is specified more than
+ * once
*/
public ServletSecurityElement(HttpConstraintElement httpConstraintElement,
Collection httpMethodConstraints) {
@@ -84,6 +85,7 @@ public class ServletSecurityElement extends
HttpConstraintElement {
* Create from an annotation.
* @param annotation Annotation to use as the basis for the new instance
* @throws IllegalArgumentException if a method name is specified more than
+ * once
*/
public ServletSecurityElement(ServletSecurity annotation) {
this(new HttpConstraintElement(annotation.value().value(),
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo in method's javadoc (#429)
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 26d5fe4 Fix typo in method's javadoc (#429)
26d5fe4 is described below
commit 26d5fe47268dccbc35a62844a5fbe2f0167fef8f
Author: Shi.Kun <34267068+pachul...@users.noreply.github.com>
AuthorDate: Wed Jun 30 19:06:59 2021 +0800
Fix typo in method's javadoc (#429)
s/contain/container/
(cherry picked from commit 40920f6522f3f390a503738dd943a1a5be5b96b2)
---
java/javax/servlet/ServletOutputStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/javax/servlet/ServletOutputStream.java
b/java/javax/servlet/ServletOutputStream.java
index bf40d97..7cc1d38 100644
--- a/java/javax/servlet/ServletOutputStream.java
+++ b/java/javax/servlet/ServletOutputStream.java
@@ -282,7 +282,7 @@ public abstract class ServletOutputStream extends
OutputStream {
* false, it will cause a callback to
* {@link WriteListener#onWritePossible()} when the buffer has emptied. If
* this method returns false no further data must be written
- * until the contain calls {@link WriteListener#onWritePossible()}.
+ * until the container calls {@link WriteListener#onWritePossible()}.
*
* @return true if data can be written, else
false
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 0ccd964 Fix typo 0ccd964 is described below commit 0ccd9643ce9017b23599b69fe788dc0f83f7759e Author: Mark Thomas AuthorDate: Tue Jun 8 18:45:12 2021 +0100 Fix typo --- webapps/docs/changelog.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 60b76d9..a183965 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -295,8 +295,8 @@ 65362: Correct a regression in the previous release. The change to create OSGi Require-Capability sections in -manifests for Jakarta API JARs manually rather bnd annotations did not -add the necessary manual entries to the embedded JARs. (markt) +manifests for Jakarta API JARs manually rather than with bnd annotations +did not add the necessary manual entries to the embedded JARs. (markt) Update the packaged version of the Tomcat Native Library to 1.2.30. Also - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo. Thanks to Rob Sargent.
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 9cb5915 Fix typo. Thanks to Rob Sargent. 9cb5915 is described below commit 9cb5915831641d5d7edab2a7cc32120a6190c7c8 Author: Mark Thomas AuthorDate: Tue Mar 16 08:14:42 2021 + Fix typo. Thanks to Rob Sargent. --- webapps/docs/logging.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml index b60744e..14fa5d0 100644 --- a/webapps/docs/logging.xml +++ b/webapps/docs/logging.xml @@ -73,10 +73,10 @@ The logging frameworks used by different web applications are independent. See class loading for more details. - The exception to this rule is java.util.logging. If it used - directly or indirectly by your logging library then elements of it will be - shared across web applications because it is loaded by the system class - loader. + The exception to this rule is java.util.logging. If it is + used directly or indirectly by your logging library then elements of it + will be shared across web applications because it is loaded by the system + class loader. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 3e28d99 Fix typo 3e28d99 is described below commit 3e28d99f96bc38fe7dbdef636f2f1c5751850b5d Author: Mark Thomas AuthorDate: Wed Jan 27 14:59:42 2021 + Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 00349f6..2a55cd4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -172,7 +172,7 @@ Based on a PR submitted by Graham Leggett. (remm) -65001: Fix error handling for exceptions throw from calls +65001: Fix error handling for exceptions thrown from calls to ReadListener and WriteListener. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 de001c2 Fix typo de001c2 is described below commit de001c2b258c6f8cc3487ac292bc0bc16c45f3e3 Author: Mark Thomas AuthorDate: Tue Jan 26 11:59:45 2021 + Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 5b8a41a..8b13143 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -220,7 +220,7 @@ -Improvements to Chinese translations. Provided by leeyazhouand Yi Shen. +Improvements to Chinese translations. Provided by leeyazhou and Yi Shen. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 cb9faf3 Fix typo
cb9faf3 is described below
commit cb9faf3363705ee8ca254cc4e56c1cbe7a46c2ac
Author: Mark Thomas
AuthorDate: Fri Oct 30 12:49:49 2020 +
Fix typo
---
java/org/apache/catalina/startup/LocalStrings_es.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/LocalStrings_es.properties
b/java/org/apache/catalina/startup/LocalStrings_es.properties
index df263b9..26f 100644
--- a/java/org/apache/catalina/startup/LocalStrings_es.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_es.properties
@@ -98,7 +98,7 @@ userConfig.deploy=Despliegue de la aplicación web para el
usuario [{0}]
userConfig.deploying=Desplegando aplicaciones web para el usuario
userConfig.error=Error durante el despliegue de la aplicación web para el
usario [{0}]
userConfig.start="UserConfig": Procesando "START"
-userConfig.stop="UserConfig": Tratamiento del "STOP":q
+userConfig.stop="UserConfig": Tratamiento del "STOP"
versionLoggerListener.arg=Command line argument: {0}
versionLoggerListener.catalina.base=CATALINA_BASE: {0}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 1e81e4c Fix typo 1e81e4c is described below commit 1e81e4c3bf3ca3ee40a241c4949e39d2244e326a Author: Mark Thomas AuthorDate: Thu Oct 15 09:43:30 2020 +0100 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f37af02..278a0b7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -55,7 +55,7 @@ Context. (markt) -64805: Correct imports used by JMXPorxyServlet. +64805: Correct imports used by JMXProxyServlet. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 1e81e4c Fix typo 1e81e4c is described below commit 1e81e4c3bf3ca3ee40a241c4949e39d2244e326a Author: Mark Thomas AuthorDate: Thu Oct 15 09:43:30 2020 +0100 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f37af02..278a0b7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -55,7 +55,7 @@ Context. (markt) -64805: Correct imports used by JMXPorxyServlet. +64805: Correct imports used by JMXProxyServlet. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 1e81e4c Fix typo 1e81e4c is described below commit 1e81e4c3bf3ca3ee40a241c4949e39d2244e326a Author: Mark Thomas AuthorDate: Thu Oct 15 09:43:30 2020 +0100 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f37af02..278a0b7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -55,7 +55,7 @@ Context. (markt) -64805: Correct imports used by JMXPorxyServlet. +64805: Correct imports used by JMXProxyServlet. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 1e81e4c Fix typo 1e81e4c is described below commit 1e81e4c3bf3ca3ee40a241c4949e39d2244e326a Author: Mark Thomas AuthorDate: Thu Oct 15 09:43:30 2020 +0100 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f37af02..278a0b7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -55,7 +55,7 @@ Context. (markt) -64805: Correct imports used by JMXPorxyServlet. +64805: Correct imports used by JMXProxyServlet. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 1e81e4c Fix typo 1e81e4c is described below commit 1e81e4c3bf3ca3ee40a241c4949e39d2244e326a Author: Mark Thomas AuthorDate: Thu Oct 15 09:43:30 2020 +0100 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f37af02..278a0b7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -55,7 +55,7 @@ Context. (markt) -64805: Correct imports used by JMXPorxyServlet. +64805: Correct imports used by JMXProxyServlet. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 b0b2d37 Fix typo b0b2d37 is described below commit b0b2d379e75a6b7d3d001e7480e7fd7e4db85687 Author: Mark Thomas AuthorDate: Wed Sep 9 15:51:51 2020 +0100 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ecce19f..2343bea 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -164,7 +164,7 @@ client. (markt) -Improve handling of HTTP/2 stream level flow control errors and notidy +Improve handling of HTTP/2 stream level flow control errors and notify the stream immediately if it is waiting for an allocation when the flow control error occurs. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 8728d89 Fix typo 8728d89 is described below commit 8728d89dfa1542ced0c7bc0a00db56f8f0e8338f Author: 康智冬 AuthorDate: Mon Aug 17 20:53:18 2020 +0800 Fix typo Fix typo --- java/org/apache/catalina/startup/EngineConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/startup/EngineConfig.java b/java/org/apache/catalina/startup/EngineConfig.java index 65f1b6d..45e7457 100644 --- a/java/org/apache/catalina/startup/EngineConfig.java +++ b/java/org/apache/catalina/startup/EngineConfig.java @@ -29,7 +29,7 @@ import org.apache.tomcat.util.res.StringManager; /** - * Startup event listener for a Engine that configures the properties + * Startup event listener for an Engine that configures the properties * of that Engine, and the associated defined contexts. * * @author Craig R. McClanahan - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
csutherl 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 a14251f Fix typo
a14251f is described below
commit a14251f7e46e36dcd24ccb0521649c3877567133
Author: Coty Sutherland
AuthorDate: Wed Apr 22 15:02:19 2020 -0400
Fix typo
---
conf/catalina.policy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/catalina.policy b/conf/catalina.policy
index 51c390f..2e6f8df 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -39,7 +39,7 @@ grant codeBase "file:${java.home}/jre/lib/ext/-" {
permission java.security.AllPermission;
};
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
+// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre
grant codeBase "file:${java.home}/../lib/-" {
permission java.security.AllPermission;
};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 3b3c34d Fix typo
3b3c34d is described below
commit 3b3c34d572ba1f61bdf10d444f5cd6efabd7e9f4
Author: Mark Thomas
AuthorDate: Wed Apr 15 10:08:39 2020 +0100
Fix typo
---
.../tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 8c740f1..5ff4684 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -53,7 +53,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
*
* Each test uses 2 client endpoint and 2 server endpoints with each client
* connecting to each server for a total of four connections (note sometimes
- * the two clients and/or the two servers will be the sam)e.
+ * the two clients and/or the two servers will be the same).
*/
public class TestWsWebSocketContainerGetOpenSessions extends WebSocketBaseTest
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo in exception message about quote character in repository path
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 d95ede1 Fix typo in exception message about quote character in
repository path
d95ede1 is described below
commit d95ede108726a9af6979c25b7f3a70b43eec35cd
Author: Paul Muriel Biya-Bi
AuthorDate: Fri Apr 3 23:54:54 2020 -0400
Fix typo in exception message about quote character in repository path
---
java/org/apache/catalina/startup/Bootstrap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/Bootstrap.java
b/java/org/apache/catalina/startup/Bootstrap.java
index 177a59d..08ad013 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -581,7 +581,7 @@ public final class Bootstrap {
// Too early to use standard i18n support. The class path
hasn't
// been configured.
throw new IllegalArgumentException(
-"The double quote [\"] character only be used to quote
paths. It must " +
+"The double quote [\"] character can only be used to
quote paths. It must " +
"not appear in a path. This loader path is not valid:
[" + value + "]");
} else {
// Not quoted - NO-OP
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo. Better test coverage.
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 debf532 Fix typo. Better test coverage.
debf532 is described below
commit debf5329db23e5d7cf119e0e3e99708347afc9a0
Author: Mark Thomas
AuthorDate: Fri Apr 3 18:54:03 2020 +0100
Fix typo. Better test coverage.
---
test/org/apache/tomcat/util/res/TestStringManager.java | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/util/res/TestStringManager.java
b/test/org/apache/tomcat/util/res/TestStringManager.java
index 7caeead..97959ab 100644
--- a/test/org/apache/tomcat/util/res/TestStringManager.java
+++ b/test/org/apache/tomcat/util/res/TestStringManager.java
@@ -53,9 +53,17 @@ public class TestStringManager {
}
@Test
-public void testMissing() {
+public void testMissingWithTccl() {
Thread.currentThread().setContextClassLoader(TestStringManager.class.getClassLoader());
-StringManager sm = StringManager.getManager("org.does.no.exist");
+StringManager sm = StringManager.getManager("org.does.not.exist");
+Assert.assertNull(sm.getLocale());
+}
+
+
+@Test
+public void testMissingNullTccl() {
+Thread.currentThread().setContextClassLoader(null);
+StringManager sm = StringManager.getManager("org.does.not.exist");
Assert.assertNull(sm.getLocale());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 d68bae8 Fix typo
d68bae8 is described below
commit d68bae893e7c1d31fed0963783aea06bce4dd28b
Author: Mark Thomas
AuthorDate: Fri Apr 3 12:23:52 2020 +0100
Fix typo
---
webapps/docs/changelog.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b50f759..81a5d6b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -72,7 +72,7 @@
64265: Fix ETag comparison performed by the default servlet.
-The default servley always uses weak comparison. (markt)
+The default servlet always uses weak comparison. (markt)
Add support for default values when using ${...} property
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo. Patch by Michael Schieder.
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 4c20650 Fix typo. Patch by Michael Schieder. 4c20650 is described below commit 4c206509a85b027b811d941d457707ac62bf55a0 Author: Mark Thomas AuthorDate: Wed Mar 4 18:46:15 2020 + Fix typo. Patch by Michael Schieder. --- java/org/apache/catalina/valves/LocalStrings_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/valves/LocalStrings_de.properties b/java/org/apache/catalina/valves/LocalStrings_de.properties index 87f3816..c0fde3f 100644 --- a/java/org/apache/catalina/valves/LocalStrings_de.properties +++ b/java/org/apache/catalina/valves/LocalStrings_de.properties @@ -24,7 +24,7 @@ errorReportValve.unknownReason=Unbekannter Grund http.401.reason=Unautorisiert http.402.desc=Dieser Status-Code ist für eine zukünftige Nutzung reserviert -http.403.desc=Der Server hat die Anfrage verstanden, verbietet aber eine Autoriesierung. +http.403.desc=Der Server hat die Anfrage verstanden, verbietet aber eine Autorisierung. http.404.reason=nicht gefunden http.406.reason=Nicht annehmbar http.407.reason=Authentisierung für Proxy benötigt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 9f86303 Fix typo
9f86303 is described below
commit 9f86303a59ca8c11c71884947e1cff0c2094d19a
Author: Mark Thomas
AuthorDate: Tue Mar 3 22:26:44 2020 +
Fix typo
---
java/org/apache/coyote/http2/Http2AsyncParser.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2AsyncParser.java
b/java/org/apache/coyote/http2/Http2AsyncParser.java
index 827105a..5b1af5b 100644
--- a/java/org/apache/coyote/http2/Http2AsyncParser.java
+++ b/java/org/apache/coyote/http2/Http2AsyncParser.java
@@ -131,10 +131,10 @@ class Http2AsyncParser extends Http2Parser {
throws IOException, Http2Exception {
handleAsyncException();
ByteBuffer header = ByteBuffer.allocate(9);
-ByteBuffer framePaylod = ByteBuffer.allocate(input.getMaxFrameSize());
-FrameCompletionHandler handler = new FrameCompletionHandler(expected,
header, framePaylod);
+ByteBuffer framePayload = ByteBuffer.allocate(input.getMaxFrameSize());
+FrameCompletionHandler handler = new FrameCompletionHandler(expected,
header, framePayload);
CompletionState state =
-socketWrapper.read(block ? BlockingMode.BLOCK :
BlockingMode.NON_BLOCK, socketWrapper.getReadTimeout(), TimeUnit.MILLISECONDS,
null, handler, handler, header, framePaylod);
+socketWrapper.read(block ? BlockingMode.BLOCK :
BlockingMode.NON_BLOCK, socketWrapper.getReadTimeout(), TimeUnit.MILLISECONDS,
null, handler, handler, header, framePayload);
if (state == CompletionState.ERROR || state == CompletionState.INLINE)
{
handleAsyncException();
return true;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo. Update for change to attribute name.
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 4f471ad Fix typo. Update for change to attribute name. 4f471ad is described below commit 4f471ad77121bfe3971a1f71a7b98c3a7d95c982 Author: Mark Thomas AuthorDate: Tue Feb 4 21:13:10 2020 + Fix typo. Update for change to attribute name. --- webapps/docs/changelog.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 561e87c..948505b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -191,8 +191,8 @@ a non-null, non-zero length String. (markt) -Add a new attribute, allowedArbitraryRequestAttributes to -the AJP/1.3 Connector. Requests with unreconised attributes will be +Add a new attribute, allowedRequestAttributesPattern to +the AJP/1.3 Connector. Requests with unrecognised attributes will be blocked with a 403. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
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 0e27b9e Fix typo 0e27b9e is described below commit 0e27b9e01af21390737bae87f1b6abe3b785ef4d Author: Mark Thomas AuthorDate: Mon Jan 20 20:30:51 2020 + Fix typo --- webapps/docs/config/cluster-interceptor.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/config/cluster-interceptor.xml b/webapps/docs/config/cluster-interceptor.xml index 648a884..836c4cd 100644 --- a/webapps/docs/config/cluster-interceptor.xml +++ b/webapps/docs/config/cluster-interceptor.xml @@ -205,7 +205,7 @@ If using the TcpFailureDetector, the EncryptInterceptor must be inserted into the interceptor chain before the - TcpFailureDetector. This is becuase when validating cluster + TcpFailureDetector. This is because when validating cluster members, TcpFailureDetector writes channel data directly to the other members without using the remainder of the interceptor chain, but on the receiving side, the message still goes through the chain (in reverse). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
