(tomcat) branch 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 4e7335771e Fix typo
4e7335771e is described below
commit 4e7335771e40fa5c2a05f649b2e5938db5b44ae3
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 d84ace56bf..65b2015c71 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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 0b67757413 Fix typo
0b67757413 is described below
commit 0b677574135f17d41522a30f2d42ea204e33ebba
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 95ef70278b..6964427fc8 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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 02a32af0dd Fix typo 02a32af0dd is described below commit 02a32af0dd84a510279b9640f89e20d5c78a02af 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 647afe4dd5..8404019433 100644 --- a/MERGE.txt +++ b/MERGE.txt @@ -45,7 +45,7 @@ Unused code is removed 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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 84a3732fd2 Fix typo
84a3732fd2 is described below
commit 84a3732fd2b69bcc8e3297e5f4ee87b7b8a5dd9f
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 b4cdf612ec..2b00ecfdd8 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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new bea5d5c43f Fix typo bea5d5c43f is described below commit bea5d5c43f6d254a6c148d3a473b16cc7ce22668 Author: Mark Thomas AuthorDate: Tue Feb 13 22:46:17 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 9f1428b302..aa499c58f3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -108,7 +108,7 @@ -Correct JPMS and OSGi meta-data for tomcat-enbed-core.jar +Correct JPMS and OSGi meta-data for tomcat-embed-core.jar by removing reference to org.apache.catalina.ssi package that is no longer included in the JAR. Based on pull request 684 by Jendrik Johannes. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new cd4b32ff34 Fix typo
cd4b32ff34 is described below
commit cd4b32ff34c2f0e3cb2cb74acd43c1d5d9399601
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 a3d557cba7..79b33d46b7 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -259,7 +259,7 @@ 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
standardHost.problematicLegacyAppBase=L''utilisation d''une chaîne vide pour
legacyAppBase de l''hôte [{0}] le fixera à CATALINA_BASE, ce qui n''est pas
judicieux
-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 675f70f1f9..f02937daf7 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -259,7 +259,7 @@ standardHost.nullName=ホスト名が必要です
standardHost.problematicAppBase=ホスト [{0}]
のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです
standardHost.problematicLegacyAppBase=ホスト [{0}]
のlegacyAppBaseに空の文字列を使用すると、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 1ff351337a..3a8d4d82d8 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -249,7 +249,7 @@ standardHost.nullName=호스트 이름이 필수적입니다.
standardHost.problematicAppBase=호스트 [{0}]에서 appBase를 위해 빈 문자열을 사용하는 것은, 결국
appBase를 CATALINA_BASE로 설정하게 되는데, 이는 좋은 생각이 아닙니다.
standardHost.problematicLegacyAppBase=호스트 [{0}]에 legacyAppBase로 빈 문자열이 설정되어
있는데, 이는 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 eb47d6ab2f..a92755704c 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -254,7 +254,7 @@ standardHost.nullName=主机名是必需的
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
standardHost.problematicLegacyAppBase=在主机[{0}]上为legacyAppBase使用空字符串会将其设置为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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 9891eca1b0 Fix typo
9891eca1b0 is described below
commit 9891eca1b0bbe6b4a6a5a17a2e2ffad41daa6f8c
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 7a06d27735..ed5629d3d8 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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new cd60c32171 Fix typo cd60c32171 is described below commit cd60c321715dfc7f43a25d7d8b3875a35b92be73 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 fbd5a8c9c7..e8330e7763 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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new a50524bb8b Fix typo a50524bb8b is described below commit a50524bb8b36a0b778e3820d10bac10a9c9149ad Author: Mark Thomas AuthorDate: Thu Nov 2 18:10:42 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 c338ed5071..861dc68a28 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -174,7 +174,7 @@ -Correct missing metadata int he MANIFEST of the for WebSocket client API +Correct missing metadata in the MANIFEST of the for WebSocket client API JAR file. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 357c5e288c Fix typo 357c5e288c is described below commit 357c5e288c921f5b3defcfa62b9251e5e08aaf43 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 a56ab65a7b..63b5577150 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 10.1.14 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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 83e4a33446 Fix typo 83e4a33446 is described below commit 83e4a33446613b3bb591534bae0518d44255de89 Author: Christopher Schultz AuthorDate: Fri Sep 22 12:45:11 2023 -0400 Fix typo --- webapps/docs/changelog.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4d9044fe65..42a8145933 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -168,6 +168,7 @@ 67472: Send fewer CORS-related headers when CORS is not actually being engaged. (schultz) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 3ca902a025 Fix typo.
3ca902a025 is described below
commit 3ca902a025ae88c7b195658019e1cc0a54b9f5b4
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 0f2ee5c046..6954351c92 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3103,7 +3103,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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 131d81b879 Fix typo
131d81b879 is described below
commit 131d81b879d42876668b666dcda385e0d01fdd08
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 b47e67ed60..ac418726ce 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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 421f987b52 Fix typo
421f987b52 is described below
commit 421f987b52c1e6156c3624a2ca20ecfae0ea2242
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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 43ef7f0356 Fix typo 43ef7f0356 is described below commit 43ef7f035642bc52ba740fad28f9988bd8806d20 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 94e45405fe..a7c63af0ee 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 10.1.x updated: Fix typo - thanks Chuck
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 1c68b9106d Fix typo - thanks Chuck
1c68b9106d is described below
commit 1c68b9106d0d997911ada0d1ce3d05545065d468
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 bb3089e0e8..986b782791 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2435,7 +2435,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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 2fc07c32d1 Fix typo 2fc07c32d1 is described below commit 2fc07c32d170e3826f25f107c37fb6b87bfc50f2 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 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new afa1241ba0 Fix typo
afa1241ba0 is described below
commit afa1241ba09096c7903f4ee236941798d3dc32e6
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 8fd82bd920..0976ca5b66 100644
--- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
+++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
@@ -920,8 +920,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 10.1.x updated: Fix typo in changelog
This is an automated email from the ASF dual-hosted git repository. rjung pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new d86582da8d Fix typo in changelog d86582da8d is described below commit d86582da8d3c46b202e91660390d276c151c56f8 Author: Rainer Jung AuthorDate: Mon Feb 27 13:30: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 a05a3bd4fd..5742fa03e0 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -243,7 +243,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 10.1.x updated: Fix typo in changelog.
This is an automated email from the ASF dual-hosted git repository. rjung pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new bad914bac8 Fix typo in changelog. bad914bac8 is described below commit bad914bac82a2eac2d327b8d2bee280b8050b4d9 Author: Rainer Jung AuthorDate: Fri Jan 20 10:26:06 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 1558ef3159..066872b6f7 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 10.1.x updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 2ab219be7d Fix typo.
2ab219be7d is described below
commit 2ab219be7d7dad4b46535441139262281a1152db
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 f54ea6f13c..99516c51a2 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -315,7 +315,7 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
State state = new State(request, response, false);
if (context.getDispatcherWrapsSameObject()) {
-// 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 2c7004ecdc..76c4171f34 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -112,7 +112,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 10.1.x updated: Fix typo in Javadoc
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new b6bbf2d384 Fix typo in Javadoc
b6bbf2d384 is described below
commit b6bbf2d3848fcfb9c139622b8e5077c5295cd49a
Author: Mark Thomas
AuthorDate: Fri Oct 28 10:34:03 2022 +0100
Fix typo in Javadoc
---
java/jakarta/servlet/jsp/JspContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/jakarta/servlet/jsp/JspContext.java
b/java/jakarta/servlet/jsp/JspContext.java
index 1959e5778a..e267dfdd11 100644
--- a/java/jakarta/servlet/jsp/JspContext.java
+++ b/java/jakarta/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
