(tomcat) branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9955b03b6a Fix typo 9955b03b6a is described below commit 9955b03b6adcfe36ac78b5e1cf416672e346f16a 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 dfa05bada4..857d51185d 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new eee84fd4cb Fix typo eee84fd4cb is described below commit eee84fd4cb5b0f2b02c575297c9d07bd44328c45 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 b2289a8bb3..4bfff53596 100644 --- a/test/org/apache/catalina/connector/TestRequest.java +++ b/test/org/apache/catalina/connector/TestRequest.java @@ -868,7 +868,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 309a6b0151 Fix typo 309a6b0151 is described below commit 309a6b0151fb7a227e21f6f39cd05d5046c2fd73 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 708226219e Fix typo 708226219e is described below commit 708226219e3cbed2a780cc936a9f877d14f1a0af Author: Mark Thomas AuthorDate: Tue Mar 12 12:29:40 2024 + Fix typo --- java/org/apache/jasper/runtime/JspWriterImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/jasper/runtime/JspWriterImpl.java b/java/org/apache/jasper/runtime/JspWriterImpl.java index 06b14c1b3b..f683b99321 100644 --- a/java/org/apache/jasper/runtime/JspWriterImpl.java +++ b/java/org/apache/jasper/runtime/JspWriterImpl.java @@ -122,7 +122,7 @@ public class JspWriterImpl extends JspWriter { /* * At some point in the processing something (most likely the default servlet as the target of a * action) wrote directly to the OutputStream rather than the Writer. Wrap the - * OutputStream in a Writer so the JSp engine can use the Writer it is expecting to use. + * OutputStream in a Writer so the JSP engine can use the Writer it is expecting to use. */ out = new PrintWriter(response.getOutputStream()); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new ba605a3f22 Fix typo ba605a3f22 is described below commit ba605a3f223a517de8d91aebb1d96ce50a3edfef 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 6c91188d22..76e3dd9371 100644 --- a/java/org/apache/catalina/core/LocalStrings.properties +++ b/java/org/apache/catalina/core/LocalStrings.properties @@ -56,7 +56,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new a4511e64aa Fix typo a4511e64aa is described below commit a4511e64aafe396d128dbb8162b2a0b2dbbc7a1d 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 4c5835e04c..5a21629ec8 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -115,7 +115,7 @@ WebSocket API. (markt) -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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 5fb35e2f13 Fix typo 5fb35e2f13 is described below commit 5fb35e2f135693a402d76f78651458e61491416c 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 cfb5a81d3b..9ebcf43adb 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 46197b2f35..abf26cabb6 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 a2a79cccec..b4c94b9697 100644 --- a/java/org/apache/catalina/core/LocalStrings_ko.properties +++ b/java/org/apache/catalina/core/LocalStrings_ko.properties @@ -244,7 +244,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 5cd9cab237..673d88d976 100644 --- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties @@ -249,7 +249,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 7bd5624cda Fix typo 7bd5624cda is described below commit 7bd5624cda984ab133298f9d0a126e0af8fcfbf6 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 332473489d..6a2b231ae6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -1231,7 +1231,7 @@ 66524 Correct eviction ordering in WebResource cache to -by LRU as intended. (schultz) +be LRU as intended. (schultz) Add support code for custom user attributes in RealmBase. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 896e5d8bc7 Fix typo 896e5d8bc7 is described below commit 896e5d8bc76ec159d4950e4602bfcebe99233b52 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 1ec86b5207 Fix typo 1ec86b5207 is described below commit 1ec86b5207f059cb8cc0b0f39fe2bd3a10a15429 Author: Mark Thomas AuthorDate: Thu Jan 4 16:54:00 2024 + Fix typo --- java/org/apache/tomcat/util/threads/LocalStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/threads/LocalStrings.properties b/java/org/apache/tomcat/util/threads/LocalStrings.properties index e6999e19e4..2c7b85a213 100644 --- a/java/org/apache/tomcat/util/threads/LocalStrings.properties +++ b/java/org/apache/tomcat/util/threads/LocalStrings.properties @@ -20,4 +20,4 @@ threadPoolExecutor.queueFull=Queue capacity is full threadPoolExecutor.taskRejected=Task [{0}] rejected from [{1}] threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Stopping thread [{0}] to avoid potential memory leaks after a context was stopped. -vvirtualThreadExecutor.taskRejected=Task [{0}] rejected from [{1}] \ No newline at end of file +virtualThreadExecutor.taskRejected=Task [{0}] rejected from [{1}] \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 6bad842147 Fix typo 6bad842147 is described below commit 6bad8421478d767b3ca9b7767d4b201f8ef45fd4 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 d50307b176..8c3a298408 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -188,7 +188,7 @@ Background processes should not be run concurrently with lifecycle -oprations of a container. (remm) +operations of a container. (remm) Add support for the jakarta.servlet.request.secure_protocol - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 2aa9c95490 Fix typo 2aa9c95490 is described below commit 2aa9c9549022c5b7fe9ba3776922d3ece973fba3 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 12627a91a1..af16534c0d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -192,7 +192,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new ecbc4616da Fix typo ecbc4616da is described below commit ecbc4616da1df0a3418444aa9ba766ae4d19daa7 Author: Mark Thomas AuthorDate: Thu Nov 2 17:59:38 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 e0d514313b..12627a91a1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -213,7 +213,7 @@ Update SpotBugs to 4.8.0. (markt) -Update BDN to 7.0.0. (markt) +Update BND to 7.0.0. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 7400288181 Fix typo. 7400288181 is described below commit 74002881816ff47dbfa0430962f12a63a93891f4 Author: lihan AuthorDate: Thu Oct 26 10:26:10 2023 +0800 Fix typo. --- java/jakarta/el/RecordELResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/jakarta/el/RecordELResolver.java b/java/jakarta/el/RecordELResolver.java index 55ba2f5baf..0f21bb1e38 100644 --- a/java/jakarta/el/RecordELResolver.java +++ b/java/jakarta/el/RecordELResolver.java @@ -23,7 +23,7 @@ import java.util.Objects; * Defines property resolution behavior on instances of {@link Record}. * * The resolver handles base objects of type {@link Record}. It accepts any non-{@code null} object as a property and coerces it to a - * String using {@link Object#toString()}. The property string is used to find find an accessor method for a field + * String using {@link Object#toString()}. The property string is used to find an accessor method for a field * with the same name. * * This resolver is always read-only since {@link Record}s are always read-only. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 2fab725c2e Fix typo. 2fab725c2e is described below commit 2fab725c2e8f7d7653617a25e831d3be4726eee0 Author: lihan AuthorDate: Tue Oct 10 09:52:29 2023 +0800 Fix typo. --- java/org/apache/catalina/valves/FilterValve.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/valves/FilterValve.java b/java/org/apache/catalina/valves/FilterValve.java index 2ac4ace086..2f47845322 100644 --- a/java/org/apache/catalina/valves/FilterValve.java +++ b/java/org/apache/catalina/valves/FilterValve.java @@ -203,7 +203,7 @@ public class FilterValve extends ValveBase implements FilterConfig { return executor; } else { throw new UnsupportedOperationException( -"This ServletContet is not really meant to be used."); +"This ServletContext is not really meant to be used."); } } }); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 01118ce2ab Fix typo 01118ce2ab is described below commit 01118ce2ab856deadabd6c99911c136a6d26c29a 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 edb4fe7e75..d37c0e0bb4 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 main updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new c1388b3ed0 Fix typo. c1388b3ed0 is described below commit c1388b3ed08f7a72bc5193d5c5242087a9e73e7d Author: lihan AuthorDate: Thu Aug 10 11:15:06 2023 +0800 Fix typo. --- 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 8ec5f187c0..f43d8c835d 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -3055,7 +3055,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 main updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new cf3fb9d59b Fix typo. cf3fb9d59b is described below commit cf3fb9d59b259341e3ef54a102fbee2d9d6825c0 Author: Mark Thomas AuthorDate: Thu May 11 21:50:28 2023 +0100 Fix typo. --- java/org/apache/catalina/webresources/CachedResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/webresources/CachedResource.java b/java/org/apache/catalina/webresources/CachedResource.java index d70d496a12..4338aafa10 100644 --- a/java/org/apache/catalina/webresources/CachedResource.java +++ b/java/org/apache/catalina/webresources/CachedResource.java @@ -327,7 +327,7 @@ public class CachedResource implements WebResource { * * One option to resolve this issue is to use a custom URL scheme for resource URLs. This would allow us, via * registration of a URLStreamHandlerFactory, to control how the resources are accessed and ensure that all - * access go via the cache We took this approach for war: URLs so we can use jar:war:file: URLs to reference + * access go via the cache. We took this approach for war: URLs so we can use jar:war:file: URLs to reference * resources in unpacked WAR files. However, because URL.setURLStreamHandlerFactory() may only be called once, * this can cause problems when using other libraries that also want to use a custom URL scheme. * - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new f9366fb6c5 Fix typo f9366fb6c5 is described below commit f9366fb6c55ded9ca198cecc9aa31c2acf97e244 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 7290990c63 Fix typo 7290990c63 is described below commit 7290990c631beee5729e7aadb2eda38fdfbf2a29 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 9fb26f0090..60ee0c2dc1 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 JreCompat { 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new d7411fb2a8 Fix typo d7411fb2a8 is described below commit d7411fb2a8448e09ae702946800535775870379f Author: Mark Thomas AuthorDate: Fri May 5 16:54:41 2023 +0100 Fix typo --- .../org/apache/tomcat/util/http/parser/TesterHttpWgStructuredField.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/org/apache/tomcat/util/http/parser/TesterHttpWgStructuredField.java b/test/org/apache/tomcat/util/http/parser/TesterHttpWgStructuredField.java index 794d180934..1c86dd51cb 100644 --- a/test/org/apache/tomcat/util/http/parser/TesterHttpWgStructuredField.java +++ b/test/org/apache/tomcat/util/http/parser/TesterHttpWgStructuredField.java @@ -30,7 +30,7 @@ import org.apache.tomcat.util.buf.StringUtils; import org.apache.tomcat.util.json.JSONParser; /* - * Not run automatically (due to name) as if requires a local git clone of + * Not run automatically (due to name) as it requires a local git clone of * https://github.com/httpwg/structured-field-tests */ public class TesterHttpWgStructuredField { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 029e8be1d2 Fix typo 029e8be1d2 is described below commit 029e8be1d2123ed0c52032e781227ace7465ad1c 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 89d263c6cf..131799a300 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 624ccecf1a Fix typo 624ccecf1a is described below commit 624ccecf1a6c76773a339eaac940907c7b767565 Author: Christopher Schultz AuthorDate: Tue Apr 18 16:37:49 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 f23339cf72..71e2067b31 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -335,6 +335,7 @@ Enhance PEMFile to laod from an InputStream. Patch provided by Romain Manni-Bucau. (schultz) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 5afdd20934 Fix typo 5afdd20934 is described below commit 5afdd20934596e5d19e45364e8e883b61f9d1daa Author: Mark Thomas AuthorDate: Fri Apr 14 11:59:53 2023 +0100 Fix typo --- java/jakarta/servlet/http/HttpServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/jakarta/servlet/http/HttpServlet.java b/java/jakarta/servlet/http/HttpServlet.java index 483bcc0423..25d7f5693f 100644 --- a/java/jakarta/servlet/http/HttpServlet.java +++ b/java/jakarta/servlet/http/HttpServlet.java @@ -565,7 +565,7 @@ public abstract class HttpServlet extends GenericServlet { * Is the provided HTTP request header considered sensitive and therefore should be excluded from the response to a * {@code TRACE} request? * - * By default, the headers thats start with any of the following are considered sensitive: + * By default, the headers that start with any of the following are considered sensitive: * * authorization * cookie - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo - thanks Chuck
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new f13f3306cd Fix typo - thanks Chuck f13f3306cd is described below commit f13f3306cdc3262cc80ce79b0882c12126365f1b 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 625353af0c..905af9cacb 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -2393,7 +2393,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 6416c67ec5 Fix typo 6416c67ec5 is described below commit 6416c67ec5e55c265782723484e9dd958e027c7f 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 37fc50107b Fix typo 37fc50107b is described below commit 37fc50107becca6593dd73e8c1aaf0503ec3fc4c 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 023b7e00e4..a49ba87ea6 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 main updated: Fix typo in changelog
This is an automated email from the ASF dual-hosted git repository. rjung pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new e1bd9c8394 Fix typo in changelog new 87294850f5 Merge branch 'main' of https://gitbox.apache.org/repos/asf/tomcat e1bd9c8394 is described below commit e1bd9c83941faa802ca3dc42760f3f3aaa410f3a Author: Rainer Jung AuthorDate: Mon Feb 27 13:28:51 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 eeb833999e..b2ebe268d7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -284,7 +284,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 main updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new f31182254a Fix typo. f31182254a is described below commit f31182254a5e14103f018f5e2b70da41f6b7b012 Author: lihan AuthorDate: Wed Feb 15 17:57:46 2023 +0800 Fix typo. --- java/org/apache/catalina/Context.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java index c3a881b385..928c1bfcd0 100644 --- a/java/org/apache/catalina/Context.java +++ b/java/org/apache/catalina/Context.java @@ -441,7 +441,7 @@ public interface Context extends Container, ContextBind { /** - * Determine if the matadata of the application is complete. This typically + * Determine if the metadata of the application is complete. This typically * means annotations which add to the application metadata will be * ignored. * - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new f6bcc2b812 Fix typo. f6bcc2b812 is described below commit f6bcc2b812f8e94d656ec984dbeb5477b630ed9d Author: lihan AuthorDate: Sun Jan 29 14:00:58 2023 +0800 Fix typo. --- java/org/apache/tomcat/util/buf/CharsetHolder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/buf/CharsetHolder.java b/java/org/apache/tomcat/util/buf/CharsetHolder.java index a7c8d2fc63..f1f0d7996d 100755 --- a/java/org/apache/tomcat/util/buf/CharsetHolder.java +++ b/java/org/apache/tomcat/util/buf/CharsetHolder.java @@ -29,7 +29,7 @@ import java.nio.charset.Charset; * and, if the name was valid, the Charset with validation and conversion logic * spread throughout those classes. * - * This class is an attempt to encapsulate that behvaiour. + * This class is an attempt to encapsulate that behaviour. */ public class CharsetHolder { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo in changelog.
This is an automated email from the ASF dual-hosted git repository. rjung pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 099f5062a5 Fix typo in changelog. 099f5062a5 is described below commit 099f5062a578d2a7df39c303eaa85a8ae7609091 Author: Rainer Jung AuthorDate: Fri Jan 20 10:24:13 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 be9e36c616..32076954cb 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -167,7 +167,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 main updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9d91e13654 Fix typo. 9d91e13654 is described below commit 9d91e13654b830a28ac99c44ff5607e507cd43d6 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 main updated: Fix typo in Javadoc
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new e2a219689c Fix typo in Javadoc e2a219689c is described below commit e2a219689c067f11b18c737d8af936b3cba67947 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 254d3ef2c9..ef3c711d5e 100644 --- a/java/jakarta/servlet/jsp/JspContext.java +++ b/java/jakarta/servlet/jsp/JspContext.java @@ -211,7 +211,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new b504f28ea6 Fix typo b504f28ea6 is described below commit b504f28ea6c79a58e2b58c6952e1b8777f23c231 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new a37e5a3052 Fix typo a37e5a3052 is described below commit a37e5a30521a50d3ba20e8c8096a34d8cfc72642 Author: Mark Thomas AuthorDate: Thu Sep 15 15:37:42 2022 +0100 Fix typo --- java/jakarta/servlet/jsp/tagext/TagSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/jakarta/servlet/jsp/tagext/TagSupport.java b/java/jakarta/servlet/jsp/tagext/TagSupport.java index 342293e48f..b604bf0594 100644 --- a/java/jakarta/servlet/jsp/tagext/TagSupport.java +++ b/java/jakarta/servlet/jsp/tagext/TagSupport.java @@ -270,7 +270,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 10ecb4c7c9 Fix typo 10ecb4c7c9 is described below commit 10ecb4c7c9eab30a68427a487e8a99cd93d7ef1a 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 853a97e332..b4080ba318 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -196,7 +196,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new b5bc432f2c Fix typo b5bc432f2c is described below commit b5bc432f2c7f62af3670408c238d2db94ad0e2f8 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 a777d777fb..e4b1f2c169 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -292,7 +292,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9547412dc8 Fix typo 9547412dc8 is described below commit 9547412dc87aaf9353ff54a1f0bf5eb4b15ca96d Author: Christopher Schultz AuthorDate: Thu Aug 4 13:25:45 2022 -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 ad63870d7c..40e9cbe546 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -127,6 +127,7 @@ Move control of XML-export logic from individual support classes into MemoryUserDatabase.save(). Deprecate and discontinue use of MemoryUser, MemoryRole, and MemoryGroup classes. (schultz) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main 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 main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 4d530de862 Fix typo - thanks to Han Li 4d530de862 is described below commit 4d530de862d658330ebcd1c5a637184c6202a496 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 d8fb3f400c..cd15cb0f49 100644 --- a/java/org/apache/coyote/http2/Stream.java +++ b/java/org/apache/coyote/http2/Stream.java @@ -63,7 +63,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(); @@ -71,11 +71,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; @@ -297,7 +297,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new c8fce99bd7 Fix typo c8fce99bd7 is described below commit c8fce99bd7a688603c2e68a559124881ec01a066 Author: Mark Thomas AuthorDate: Thu Jul 21 09:12:22 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 adf784ccb6..403b3ef4e7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -135,8 +135,8 @@ (markt) -Remove the jmvRoute system property used to configure a -default value for the jmvRoute attribute of an Engine. +Remove 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new d378d5e24c Fix typo d378d5e24c is described below commit d378d5e24cf13c9652b33d40e65faabbcbf39916 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9ed253675b Fix typo 9ed253675b is described below commit 9ed253675b725ae1b61503fdad3fffd1e752e510 Author: Mark Thomas AuthorDate: Tue Apr 26 19:07:36 2022 +0100 Fix typo --- webapps/docs/changelog.xml | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 01949d0425..3df044a28f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -138,10 +138,11 @@ the research into this issue. (markt) -Remove the custom UTF-decoder that was introduced to work around various -UTF-8 decoding bugs in Java. These issues were fixed in early Java 8 -releases. Now the minimum Java version is 11, we can be sure that Tomcat -will not be running on a JRE where these issues are present. (markt) +Remove the custom UTF-8 decoder that was introduced to work around +various UTF-8 decoding bugs in Java. These issues were fixed in early +Java 8 releases. Now the minimum Java version is 11, we can be sure that +Tomcat will not be running on a JRE where these issues are present. +(markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new cd4d406 Fix typo cd4d406 is described below commit cd4d4061e36e4d5e635ec6e2d69c019c1a53bdbf 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 edcbdb6..206b0f5 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -144,7 +144,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 main updated: Fix typo in JPMS substitution configuration
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 7a833bb Fix typo in JPMS substitution configuration 7a833bb is described below commit 7a833bb5df65b1bf40242a7f26d32cf38f3941b8 Author: Mark Thomas AuthorDate: Wed Feb 23 11:01:29 2022 + Fix typo in JPMS substitution configuration --- res/bnd/websocket-client-api.jar.tmp.bnd | 2 +- webapps/docs/changelog.xml | 8 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/res/bnd/websocket-client-api.jar.tmp.bnd b/res/bnd/websocket-client-api.jar.tmp.bnd index b2713eb..e58fdcc 100644 --- a/res/bnd/websocket-client-api.jar.tmp.bnd +++ b/res/bnd/websocket-client-api.jar.tmp.bnd @@ -42,5 +42,5 @@ Require-Capability: \ access=32;\ version=${websocket.spec.version} -jpms-module-info-options: \ -jakarta.websocke.clientt;\ +jakarta.websocket.client;\ substitute=websocket-client-api \ No newline at end of file diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6c6cd6c..d399207 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,6 +113,14 @@ + + + +Fix typo in JPMS substitution configuration for WebSocket client module. +(markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 71e9d68 Fix typo 71e9d68 is described below commit 71e9d687f01e67b2d802ef5296271daedf80c562 Author: Mark Thomas AuthorDate: Wed Jan 12 17:32:40 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 cbca052..0266d6f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -110,7 +110,7 @@ -Add missing check in SessionCookieConfig.setSttribute() to +Add missing check in SessionCookieConfig.setAttribute() to ensure that the method fails if called after the web application has started. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new d312165 Fix typo d312165 is described below commit d312165d13445972b276ec5d696f249cbc1b2f58 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 5201a43..de6c352 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 main updated: Fix typo (spotted by rjung)
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 302fcea Fix typo (spotted by rjung) 302fcea is described below commit 302fcea312947f5b076c2b61da62f52c0dd56588 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 6924220..8a4de63 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -135,7 +135,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 54586a1 Fix typo 54586a1 is described below commit 54586a129506d41f4c3d6000d20d22ee67d30289 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 6b2fa5f..42afdf1 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -187,7 +187,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 1062cf4 Fix typo 1062cf4 is described below commit 1062cf4527f15c8c4cd679b3fa2bbe57adcf3441 Author: Mark Thomas AuthorDate: Thu Nov 18 19:22:39 2021 + Fix typo --- java/jakarta/servlet/http/Cookie.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/jakarta/servlet/http/Cookie.java b/java/jakarta/servlet/http/Cookie.java index de184f2..2e7bb98 100644 --- a/java/jakarta/servlet/http/Cookie.java +++ b/java/jakarta/servlet/http/Cookie.java @@ -334,7 +334,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 27630c4 Fix typo 27630c4 is described below commit 27630c4d28f04c7748b926df6b7678840beecc19 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new af6f457 Fix typo af6f457 is described below commit af6f4575253b88a2351a31613fe89853232bce38 Author: Mark Thomas AuthorDate: Sat Nov 6 08:56:02 2021 + Fix typo --- res/rat/rat-excludes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt index 00ad84d..4b69f95 100644 --- a/res/rat/rat-excludes.txt +++ b/res/rat/rat-excludes.txt @@ -52,7 +52,7 @@ - Markdown files for display in their GitHub UI - - Temporary cache files used by Checkstle + - Temporary cache files used by Checkstyle - Temporary files used by buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9001eb6 Fix typo 9001eb6 is described below commit 9001eb630d3596f9047a6671d5a046bd29ca4b2e Author: Mark Thomas AuthorDate: Thu Sep 23 18:30:59 2021 +0100 Fix typo --- java/jakarta/servlet/jsp/PageContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/jakarta/servlet/jsp/PageContext.java b/java/jakarta/servlet/jsp/PageContext.java index 49267f6..619b64e 100644 --- a/java/jakarta/servlet/jsp/PageContext.java +++ b/java/jakarta/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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 84f42dc Fix typo 84f42dc is described below commit 84f42dce3df07e4640051b1430fca239ff5c45cf 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 ebc8001..ec17488 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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new d11cf77 Fix typo new 1988fad Merge pull request #450 from tussupbekov/typo-fix d11cf77 is described below commit d11cf77bb6ec503d3c3ba23eccaae813916ac399 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 5859a02..2f3d7d3 100644 --- a/java/org/apache/tomcat/websocket/WsSession.java +++ b/java/org/apache/tomcat/websocket/WsSession.java @@ -192,7 +192,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 433a28b Fix typo 433a28b is described below commit 433a28bb66c06471201d0cc6803b295fdf6f15cd Author: Mark Thomas AuthorDate: Thu Sep 2 21:01:46 2021 +0100 Fix typo --- java/org/apache/tomcat/util/scan/LocalStrings_ja.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/scan/LocalStrings_ja.properties b/java/org/apache/tomcat/util/scan/LocalStrings_ja.properties index e4b4025..31f353d 100644 --- a/java/org/apache/tomcat/util/scan/LocalStrings_ja.properties +++ b/java/org/apache/tomcat/util/scan/LocalStrings_ja.properties @@ -18,7 +18,7 @@ jarScan.classloaderFail=クラスローダー階層から[{0}]をスキャンで jarScan.classloaderJarNoScan=クラスパス中のファイル [{0}] は JAR スキャンをしませんでした。 jarScan.classloaderJarScan=クラスパスの JAR ファイル [{0}] をスキャンします。 jarScan.classloaderStart=クラスローダー階層中の JAR ファイルをスキャンします。 -jarSacn.invalidModuleUri=モジュール URI [{0}] を JarScanner で処理する URL に変換できませんでした。 +jarScan.invalidModuleUri=モジュール URI [{0}] を JarScanner で処理する URL に変換できませんでした。 jarScan.jarUrlStart=URL [{0}] の JAR ファイルをスキャンします。 jarScan.webinfclassesFail=/WEB-INF/classesのスキャンに失敗しました jarScan.webinflibFail=/WEB-INF/libからJAR [{0}]をスキャンできませんでした。 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 11fca7f Fix typo 11fca7f is described below commit 11fca7f383069cfcc0cc5efdbd3e750596c0f0b4 Author: Mark Thomas AuthorDate: Mon Aug 23 12:42:16 2021 +0100 Fix typo --- test/org/apache/tomcat/util/net/TesterSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java b/test/org/apache/tomcat/util/net/TesterSupport.java index 02b0268..c797ea2 100644 --- a/test/org/apache/tomcat/util/net/TesterSupport.java +++ b/test/org/apache/tomcat/util/net/TesterSupport.java @@ -220,7 +220,7 @@ public final class TesterSupport { } protected static boolean isClientRenegotiationSupported(Tomcat tomcat) { -// Disabled for Tomcat Native (part if response to CVE-2009-3555) +// Disabled for Tomcat Native (part of response to CVE-2009-3555) // Only JRE provided JSSE implementation supports this String sslImplementation = (String) tomcat.getConnector().getProperty("sslImplementationName"); if (!JSSEImplementation.class.getName().equals(sslImplementation)) { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main 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 main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 7725d85 Fix typo - thanks to Mikael Sterner 7725d85 is described below commit 7725d855aa365d437fe01dff56fe8628106d4dca 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 2475a0a..a4420ca 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1580,7 +1580,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 main updated: Fix typo (#433)
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new b5d84e4 Fix typo (#433) b5d84e4 is described below commit b5d84e4299668795fac658aa64ea151cf653684c 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/jakarta/servlet/ServletSecurityElement.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/jakarta/servlet/ServletSecurityElement.java b/java/jakarta/servlet/ServletSecurityElement.java index 4f8d469..549f199 100644 --- a/java/jakarta/servlet/ServletSecurityElement.java +++ b/java/jakarta/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) { @@ -83,7 +84,8 @@ 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 + * @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 main 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 main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 40920f6 Fix typo in method's javadoc (#429) 40920f6 is described below commit 40920f6522f3f390a503738dd943a1a5be5b96b2 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/ --- java/jakarta/servlet/ServletOutputStream.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/jakarta/servlet/ServletOutputStream.java b/java/jakarta/servlet/ServletOutputStream.java index d788b08..86a57c6 100644 --- a/java/jakarta/servlet/ServletOutputStream.java +++ b/java/jakarta/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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 6ec028e Fix typo 6ec028e is described below commit 6ec028edc5ca1b6e928fb3395e993b272c814292 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 8e87097..809d65e3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -324,8 +324,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 main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new e0192fd Fix typo e0192fd is described below commit e0192fd862ab94e9524714bb7c585670edd4b857 Author: Mark Thomas AuthorDate: Tue Jun 8 18:43:03 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 c891553..8e87097 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -295,7 +295,7 @@ Update the web-fragment.xml included in -tomcat-websocket.jarto use the Servlet 5.0 schema. (markt) +tomcat-websocket.jar to use the Servlet 5.0 schema. (markt) 65342: Correct a regression introduced with the fix for - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9b385fe Fix typo 9b385fe is described below commit 9b385febce3f4eb0dffc45c5faf1e481f658c0bc Author: Mark Thomas AuthorDate: Tue May 25 12:25:48 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 8ac487a..01412cf 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -119,7 +119,7 @@ -Incremented tje supported Jakarta Servlet version to 5.1 to align with +Incremented the supported Jakarta Servlet version to 5.1 to align with the current development branch of the Jakarta Servlet specification. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org