[tomcat] branch main updated: Update Eclipse compiler to 4.25 / 3.31.0
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 757228532c Update Eclipse compiler to 4.25 / 3.31.0
757228532c is described below
commit 757228532c6ae08e3e71b17b5fd7ec4947c25bb3
Author: Mark Thomas
AuthorDate: Fri Sep 30 11:11:43 2022 +0100
Update Eclipse compiler to 4.25 / 3.31.0
---
build.properties.default| 12 ++--
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 7 +++
7 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 7f3f2f0cd6..88d0eb22b4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -136,15 +136,15 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.23" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/checksum/eclipse-4.23-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.25" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.25-202208311800/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.25-202208311800/checksum/eclipse-4.25-SUMSSHA512
#
-jdt.version=4.23
-jdt.release=R-4.23-202203080310
+jdt.version=4.25
+jdt.release=R-4.25-202208311800
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=2f8c6c7bc2e2c738c853f3c977ffb7a258b9f92e260e3affdf9c8fd54ac7b70e404944d0e434eb83a14b8bf01b201effaaf9930ea4b5fdfb1a752b6abf1ae1ec
+jdt.checksum.value=2c469433e09957315b93b030f5668b2539dbf7a198f8f43c5c9cb2f350ff22086587e897ecd1af6461cd1f8abe9a58eeaacb27bc9eec38a23caedf5e0e00da56
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index d70b08a72c..b01f2e46a4 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 56952703ef..af3b5ced15 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
-
+
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 0ef68ae85e..b1c29e9f80 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.23/ecj-4.23.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.25/ecj-4.25.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index d864c3de91..92af4b3fb0 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.23/ecj-4.23.jar:${base.path}/bnd-6.3.1/biz.aQute.bnd-6.3.1.jar:${base.path}/migration-1.0.4/jakartaee-migration-1.0.4-shaded.jar:$
[tomcat] branch main updated: Add support for compiling JSPs using Java 20
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 923a6b Add support for compiling JSPs using Java 20
923a6b is described below
commit 923a6b8d9986a8060cd10e3a59303dab17ae
Author: Mark Thomas
AuthorDate: Fri Sep 30 11:16:05 2022 +0100
Add support for compiling JSPs using Java 20
---
java/org/apache/jasper/compiler/JDTCompiler.java | 25 ++--
webapps/docs/changelog.xml | 7 +++
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 94876897bd..1b71dc5169 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -313,16 +313,18 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_16);
} else if(opt.equals("17")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_17);
-} else if (opt.equals("18")) {
+} else if(opt.equals("18")) {
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_18);
+} else if (opt.equals("19")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
-settings.put(CompilerOptions.OPTION_Source, "18");
-} else if (opt.equals("19")) {
+settings.put(CompilerOptions.OPTION_Source, "19");
+} else if (opt.equals("20")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
-settings.put(CompilerOptions.OPTION_Source, "19");
+settings.put(CompilerOptions.OPTION_Source, "20");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_11);
@@ -384,18 +386,21 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
} else if(opt.equals("17")) {
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_17);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_17);
-} else if (opt.equals("18")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
-// This is checked against the actual version below.
-settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
-settings.put(CompilerOptions.OPTION_Compliance, "18");
+} else if(opt.equals("18")) {
+settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_18);
+settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_18);
} else if (opt.equals("19")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "19");
settings.put(CompilerOptions.OPTION_Compliance, "19");
+} else if (opt.equals("20")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "20");
+settings.put(CompilerOptions.OPTION_Compliance, "20");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_11);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 38be2e332a..22557e5bfd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,13 @@
66277: Fix regressions in refactoring from
Stack
ArrayDeque.
+
+Add support for specifying Java 20 (with the value 20) as
+the compiler source and/or compiler target for JSP compilation. If used
+with an Eclipse JDT compiler version that does not support these
values,
+
[tomcat] branch 10.0.x updated: Add support for compiling JSPs using Java 20
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new c5998ed9f8 Add support for compiling JSPs using Java 20
c5998ed9f8 is described below
commit c5998ed9f8f5f10f365cb8b6d7b2ce3af1100e3e
Author: Mark Thomas
AuthorDate: Fri Sep 30 11:16:05 2022 +0100
Add support for compiling JSPs using Java 20
---
java/org/apache/jasper/compiler/JDTCompiler.java | 27 +---
webapps/docs/changelog.xml | 7 ++
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 5bbae6b5fe..6c6831f5c0 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,20 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "17");
} else if (opt.equals("18")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 8.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "18");
} else if (opt.equals("19")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 8.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "19");
+} else if (opt.equals("20")) {
+// Constant not available in latest ECJ version that runs on
+// Java 8.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "20");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
@@ -391,17 +396,23 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform, "17");
settings.put(CompilerOptions.OPTION_Compliance, "17");
} else if (opt.equals("18")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 8.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
settings.put(CompilerOptions.OPTION_Compliance, "18");
} else if (opt.equals("19")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 8.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "19");
settings.put(CompilerOptions.OPTION_Compliance, "19");
+} else if (opt.equals("20")) {
+// Constant not available in latest ECJ version that runs on
+// Java 8.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "20");
+settings.put(CompilerOptions.OPTION_Compliance, "20");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_1_8);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6db5c14808..c81249a334 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,13 @@
66277: Fix regressions in refactoring from
Stack
ArrayDeque.
+
+Add support for specifying Java 20 (with the value 20) as
+the compiler source and/or compiler target for JSP compilation. If used
+with an Eclipse JDT compiler version that does not support these
values,
+a warning will be logged and the default will used.
+(markt)
+
[tomcat] branch 9.0.x updated: Add support for compiling JSPs using Java 20
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 5e869ba147 Add support for compiling JSPs using Java 20
5e869ba147 is described below
commit 5e869ba1478820f079d75ff4eaf68e3b142aa258
Author: Mark Thomas
AuthorDate: Fri Sep 30 11:16:05 2022 +0100
Add support for compiling JSPs using Java 20
---
java/org/apache/jasper/compiler/JDTCompiler.java | 27 +---
webapps/docs/changelog.xml | 7 ++
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 5bbae6b5fe..6c6831f5c0 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,20 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "17");
} else if (opt.equals("18")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 8.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "18");
} else if (opt.equals("19")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 8.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "19");
+} else if (opt.equals("20")) {
+// Constant not available in latest ECJ version that runs on
+// Java 8.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "20");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
@@ -391,17 +396,23 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform, "17");
settings.put(CompilerOptions.OPTION_Compliance, "17");
} else if (opt.equals("18")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 8.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
settings.put(CompilerOptions.OPTION_Compliance, "18");
} else if (opt.equals("19")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 8.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "19");
settings.put(CompilerOptions.OPTION_Compliance, "19");
+} else if (opt.equals("20")) {
+// Constant not available in latest ECJ version that runs on
+// Java 8.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "20");
+settings.put(CompilerOptions.OPTION_Compliance, "20");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_1_8);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index aaa0db5c05..b81dd781fd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,13 @@
66277: Fix regressions in refactoring from
Stack
ArrayDeque.
+
+Add support for specifying Java 20 (with the value 20) as
+the compiler source and/or compiler target for JSP compilation. If used
+with an Eclipse JDT compiler version that does not support these
values,
+a warning will be logged and the default will used.
+(markt)
+
[tomcat] branch 8.5.x updated: Add support for compiling JSPs using Java 20
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d214fdf3f7 Add support for compiling JSPs using Java 20
d214fdf3f7 is described below
commit d214fdf3f76cc4f4ff2caf676e6899429be92cfc
Author: Mark Thomas
AuthorDate: Fri Sep 30 11:16:05 2022 +0100
Add support for compiling JSPs using Java 20
---
java/org/apache/jasper/compiler/JDTCompiler.java | 25
webapps/docs/changelog.xml | 7 +++
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 4dacf9eb8c..4c26bd06c5 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -367,15 +367,18 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
} else if (opt.equals("18")) {
// Constant not available in latest ECJ version that runs on
// Java 7.
-// Constant not available in latest stable ECJ version.
-// May be supported in a snapshot build.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "18");
} else if (opt.equals("19")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 7.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "19");
+} else if (opt.equals("20")) {
+// Constant not available in latest ECJ version that runs on
+// Java 7.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "20");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_7);
@@ -462,17 +465,23 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform, "17");
settings.put(CompilerOptions.OPTION_Compliance, "17");
} else if (opt.equals("18")) {
-// Constant not available in latest stable ECJ version.
-// May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 7.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
settings.put(CompilerOptions.OPTION_Compliance, "18");
} else if (opt.equals("19")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 7.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "19");
settings.put(CompilerOptions.OPTION_Compliance, "19");
+} else if (opt.equals("20")) {
+// Constant not available in latest ECJ version that runs on
+// Java 7.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "20");
+settings.put(CompilerOptions.OPTION_Compliance, "20");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_1_7);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9cbd8f06ba..5f2abad2cb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -233,6 +233,13 @@
66277: Fix regressions in refactoring from
Stack
ArrayDeque.
+
+Add support for specifying Java 20 (with the value 20) as
+the compiler source and/or compiler target for JSP compilation. If used
+with an Eclipse JDT compiler version that does not support these
values,
+a warning will be logged and the default will used.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mai
[tomcat] branch main updated: Various build/test updates
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 27bb7c4a0e Various build/test updates
27bb7c4a0e is described below
commit 27bb7c4a0e4f07dd2512215b1e27704bff9f6564
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:14:15 2022 +0100
Various build/test updates
---
build.properties.default | 40 +++-
webapps/docs/changelog.xml | 21 +
2 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 88d0eb22b4..ab719554e1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -247,46 +247,46 @@ cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
# - objenesis, used by EasyMock, version 1.2 or later -
-objenesis.version=3.2
+objenesis.version=3.3
objenesis.checksum.enabled=true
objenesis.checksum.algorithm=MD5|SHA-1
-objenesis.checksum.value=5c1ee20481a06561af295034ea89c4b4|7fadf57620c8b8abdf7519533e5527367cb51f09
+objenesis.checksum.value=ab0e0b2ab81affdd7f38bcc60fd85571|1049c09f1de4331e8193e579448d0916d75b7631
objenesis.home=${base.path}/objenesis-${objenesis.version}
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.3
+unboundid.version=6.0.6
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=29c87814b7cdbbbc00ee8c29818b82f148001e3a64dabda8d1300c7366ba149f204b0355322a5287a6b7ccb5a2456f5f0e8c719f1a7eb637cb27646fe40191fb
+unboundid.checksum.value=080a6719ceeb55bcdcc8cac7146b4da1ef7c29107d336868e7f77666fc834ed4191bdaa54dac03eccf02bdfb0b6293809b7b8a41eee7cf420489c98018afeb9f
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.0
+checkstyle.version=10.3.4
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=c613a3036d15b67f20738ddb9a2a0aeccb58cb0163dd5b94dcc153d924ddf9c58a884bd90c59fb899870b6c5601af3e52847b97e985d6f5c58209d64b4fde2f1
+checkstyle.checksum.value=03bf9d20a83dbf44dd83e8081e293903c94b10f92b9b78051be04a6c759c43cff537acf4086da23a69c8875b3f3dbabdd11ab345d07d3d42940621c507fc1e84
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.7
+jacoco.version=0.8.8
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=174fde230d1090a5622119d5096bce07|983a52a030f4123b671840a27426ed73479f45cc
+jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.6.0
+spotbugs.version=4.7.2
spotbugs.checksum.enabled=true
-spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=c3ebc5761299b253e7e563a0a71f931ffa6ab3861380abb246d2258a916c9c6d40f6582dbe10b084d6932536c38f6d8bd7711456b6b7eef7c83df770915ecf1e
+spotbugs.checksum.algorithm=SHA-256
+spotbugs.checksum.value=f02a023d03b0fde70038ccb4bc8d4a964a504262d13024a97b14d9070f7d4d96
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
@@ -329,30 +329,30 @@
openssl-lib.jar=${openssl-lib.home}/tomcat-coyote-openssl-java17-${openssl-lib.v
openssl-lib.loc=${base-maven.loc}/org/apache/tomcat/tomcat-coyote-openssl-java17/${openssl-lib.version}/tomcat-coyote-openssl-java17-${openssl-lib.version}.jar
# - JSign, version 4.1 or later -
-jsign.version=4.1
+jsign.version=4.2
-# checksums for JSign 4.1
+# checksums for JSign 4.2
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=ba760e85fe0bdb1da12152822919caec|39fa41688de11b739278b8cb8533c05888d68d5a
+jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114d59
[tomcat] branch 8.5.x updated: Various build/test updates
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new c5271274d7 Various build/test updates
c5271274d7 is described below
commit c5271274d7a66ea97443aa405552385b2f829a10
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:14:15 2022 +0100
Various build/test updates
---
build.properties.default | 30 ++
webapps/docs/changelog.xml | 18 ++
2 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 85946e1179..7b1ef75a34 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -256,60 +256,58 @@ cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
# - objenesis, used by EasyMock, version 1.2 or later -
-objenesis.version=3.2
+objenesis.version=3.3
objenesis.checksum.enabled=true
objenesis.checksum.algorithm=MD5|SHA-1
-objenesis.checksum.value=5c1ee20481a06561af295034ea89c4b4|7fadf57620c8b8abdf7519533e5527367cb51f09
+objenesis.checksum.value=ab0e0b2ab81affdd7f38bcc60fd85571|1049c09f1de4331e8193e579448d0916d75b7631
objenesis.home=${base.path}/objenesis-${objenesis.version}
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.3
+unboundid.version=6.0.6
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=29c87814b7cdbbbc00ee8c29818b82f148001e3a64dabda8d1300c7366ba149f204b0355322a5287a6b7ccb5a2456f5f0e8c719f1a7eb637cb27646fe40191fb
+unboundid.checksum.value=080a6719ceeb55bcdcc8cac7146b4da1ef7c29107d336868e7f77666fc834ed4191bdaa54dac03eccf02bdfb0b6293809b7b8a41eee7cf420489c98018afeb9f
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.0
+checkstyle.version=10.3.4
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=c613a3036d15b67f20738ddb9a2a0aeccb58cb0163dd5b94dcc153d924ddf9c58a884bd90c59fb899870b6c5601af3e52847b97e985d6f5c58209d64b4fde2f1
+checkstyle.checksum.value=03bf9d20a83dbf44dd83e8081e293903c94b10f92b9b78051be04a6c759c43cff537acf4086da23a69c8875b3f3dbabdd11ab345d07d3d42940621c507fc1e84
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.7
+jacoco.version=0.8.8
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=174fde230d1090a5622119d5096bce07|983a52a030f4123b671840a27426ed73479f45cc
+jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.6.0
+spotbugs.version=4.7.2
spotbugs.checksum.enabled=true
-spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=c3ebc5761299b253e7e563a0a71f931ffa6ab3861380abb246d2258a916c9c6d40f6582dbe10b084d6932536c38f6d8bd7711456b6b7eef7c83df770915ecf1e
+spotbugs.checksum.algorithm=SHA-256
+spotbugs.checksum.value=f02a023d03b0fde70038ccb4bc8d4a964a504262d13024a97b14d9070f7d4d96
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
# - JSign, version 4.1 or later -
-jsign.version=4.1
+jsign.version=4.2
-# checksums for JSign 4.1
+# checksums for JSign 4.2
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=ba760e85fe0bdb1da12152822919caec|39fa41688de11b739278b8cb8533c05888d68d5a
+jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114d599b05be243513b85a51b0c45401
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
-
-
diff --git a/webapps/docs/changelog.xml b/webapps/docs
[tomcat] branch 10.0.x updated: Various build/test updates
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new d92c43a7fc Various build/test updates
d92c43a7fc is described below
commit d92c43a7fcd948f5e8003993c0c1a357f4110417
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:14:15 2022 +0100
Various build/test updates
---
build.properties.default | 40 +++-
webapps/docs/changelog.xml | 25 +
2 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 888480191f..9bd50095d4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -252,46 +252,46 @@ cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
# - objenesis, used by EasyMock, version 1.2 or later -
-objenesis.version=3.2
+objenesis.version=3.3
objenesis.checksum.enabled=true
objenesis.checksum.algorithm=MD5|SHA-1
-objenesis.checksum.value=5c1ee20481a06561af295034ea89c4b4|7fadf57620c8b8abdf7519533e5527367cb51f09
+objenesis.checksum.value=ab0e0b2ab81affdd7f38bcc60fd85571|1049c09f1de4331e8193e579448d0916d75b7631
objenesis.home=${base.path}/objenesis-${objenesis.version}
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.3
+unboundid.version=6.0.6
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=29c87814b7cdbbbc00ee8c29818b82f148001e3a64dabda8d1300c7366ba149f204b0355322a5287a6b7ccb5a2456f5f0e8c719f1a7eb637cb27646fe40191fb
+unboundid.checksum.value=080a6719ceeb55bcdcc8cac7146b4da1ef7c29107d336868e7f77666fc834ed4191bdaa54dac03eccf02bdfb0b6293809b7b8a41eee7cf420489c98018afeb9f
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.0
+checkstyle.version=10.3.4
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=c613a3036d15b67f20738ddb9a2a0aeccb58cb0163dd5b94dcc153d924ddf9c58a884bd90c59fb899870b6c5601af3e52847b97e985d6f5c58209d64b4fde2f1
+checkstyle.checksum.value=03bf9d20a83dbf44dd83e8081e293903c94b10f92b9b78051be04a6c759c43cff537acf4086da23a69c8875b3f3dbabdd11ab345d07d3d42940621c507fc1e84
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.7
+jacoco.version=0.8.8
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=174fde230d1090a5622119d5096bce07|983a52a030f4123b671840a27426ed73479f45cc
+jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.6.0
+spotbugs.version=4.7.2
spotbugs.checksum.enabled=true
-spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=c3ebc5761299b253e7e563a0a71f931ffa6ab3861380abb246d2258a916c9c6d40f6582dbe10b084d6932536c38f6d8bd7711456b6b7eef7c83df770915ecf1e
+spotbugs.checksum.algorithm=SHA-256
+spotbugs.checksum.value=f02a023d03b0fde70038ccb4bc8d4a964a504262d13024a97b14d9070f7d4d96
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
@@ -322,30 +322,30 @@
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.vers
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
# - JSign, version 4.1 or later -
-jsign.version=4.1
+jsign.version=4.2
-# checksums for JSign 4.1
+# checksums for JSign 4.2
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=ba760e85fe0bdb1da12152822919caec|39fa41688de11b739278b8cb8533c05888d68d5a
+jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114
[tomcat] branch 9.0.x updated: Various build/test updates
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new fccd9a9896 Various build/test updates
fccd9a9896 is described below
commit fccd9a9896a74d4611b3692be2c5ac087f31376e
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:14:15 2022 +0100
Various build/test updates
---
build.properties.default | 40 +++-
webapps/docs/changelog.xml | 25 +
2 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index d506e06178..bfb9550456 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -252,46 +252,46 @@ cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
# - objenesis, used by EasyMock, version 1.2 or later -
-objenesis.version=3.2
+objenesis.version=3.3
objenesis.checksum.enabled=true
objenesis.checksum.algorithm=MD5|SHA-1
-objenesis.checksum.value=5c1ee20481a06561af295034ea89c4b4|7fadf57620c8b8abdf7519533e5527367cb51f09
+objenesis.checksum.value=ab0e0b2ab81affdd7f38bcc60fd85571|1049c09f1de4331e8193e579448d0916d75b7631
objenesis.home=${base.path}/objenesis-${objenesis.version}
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.3
+unboundid.version=6.0.6
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=29c87814b7cdbbbc00ee8c29818b82f148001e3a64dabda8d1300c7366ba149f204b0355322a5287a6b7ccb5a2456f5f0e8c719f1a7eb637cb27646fe40191fb
+unboundid.checksum.value=080a6719ceeb55bcdcc8cac7146b4da1ef7c29107d336868e7f77666fc834ed4191bdaa54dac03eccf02bdfb0b6293809b7b8a41eee7cf420489c98018afeb9f
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.0
+checkstyle.version=10.3.4
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=c613a3036d15b67f20738ddb9a2a0aeccb58cb0163dd5b94dcc153d924ddf9c58a884bd90c59fb899870b6c5601af3e52847b97e985d6f5c58209d64b4fde2f1
+checkstyle.checksum.value=03bf9d20a83dbf44dd83e8081e293903c94b10f92b9b78051be04a6c759c43cff537acf4086da23a69c8875b3f3dbabdd11ab345d07d3d42940621c507fc1e84
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.7
+jacoco.version=0.8.8
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=174fde230d1090a5622119d5096bce07|983a52a030f4123b671840a27426ed73479f45cc
+jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.6.0
+spotbugs.version=4.7.2
spotbugs.checksum.enabled=true
-spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=c3ebc5761299b253e7e563a0a71f931ffa6ab3861380abb246d2258a916c9c6d40f6582dbe10b084d6932536c38f6d8bd7711456b6b7eef7c83df770915ecf1e
+spotbugs.checksum.algorithm=SHA-256
+spotbugs.checksum.value=f02a023d03b0fde70038ccb4bc8d4a964a504262d13024a97b14d9070f7d4d96
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
@@ -310,30 +310,30 @@ bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
# - JSign, version 4.1 or later -
-jsign.version=4.1
+jsign.version=4.2
-# checksums for JSign 4.1
+# checksums for JSign 4.2
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=ba760e85fe0bdb1da12152822919caec|39fa41688de11b739278b8cb8533c05888d68d5a
+jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114d599b05be243513b85a51b0c45401
jsign.home=${base.path}/jsign-${jsign.version}
jsi
[tomcat] branch main updated (27bb7c4a0e -> d65634e3c1)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 27bb7c4a0e Various build/test updates new 813c20f001 Updates to Chinese translations new af3e83530e Improvements to Czech translations. new 1ce30eb0a6 Improvements to French translations. (remm) new bddc9bdba7 Improvements to Japanese translations. new 4c46842686 Improvements to Korean translations new d65634e3c1 Improvements to Spanish translations The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../authenticator/LocalStrings_fr.properties | 2 + .../authenticator/LocalStrings_ja.properties | 16 +++--- .../catalina/connector/LocalStrings_ja.properties | 2 +- .../catalina/core/LocalStrings_ja.properties | 4 +- .../catalina/filters/LocalStrings_ja.properties| 2 +- .../catalina/ha/session/LocalStrings_ja.properties | 64 +++--- .../catalina/ha/tcp/LocalStrings_ja.properties | 4 +- .../catalina/session/LocalStrings_ja.properties| 2 +- .../catalina/startup/LocalStrings_ja.properties| 10 ++-- .../tribes/tipis/LocalStrings_ja.properties| 4 +- .../transport/nio/LocalStrings_ja.properties | 4 +- .../coyote/http11/LocalStrings_fr.properties | 1 + .../coyote/http11/LocalStrings_ja.properties | 1 + .../apache/coyote/http2/LocalStrings_fr.properties | 4 ++ .../coyote/http2/LocalStrings_zh_CN.properties | 2 +- .../jasper/resources/LocalStrings_ja.properties| 3 +- .../tomcat/websocket/LocalStrings_cs.properties| 2 +- .../tomcat/websocket/LocalStrings_es.properties| 2 +- .../tomcat/websocket/LocalStrings_fr.properties| 2 +- .../tomcat/websocket/LocalStrings_ja.properties| 10 +++- .../tomcat/websocket/LocalStrings_ko.properties| 2 +- .../tomcat/websocket/LocalStrings_zh_CN.properties | 2 +- webapps/docs/changelog.xml | 19 +++ 23 files changed, 98 insertions(+), 66 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/06: Improvements to Korean translations
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
commit 4c468426861f23ec0952ae7c90ca72a656b39909
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:40:45 2022 +0100
Improvements to Korean translations
---
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index 8b2ff988ff..1e9398ab16 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -128,8 +128,8 @@ wsWebSocketContainer.invalidStatus=서버 [{0}](으)로부터의 HTTP 응답은,
wsWebSocketContainer.invalidSubProtocol=웹소켓 서버가, 해당 Sec-WebSocket-Protocol 헤더를
위해 여러 값들을 반환했습니다.
wsWebSocketContainer.maxBuffer=이 구현은 버퍼의 최대 크기를 Integer.MAX_VALUE로 제한합니다.
wsWebSocketContainer.missingAnnotation=@ClientEndpoint에 의해 annotate되지 않았기에,
POJO 클래스 [{0}]을(를) 사용할 수 없습니다.
+wsWebSocketContainer.missingAuthenticateHeader=HTTP 응답 코드 [{0}]을(를) 처리하지
못했습니다. 응답 헤더 [{1}] 가 없습니다.
wsWebSocketContainer.missingLocationHeader=HTTP 응답 코드 [{0}]을(를) 처리하지 못했습니다.
응답에 Location 헤더가 없습니다.
-wsWebSocketContainer.missingWWWAuthenticateHeader=HTTP 응답 코드 [{0}]을(를) 처리하지
못했습니다. 응답 헤더 WWW-Authenticate가 없습니다.
wsWebSocketContainer.pathNoHost=URI 내에 호스트가 지정되지 않았습니다.
wsWebSocketContainer.pathWrongScheme=스킴 [{0}]은(는) 지원되지 않습니다. 지원되는 스킴들은 ws와
wss입니다.
wsWebSocketContainer.proxyConnectFail=설정된 프록시 [{0}](으)로 연결하지 못했습니다. HTTP 응답
코드는 [{1}]이었습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1e15836c62..93c8f6cded 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -167,6 +167,9 @@
Improvements to Japanese translations. Contributed by tak7iji and
Shirayuking. (markt)
+
+Improvements to Korean translations. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/06: Improvements to Czech translations.
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
commit af3e83530ee17c4e1ab0c0ee0e29fecba91cd4f9
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:34:10 2022 +0100
Improvements to Czech translations.
---
java/org/apache/tomcat/websocket/LocalStrings_cs.properties | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_cs.properties
b/java/org/apache/tomcat/websocket/LocalStrings_cs.properties
index f6716ec9e8..a97bb1a5ee 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_cs.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_cs.properties
@@ -28,5 +28,5 @@ wsSession.doClose=Zavírám WebSocket session [{0}]
wsSession.duplicateHandlerText=Jednotka (handler) pro textové zprávy již byla
nakonfigurována
wsSession.instanceNew=Selhala registrace instance endpointu
-wsWebSocketContainer.missingWWWAuthenticateHeader=Zpracování HTTP odpovědi pro
kód [{0}] selhalo. V odpovědi chybí hlavička WWW-Authenticate
+wsWebSocketContainer.missingAuthenticateHeader=Zpracování HTTP odpovědi pro
kód [{0}] selhalo. V odpovědi chybí hlavička [{1}]
wsWebSocketContainer.sessionCloseFail=Relace s ID [{0}] nebyla ukončena čistě
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1159612fdd..0a02ee482d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -157,6 +157,9 @@
Improvements to Chinese translations. (markt)
+
+Improvements to Czech translations. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/06: Improvements to Spanish translations
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
commit d65634e3c1491edfd2ee6331a27d79c39f58ca83
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:41:47 2022 +0100
Improvements to Spanish translations
---
java/org/apache/tomcat/websocket/LocalStrings_es.properties | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_es.properties
b/java/org/apache/tomcat/websocket/LocalStrings_es.properties
index ce320ac974..cdf18a8b54 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_es.properties
@@ -40,6 +40,6 @@ wsSession.doClose=Cerrando WebSocket sesión [{0}]
wsSession.duplicateHandlerText=Un manejador de mensaje de texto ya ha sido
configurado
wsSession.instanceNew=Falló la registración de la instancia del dispoitivo
final
-wsWebSocketContainer.missingWWWAuthenticateHeader=Fallo al manejar el código
de respuesta HTTP [{0}]. No existe la cabecera WWW-Authenticate en la respuesta
+wsWebSocketContainer.missingAuthenticateHeader=Fallo al manejar el código de
respuesta HTTP [{0}]. No existe la cabecera [{1}] en la respuesta
wsWebSocketContainer.pathNoHost=No se especificó ningún host en URI
wsWebSocketContainer.sessionCloseFail=La sesión con ID [{0}] no se cerró
correctamente
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 93c8f6cded..e7b4a6868e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -170,6 +170,9 @@
Improvements to Korean translations. (markt)
+
+Improvements to Spanish translations. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: Updates to Chinese translations
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
commit 813c20f0016fbda538c27055ea67a6a92ddb0cc1
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:32:35 2022 +0100
Updates to Chinese translations
---
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 2 +-
webapps/docs/changelog.xml | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 35bdbb1a44..bb07331c14 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -86,7 +86,7 @@ pingManager.roundTripTime=连接[{0}]往返时间测量为[{1}]ns
stream.clientCancel=客户端在响应完成前重置了数据流
stream.closed=连接[{0}]，流[{1}]，一旦关闭就无法写入流
stream.header.case=连接[{0}]，流[{1}]，HTTP标头名称[{2}]必须小写
-stream.header.connection=HTTP/2请求中不允许连接[{0}]、流[{1}]、HTTP头[连接]
+stream.header.connection=HTTP/2请求中不允许连接[{0}]、流[{1}]、HTTP头[{2}]
stream.header.contentLength=连接[{0}]，流[{1}]，内容长度头值[{2}]与接收的数据大小[{3}]不一致
stream.header.debug=连接[{0}]，流[{1}]，HTTP标头[{2}]，值[{3}]
stream.header.duplicate=连接[{0}]，流[{1}]，收到多个[{2}]头
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index 1a9cc4434b..c4493d291b 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -128,8 +128,8 @@ wsWebSocketContainer.invalidStatus=来自服务器[{0}]的HTTP响应不允许HTT
wsWebSocketContainer.invalidSubProtocol=WebSocket服务器为Sec-WebSocket-Protocol标头返回了多个值
wsWebSocketContainer.maxBuffer=此实现将缓冲区的最大大小限制为Integer.MAX_VALUE
wsWebSocketContainer.missingAnnotation=无法使用POJO类[{0}]，因为它未添加注解@ClientEndpoint
+wsWebSocketContainer.missingAuthenticateHeader=无法处理HTTP响应代码[{0}]。 缺少 [{1}]
标头作为响应
wsWebSocketContainer.missingLocationHeader=处理HTTP响应码 [{0}] 失败。响应头缺少Location
-wsWebSocketContainer.missingWWWAuthenticateHeader=无法处理HTTP响应代码[{0}]。
缺少WWW-Authenticate标头作为响应
wsWebSocketContainer.pathNoHost=URI中未指定主机
wsWebSocketContainer.pathWrongScheme=不支持方案[{0}]。支持的方案是ws和wss
wsWebSocketContainer.proxyConnectFail=失败连接到已配置的代理 [{0}]。HTTP 响应码是 [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 37f01e46ec..1159612fdd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -154,6 +154,9 @@
Update Derby to 10.16.1.1. (markt)
+
+Improvements to Chinese translations. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/06: Improvements to Japanese translations.
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
commit bddc9bdba7057bbd22d31b27d3e2085c538215d9
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:39:39 2022 +0100
Improvements to Japanese translations.
Contributed by tak7iji and Shirayuking. (markt)
---
.../authenticator/LocalStrings_ja.properties | 16 +++---
.../catalina/connector/LocalStrings_ja.properties | 2 +-
.../catalina/core/LocalStrings_ja.properties | 4 +-
.../catalina/filters/LocalStrings_ja.properties| 2 +-
.../catalina/ha/session/LocalStrings_ja.properties | 64 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 4 +-
.../catalina/session/LocalStrings_ja.properties| 2 +-
.../catalina/startup/LocalStrings_ja.properties| 10 ++--
.../tribes/tipis/LocalStrings_ja.properties| 4 +-
.../transport/nio/LocalStrings_ja.properties | 4 +-
.../coyote/http11/LocalStrings_ja.properties | 1 +
.../jasper/resources/LocalStrings_ja.properties| 3 +-
.../tomcat/websocket/LocalStrings_ja.properties| 10 +++-
webapps/docs/changelog.xml | 4 ++
14 files changed, 70 insertions(+), 60 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index b2e510981e..d2fde48949 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -44,28 +44,28 @@ formAuthenticator.noErrorPage=コンテキスト [{0}] のFORM認証にエラー
formAuthenticator.noLoginPage=コンテキスト [{0}] のFORM認証にログインページが定義されていません
formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] ですが、FORM認証 は [{1}]
を期待していました
-singleSignOn.debug.associate=SSOはアプリケーションセッション[{1}]をSSOセッション[{0}]に関連付けます
+singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
-singleSignOn.debug.deregisterFail=キャッシュにないため、SSOセッション[{0}]の登録を解除できませんでした。
+singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
singleSignOn.debug.deregisterNone=SSOセッション[{0}]の登録を解除しましたが、関連付けられたアプリケーションセッションは見つかりませんでした。
singleSignOn.debug.hasPrincipal=SSOが以前に認証されたプリンシパル [{0}] を検出しました
singleSignOn.debug.invoke=SSO は [{0}] に対するリクエストを処理しています
singleSignOn.debug.principalCheck=SSO は SSO セッション [{0}] のキャッシュされたプリンシパルを探索しています
singleSignOn.debug.principalFound=SSO のキャッシュされたプリンシパル [{0}] を取得しました。認証タイプは
[{1}] です
-singleSignOn.debug.principalNotFound=SSOはキャッシュされたプリンシパルを検出しませんでした。セッション[{0}]のSSO
Cookieを消去しています。
-singleSignOn.debug.register=SSOは認証タイプ [{2}] のユーザー [{1}] のSSOセッション[{0}]を登録しています
-singleSignOn.debug.removeSession=SSOはSSOセッション[{1}]からアプリケーションセッション[{0}]を削除しています
+singleSignOn.debug.principalNotFound=SSO はキャッシュされたプリンシパルを検出しませんでした。セッション [{0}]
の SSO Cookie を消去しています
+singleSignOn.debug.register=SSO は認証タイプ [{2}] のユーザー [{1}] の SSO セッション [{0}]
を登録しています
+singleSignOn.debug.removeSession=SSOはSSOセッション [{1}] からアプリケーションセッション [{0}]
を削除しています
singleSignOn.debug.sessionLogout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]をログアウト処理しています
singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウトを処理しています
singleSignOn.debug.update=SSOはSSOセッション [{0}] を認証タイプ [{1}] に更新します
-singleSignOn.sessionExpire.contextNotFound=Contextが見つからないため、SSOはセッション[{0}]を破棄できません
+singleSignOn.sessionExpire.contextNotFound=Context が見つからないため、SSO はセッション [{0}]
を破棄できません
singleSignOn.sessionExpire.engineNull=Engine がNullだったため、SSOはセッション[{0}]を破棄できません。
singleSignOn.sessionExpire.hostNotFound=ホストが見つからないため SSO セッション [{0}] を破棄できません
-singleSignOn.sessionExpire.managerError=セッションを検索するときにManagerが例外をスローしたため、SSOはセッション[{0}]を破棄できません
-singleSignOn.sessionExpire.managerNotFound=Managerが見つからなかったので、SSOはセッション[{0}]を破棄できません。
+singleSignOn.sessionExpire.managerError=セッションを検索するときにマネージャが例外をスローしたため、SSOはセッション
[{0}] を破棄できません
+singleSignOn.sessionExpire.managerNotFound=マネージャが見つからなかったため、SSO はセッション [{0}]
を破棄できません
singleSignOn.sessionExpire.sessionNotFound=セッションが見つからないため、SSOはセッション[{0}]を破棄できません。
spnegoAuthenticator.authHeaderNoToken=クライアントから受信した Negoiate 認証ヘッダにはトークンがありません。
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index 38b42d1b57..be929a3fa9 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -71,7 +71,7 @@ coyoteResponse.reset.ise=レスポンスがコミットされた後でreset()を
coyoteResponse.resetBuffer.ise=レスポンスがコミットされた後でバッファをリセットすることはできません
coyoteResponse.sendError.ise=レスポンスがコミットされた後でsendError()を呼び出すことはできません
[tomcat] 03/06: Improvements to French translations. (remm)
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
commit 1ce30eb0a65a74c287d4e6eba07b269d607ac819
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:36:22 2022 +0100
Improvements to French translations. (remm)
---
java/org/apache/catalina/authenticator/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/http11/LocalStrings_fr.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_fr.properties | 4
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 2 +-
webapps/docs/changelog.xml| 3 +++
5 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index bccc9b06c2..6b17f0282a 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=Les seules valeurs
permises sont null, la cha
digestAuthenticator.cacheRemove=Une entrée valide du cache de nonce des
clients a été enlevée pour faire de la place pour de nouvelles entrées, ce qui
rend possible une attaque par répétition ; pour éviter cela, il est possible de
reduire nonceValidity ou d'augmenter nonceCacheSize ; les avertissements de ce
type ne se reproduiront pas avant 5 minutes
+formAuthenticator.changeSessionIdLogin=L''id de session a été changé avant de
forwarder vers la page de login lors de l''authentification FORM de [{0}] vers
[{1}]
formAuthenticator.forwardErrorFail=Erreur inattendue lors de la transmission à
la page d'erreur
formAuthenticator.forwardLogin=Transmission de la requête pour [{0}] faite
avec la méthode [{1}] à la page de connection [{2}] du contexte [{3}] en
utilisant la méthode GET
formAuthenticator.forwardLoginFail=Erreur inattendue lors de la transmission à
la page de connection
formAuthenticator.noErrorPage=Aucune page d''erreur n''a été définie pour la
méthode d''authentification FORM dans le contexte [{0}]
formAuthenticator.noLoginPage=Aucune page de connection n''a été définie pour
la méthode d''authentification FORM dans le contexte [{0}]
+formAuthenticator.sessionIdMismatch=L''id de session actuel est [{0}] mais
l''authentificateur FORM attendait [{1}]
singleSignOn.debug.associate=Association de la session [{1}] de l''application
avec la session SSO [{0}]
singleSignOn.debug.associateFail=Le SSO n''a pu associer la session [{0}] de
l''application car la session SSO [{1}] n''existe pas
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index bbf6464b8f..16453c4c91 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=La requête
contenait un en-têt
http11processor.request.prepare=Echec de préparation de la requête
http11processor.request.process=Erreur de traitement de la requête
http11processor.response.finish=Erreur en finissant la réponse
+http11processor.response.invalidHeader=L''en-tête de réponse HTTP [{0}] avec
la valeur [{1}] a été enlevé de la réponse car il est invalide
http11processor.sendfile.error=Erreur d'envoi des données avec sendfile, cela
peut être causé par des attributs de démarrage ou de fin incorrects dans la
requête
http11processor.socket.info=Exception pendant la requête d'information sur le
socket.
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 4f54e7221a..292e61e67a 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -97,6 +97,7 @@ stream.header.required=Connection [{0}], Flux [{1}], Un ou
plusieurs en-têtes n
stream.header.te=Connection [{0}], Flux [{1}], L''en-tête HTTP [te] n''est pas
autorisé avec la valeur [{2}] dans une requête HTTP/2
stream.header.unexpectedPseudoHeader=Connection [{0}], Flux [{1}], Le pseudo
en-tête [{2}] a été reçu après un en-tête normal
stream.header.unknownPseudoHeader=Connection [{0}], Flux [{1}], Un pseudo
en-tête inconnu [{2}] a été reçu
+stream.host.inconsistent=Connection [{0}], Stream [{1}], L''en tête hôte [{2}]
est inconsistant avec les valeurs fournies précédemment pour l''hôte [{3}]
et/ou le port [{4}]
stream.inputBuffer.copy=Copide de [{0}] octets depuis inBuffer vers outBuffer
stream.inputBuffer.dispatch=Des données on été ajoutées dans inBuffer alors
que la lecture est surveillée, envoi d'un évènement de lecture
stream.inputBuffer.empty=Le tampon d'entrée du flux est vide, attente de
données
@@ -128,6 +129,8 @@ upgradeHandler.allocate.left
[tomcat] branch 10.0.x updated: Back port translation updates
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 37a2908463 Back port translation updates
37a2908463 is described below
commit 37a29084630c699644672aeed2ca2835eeef4caf
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:48:11 2022 +0100
Back port translation updates
---
.../authenticator/LocalStrings_fr.properties | 2 +
.../authenticator/LocalStrings_ja.properties | 16 +++---
.../catalina/connector/LocalStrings_ja.properties | 2 +-
.../catalina/core/LocalStrings_ja.properties | 4 +-
.../catalina/filters/LocalStrings_ja.properties| 2 +-
.../catalina/ha/session/LocalStrings_ja.properties | 64 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 4 +-
.../catalina/session/LocalStrings_ja.properties| 2 +-
.../catalina/startup/LocalStrings_ja.properties| 10 ++--
.../tribes/tipis/LocalStrings_ja.properties| 4 +-
.../transport/nio/LocalStrings_ja.properties | 4 +-
.../apache/coyote/http2/LocalStrings_fr.properties | 4 ++
.../coyote/http2/LocalStrings_zh_CN.properties | 2 +-
.../jasper/resources/LocalStrings_ja.properties| 3 +-
.../tomcat/websocket/LocalStrings_cs.properties| 2 +-
.../tomcat/websocket/LocalStrings_es.properties| 2 +-
.../tomcat/websocket/LocalStrings_fr.properties| 2 +-
.../tomcat/websocket/LocalStrings_ja.properties| 10 +++-
.../tomcat/websocket/LocalStrings_ko.properties| 2 +-
.../tomcat/websocket/LocalStrings_zh_CN.properties | 2 +-
webapps/docs/changelog.xml | 19 +++
21 files changed, 96 insertions(+), 66 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index bccc9b06c2..6b17f0282a 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=Les seules valeurs
permises sont null, la cha
digestAuthenticator.cacheRemove=Une entrée valide du cache de nonce des
clients a été enlevée pour faire de la place pour de nouvelles entrées, ce qui
rend possible une attaque par répétition ; pour éviter cela, il est possible de
reduire nonceValidity ou d'augmenter nonceCacheSize ; les avertissements de ce
type ne se reproduiront pas avant 5 minutes
+formAuthenticator.changeSessionIdLogin=L''id de session a été changé avant de
forwarder vers la page de login lors de l''authentification FORM de [{0}] vers
[{1}]
formAuthenticator.forwardErrorFail=Erreur inattendue lors de la transmission à
la page d'erreur
formAuthenticator.forwardLogin=Transmission de la requête pour [{0}] faite
avec la méthode [{1}] à la page de connection [{2}] du contexte [{3}] en
utilisant la méthode GET
formAuthenticator.forwardLoginFail=Erreur inattendue lors de la transmission à
la page de connection
formAuthenticator.noErrorPage=Aucune page d''erreur n''a été définie pour la
méthode d''authentification FORM dans le contexte [{0}]
formAuthenticator.noLoginPage=Aucune page de connection n''a été définie pour
la méthode d''authentification FORM dans le contexte [{0}]
+formAuthenticator.sessionIdMismatch=L''id de session actuel est [{0}] mais
l''authentificateur FORM attendait [{1}]
singleSignOn.debug.associate=Association de la session [{1}] de l''application
avec la session SSO [{0}]
singleSignOn.debug.associateFail=Le SSO n''a pu associer la session [{0}] de
l''application car la session SSO [{1}] n''existe pas
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index b2e510981e..d2fde48949 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -44,28 +44,28 @@ formAuthenticator.noErrorPage=コンテキスト [{0}] のFORM認証にエラー
formAuthenticator.noLoginPage=コンテキスト [{0}] のFORM認証にログインページが定義されていません
formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] ですが、FORM認証 は [{1}]
を期待していました
-singleSignOn.debug.associate=SSOはアプリケーションセッション[{1}]をSSOセッション[{0}]に関連付けます
+singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
-singleSignOn.debug.deregisterFail=キャッシュにないため、SSOセッション[{0}]の登録を解除できませんでした。
+singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
singleSignOn.debug.deregisterNone=SSOセッション[{0}]の登録を解除しま
[tomcat] branch 9.0.x updated: Back port translation updates
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 6ce78baabf Back port translation updates
6ce78baabf is described below
commit 6ce78baabf2f4c8c97c7ffc5d3ec0ea56e59b4fa
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:51:38 2022 +0100
Back port translation updates
---
.../authenticator/LocalStrings_fr.properties | 2 +
.../authenticator/LocalStrings_ja.properties | 16 +++---
.../catalina/connector/LocalStrings_ja.properties | 2 +-
.../catalina/core/LocalStrings_ja.properties | 4 +-
.../catalina/filters/LocalStrings_ja.properties| 2 +-
.../catalina/ha/session/LocalStrings_ja.properties | 64 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 4 +-
.../catalina/session/LocalStrings_ja.properties| 2 +-
.../catalina/startup/LocalStrings_ja.properties| 10 ++--
.../tribes/tipis/LocalStrings_ja.properties| 4 +-
.../transport/nio/LocalStrings_ja.properties | 4 +-
.../apache/coyote/http2/LocalStrings_fr.properties | 4 ++
.../coyote/http2/LocalStrings_zh_CN.properties | 2 +-
.../jasper/resources/LocalStrings_ja.properties| 3 +-
.../tomcat/websocket/LocalStrings_cs.properties| 2 +-
.../tomcat/websocket/LocalStrings_es.properties| 2 +-
.../tomcat/websocket/LocalStrings_fr.properties| 2 +-
.../tomcat/websocket/LocalStrings_ja.properties| 10 +++-
.../tomcat/websocket/LocalStrings_ko.properties| 2 +-
.../tomcat/websocket/LocalStrings_zh_CN.properties | 2 +-
webapps/docs/changelog.xml | 19 +++
21 files changed, 96 insertions(+), 66 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index bccc9b06c2..6b17f0282a 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=Les seules valeurs
permises sont null, la cha
digestAuthenticator.cacheRemove=Une entrée valide du cache de nonce des
clients a été enlevée pour faire de la place pour de nouvelles entrées, ce qui
rend possible une attaque par répétition ; pour éviter cela, il est possible de
reduire nonceValidity ou d'augmenter nonceCacheSize ; les avertissements de ce
type ne se reproduiront pas avant 5 minutes
+formAuthenticator.changeSessionIdLogin=L''id de session a été changé avant de
forwarder vers la page de login lors de l''authentification FORM de [{0}] vers
[{1}]
formAuthenticator.forwardErrorFail=Erreur inattendue lors de la transmission à
la page d'erreur
formAuthenticator.forwardLogin=Transmission de la requête pour [{0}] faite
avec la méthode [{1}] à la page de connection [{2}] du contexte [{3}] en
utilisant la méthode GET
formAuthenticator.forwardLoginFail=Erreur inattendue lors de la transmission à
la page de connection
formAuthenticator.noErrorPage=Aucune page d''erreur n''a été définie pour la
méthode d''authentification FORM dans le contexte [{0}]
formAuthenticator.noLoginPage=Aucune page de connection n''a été définie pour
la méthode d''authentification FORM dans le contexte [{0}]
+formAuthenticator.sessionIdMismatch=L''id de session actuel est [{0}] mais
l''authentificateur FORM attendait [{1}]
singleSignOn.debug.associate=Association de la session [{1}] de l''application
avec la session SSO [{0}]
singleSignOn.debug.associateFail=Le SSO n''a pu associer la session [{0}] de
l''application car la session SSO [{1}] n''existe pas
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index b2e510981e..d2fde48949 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -44,28 +44,28 @@ formAuthenticator.noErrorPage=コンテキスト [{0}] のFORM認証にエラー
formAuthenticator.noLoginPage=コンテキスト [{0}] のFORM認証にログインページが定義されていません
formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] ですが、FORM認証 は [{1}]
を期待していました
-singleSignOn.debug.associate=SSOはアプリケーションセッション[{1}]をSSOセッション[{0}]に関連付けます
+singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
-singleSignOn.debug.deregisterFail=キャッシュにないため、SSOセッション[{0}]の登録を解除できませんでした。
+singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
singleSignOn.debug.deregisterNone=SSOセッション[{0}]の登録を解除しました
[tomcat] branch 8.5.x updated: Back port translation updates
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 9d38338cd0 Back port translation updates
9d38338cd0 is described below
commit 9d38338cd0ba283c9770fdd8bba9f97d5c427fad
Author: Mark Thomas
AuthorDate: Fri Sep 30 13:55:02 2022 +0100
Back port translation updates
---
.../authenticator/LocalStrings_fr.properties | 2 +
.../authenticator/LocalStrings_ja.properties | 16 +++---
.../catalina/connector/LocalStrings_ja.properties | 2 +-
.../catalina/core/LocalStrings_ja.properties | 4 +-
.../catalina/filters/LocalStrings_ja.properties| 2 +-
.../catalina/ha/session/LocalStrings_ja.properties | 64 +++---
.../catalina/ha/tcp/LocalStrings_ja.properties | 4 +-
.../catalina/session/LocalStrings_ja.properties| 2 +-
.../catalina/startup/LocalStrings_ja.properties| 6 +-
.../tribes/tipis/LocalStrings_ja.properties| 4 +-
.../transport/nio/LocalStrings_ja.properties | 4 +-
.../apache/coyote/http2/LocalStrings_fr.properties | 4 ++
.../coyote/http2/LocalStrings_zh_CN.properties | 2 +-
.../jasper/resources/LocalStrings_ja.properties| 3 +-
.../tomcat/websocket/LocalStrings_es.properties| 2 +-
.../tomcat/websocket/LocalStrings_fr.properties| 2 +-
.../tomcat/websocket/LocalStrings_ja.properties| 10 +++-
.../tomcat/websocket/LocalStrings_ko.properties| 2 +-
.../tomcat/websocket/LocalStrings_zh_CN.properties | 2 +-
webapps/docs/changelog.xml | 3 +
20 files changed, 77 insertions(+), 63 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index bccc9b06c2..6b17f0282a 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=Les seules valeurs
permises sont null, la cha
digestAuthenticator.cacheRemove=Une entrée valide du cache de nonce des
clients a été enlevée pour faire de la place pour de nouvelles entrées, ce qui
rend possible une attaque par répétition ; pour éviter cela, il est possible de
reduire nonceValidity ou d'augmenter nonceCacheSize ; les avertissements de ce
type ne se reproduiront pas avant 5 minutes
+formAuthenticator.changeSessionIdLogin=L''id de session a été changé avant de
forwarder vers la page de login lors de l''authentification FORM de [{0}] vers
[{1}]
formAuthenticator.forwardErrorFail=Erreur inattendue lors de la transmission à
la page d'erreur
formAuthenticator.forwardLogin=Transmission de la requête pour [{0}] faite
avec la méthode [{1}] à la page de connection [{2}] du contexte [{3}] en
utilisant la méthode GET
formAuthenticator.forwardLoginFail=Erreur inattendue lors de la transmission à
la page de connection
formAuthenticator.noErrorPage=Aucune page d''erreur n''a été définie pour la
méthode d''authentification FORM dans le contexte [{0}]
formAuthenticator.noLoginPage=Aucune page de connection n''a été définie pour
la méthode d''authentification FORM dans le contexte [{0}]
+formAuthenticator.sessionIdMismatch=L''id de session actuel est [{0}] mais
l''authentificateur FORM attendait [{1}]
singleSignOn.debug.associate=Association de la session [{1}] de l''application
avec la session SSO [{0}]
singleSignOn.debug.associateFail=Le SSO n''a pu associer la session [{0}] de
l''application car la session SSO [{1}] n''existe pas
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index b2e510981e..d2fde48949 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -44,28 +44,28 @@ formAuthenticator.noErrorPage=コンテキスト [{0}] のFORM認証にエラー
formAuthenticator.noLoginPage=コンテキスト [{0}] のFORM認証にログインページが定義されていません
formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] ですが、FORM認証 は [{1}]
を期待していました
-singleSignOn.debug.associate=SSOはアプリケーションセッション[{1}]をSSOセッション[{0}]に関連付けます
+singleSignOn.debug.associate=SSO はアプリケーションセッション [{1}] を SSO セッション [{0}] に関連付けます
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
-singleSignOn.debug.deregisterFail=キャッシュにないため、SSOセッション[{0}]の登録を解除できませんでした。
+singleSignOn.debug.deregisterFail=キャッシュにないため、SSO セッション [{0}] の登録を解除できませんでした
singleSignOn.debug.deregisterNone=SSOセッション[{0}]の登録を解除しましたが、関連付けられたアプリケーションセッションは見つかりませんでした。
singleSignOn.debug.hasPrincipal=
[tomcat] branch 10.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 2558fa4d0e Fix typo
2558fa4d0e is described below
commit 2558fa4d0e951f6cdb768cd87832e44c45a67f5c
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 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 8.5.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 16b1bd46ce Fix typo
16b1bd46ce is described below
commit 16b1bd46ce8e05fe59aed9a737e9beb38302d9d0
Author: Mark Thomas
AuthorDate: Fri Sep 30 14:30:24 2022 +0100
Fix typo
---
test/org/apache/coyote/http2/TestHttpServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestHttpServlet.java
b/test/org/apache/coyote/http2/TestHttpServlet.java
index 99209b5405..cb98abd23a 100644
--- a/test/org/apache/coyote/http2/TestHttpServlet.java
+++ b/test/org/apache/coyote/http2/TestHttpServlet.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
import org.junit.Test;
/*
- * Implement here rather than jakarta.servlet.http.TestHttpServley because it
+ * Implement here rather than jakarta.servlet.http.TestHttpServlet because it
* needs access to package private classes.
*/
public class TestHttpServlet extends Http2TestBase {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3302769bee Fix typo
3302769bee is described below
commit 3302769bee8a44a14474619a19bf65eb631bbe7e
Author: Mark Thomas
AuthorDate: Fri Sep 30 14:30:24 2022 +0100
Fix typo
---
test/org/apache/coyote/http2/TestHttpServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestHttpServlet.java
b/test/org/apache/coyote/http2/TestHttpServlet.java
index 99209b5405..cb98abd23a 100644
--- a/test/org/apache/coyote/http2/TestHttpServlet.java
+++ b/test/org/apache/coyote/http2/TestHttpServlet.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
import org.junit.Test;
/*
- * Implement here rather than jakarta.servlet.http.TestHttpServley because it
+ * Implement here rather than jakarta.servlet.http.TestHttpServlet because it
* needs access to package private classes.
*/
public class TestHttpServlet extends Http2TestBase {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66289] New: JSP page with relative path is not found, resulting in Jasper exception
https://bz.apache.org/bugzilla/show_bug.cgi?id=66289 Bug ID: 66289 Summary: JSP page with relative path is not found, resulting in Jasper exception Product: Tomcat 9 Version: 9.0.67 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: sorlov...@commure.com Target Milestone: - The application is not deployed into webapps folder. Instead docBase property is specified in catalina/localhost/root.xml file. The application has 2 pages: - \parent.jsp - \framework\child.jspf The parent references child page in it's code: <%@ include file="framework/child.jspf"%> The tomcat 9.0.67 throws HTTP error 500 because it can't find child.jspf. however, if the syntax is changed to <%@ include file="/framework/child.jspf"%> then Tomcat 9.0.67 is ok. Tomcat 9.0.65 is ok with relative path -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66289] JSP page with relative path is not found, resulting in Jasper exception
https://bz.apache.org/bugzilla/show_bug.cgi?id=66289 --- Comment #1 from Sergey --- Created attachment 38398 --> https://bz.apache.org/bugzilla/attachment.cgi?id=38398&action=edit Jasper Exception -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66289] JSP page with relative path is not found, resulting in Jasper exception
https://bz.apache.org/bugzilla/show_bug.cgi?id=66289 Sergey changed: What|Removed |Added OS||All -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66277] The taglib file cannot be found with version 9.0.67
https://bz.apache.org/bugzilla/show_bug.cgi?id=66277 Mark Thomas changed: What|Removed |Added CC||sorlov...@commure.com --- Comment #2 from Mark Thomas --- *** Bug 66289 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66289] JSP page with relative path is not found, resulting in Jasper exception
https://bz.apache.org/bugzilla/show_bug.cgi?id=66289 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #2 from Mark Thomas --- *** This bug has been marked as a duplicate of bug 66277 *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Refactor to remove unnecessary parameter
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
commit 795dfa4aff3ecac8bf682e6c3bfb6eab5cc0cd2a
Author: Mark Thomas
AuthorDate: Fri Sep 30 18:14:40 2022 +0100
Refactor to remove unnecessary parameter
---
java/org/apache/coyote/http2/Http2Parser.java | 18 ++
.../apache/coyote/http2/Http2UpgradeHandler.java | 2 +-
.../servlet/http/HttpServletDoHeadBaseTest.java| 8 +--
test/org/apache/coyote/http2/Http2TestBase.java| 30 +-
test/org/apache/coyote/http2/TestAsync.java| 8 +--
test/org/apache/coyote/http2/TestAsyncFlush.java | 4 +-
test/org/apache/coyote/http2/TestAsyncTimeout.java | 4 +-
.../apache/coyote/http2/TestCancelledUpload.java | 8 +--
test/org/apache/coyote/http2/TestFlowControl.java | 8 +--
test/org/apache/coyote/http2/TestHttp2Limits.java | 30 +-
.../apache/coyote/http2/TestHttp2Section_3_2.java | 6 +-
.../apache/coyote/http2/TestHttp2Section_3_5.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_4_2.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_4_3.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_5_1.java | 70 +++---
.../apache/coyote/http2/TestHttp2Section_5_2.java | 10 ++--
.../apache/coyote/http2/TestHttp2Section_5_3.java | 22 +++
.../apache/coyote/http2/TestHttp2Section_5_5.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_6_3.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_4.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_5.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_6.java | 10 ++--
.../apache/coyote/http2/TestHttp2Section_6_7.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_6_8.java | 8 +--
.../apache/coyote/http2/TestHttp2Section_6_9.java | 38 ++--
.../apache/coyote/http2/TestHttp2Section_8_1.java | 32 +-
.../org/apache/coyote/http2/TestHttp2Timeouts.java | 20 +++
.../coyote/http2/TestHttp2UpgradeHandler.java | 16 ++---
test/org/apache/coyote/http2/TestHttpServlet.java | 4 +-
test/org/apache/coyote/http2/TestStream.java | 6 +-
.../apache/coyote/http2/TestStreamProcessor.java | 14 ++---
.../apache/coyote/http2/TestStreamQueryString.java | 10 ++--
.../org/apache/coyote/http2/TesterHttp2Parser.java | 11 +++-
33 files changed, 223 insertions(+), 198 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index c03a17a5e9..72c30532e1 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -66,12 +66,30 @@ class Http2Parser {
* false
*
* @throws IOException If an IO error occurs while trying to read a frame
+ *
+ * @deprecated Unused. Will be removed in Tomcat 11 onwards.
*/
+@Deprecated
boolean readFrame(boolean block) throws Http2Exception, IOException {
return readFrame(block, null);
}
+/**
+ * Read and process a single frame. The initial read is non-blocking to
+ * determine if a frame is present. Once the start of a frame is read, the
+ * remainder will be read using blocking IO.
+ *
+ * @return true if a frame was read otherwise
+ * false
+ *
+ * @throws IOException If an IO error occurs while trying to read a frame
+ */
+boolean readFrame() throws Http2Exception, IOException {
+return readFrame(false, null);
+}
+
+
protected boolean readFrame(boolean block, FrameType expected)
throws IOException, Http2Exception {
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index f093b2ad38..4073411e25 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -355,7 +355,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
setConnectionTimeout(-1);
while (true) {
try {
-if (!parser.readFrame(false)) {
+if (!parser.readFrame()) {
break;
}
} catch (StreamException se) {
diff --git a/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
b/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
index 3de57243ba..21a962d48d 100644
--- a/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
+++ b/test/jakarta/servlet/http/HttpServletDoHeadBaseTest.java
@@ -128,11 +128,11 @@ public class HttpServletDoHeadBaseTest extends
Http2TestBase {
writeFrame(frameHeaderGet, headersPayloadGet);
// Want the headers frame for stream 3
-parser.readFrame(true);
+parser.readFram
[tomcat] 02/02: BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
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
commit 8a762896a7f6c8f7870322651e7bf1cb53abb8d8
Author: Mark Thomas
AuthorDate: Fri Sep 30 18:17:14 2022 +0100
BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
Tiemouts may appear as client disconnections
https://bz.apache.org/bugzilla/show_bug.cgi?id=66281
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 18 ++
webapps/docs/changelog.xml| 4
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 4073411e25..e5f8d73a00 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -267,6 +267,10 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
log.debug(sm.getString("upgradeHandler.prefaceReceived",
connectionId));
}
+// Allow streams and connection to determine timeouts
+socketWrapper.setReadTimeout(-1);
+socketWrapper.setWriteTimeout(-1);
+
processConnection(webConnection, stream);
}
@@ -348,10 +352,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
socketWrapper.getLock().unlock();
}
try {
-// There is data to read so use the read timeout while
-// reading frames ...
-socketWrapper.setReadTimeout(protocol.getReadTimeout());
-// ... and disable the connection timeout
+// Disable the connection timeout while frames are
processed
setConnectionTimeout(-1);
while (true) {
try {
@@ -1528,6 +1529,15 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
int thisRead = 0;
while (len > 0) {
+// Blocking reads use the protocol level read timeout. Non-blocking
+// reads do not timeout. The intention is that once a frame has
+// started to be read, the read timeout applies until it is
+// completely read.
+if (nextReadBlock) {
+socketWrapper.setReadTimeout(protocol.getReadTimeout());
+} else {
+socketWrapper.setReadTimeout(-1);
+}
thisRead = socketWrapper.read(nextReadBlock, data, pos, len);
if (thisRead == 0) {
if (nextReadBlock) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e7b4a6868e..dc92160c4c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
66276: Fix incorrect class cast when adding
a descendant of HTTP/2 streams. (lihan)
+
+66281: Fix unexpected timeouts that may appear as client
+disconnections when using HTTP/2 and NIO2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (b504f28ea6 -> 8a762896a7)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from b504f28ea6 Fix typo new 795dfa4aff Refactor to remove unnecessary parameter new 8a762896a7 BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/coyote/http2/Http2Parser.java | 18 ++ .../apache/coyote/http2/Http2UpgradeHandler.java | 20 +-- .../servlet/http/HttpServletDoHeadBaseTest.java| 8 +-- test/org/apache/coyote/http2/Http2TestBase.java| 30 +- test/org/apache/coyote/http2/TestAsync.java| 8 +-- test/org/apache/coyote/http2/TestAsyncFlush.java | 4 +- test/org/apache/coyote/http2/TestAsyncTimeout.java | 4 +- .../apache/coyote/http2/TestCancelledUpload.java | 8 +-- test/org/apache/coyote/http2/TestFlowControl.java | 8 +-- test/org/apache/coyote/http2/TestHttp2Limits.java | 30 +- .../apache/coyote/http2/TestHttp2Section_3_2.java | 6 +- .../apache/coyote/http2/TestHttp2Section_3_5.java | 4 +- .../apache/coyote/http2/TestHttp2Section_4_2.java | 2 +- .../apache/coyote/http2/TestHttp2Section_4_3.java | 4 +- .../apache/coyote/http2/TestHttp2Section_5_1.java | 70 +++--- .../apache/coyote/http2/TestHttp2Section_5_2.java | 10 ++-- .../apache/coyote/http2/TestHttp2Section_5_3.java | 22 +++ .../apache/coyote/http2/TestHttp2Section_5_5.java | 4 +- .../apache/coyote/http2/TestHttp2Section_6_3.java | 2 +- .../apache/coyote/http2/TestHttp2Section_6_4.java | 2 +- .../apache/coyote/http2/TestHttp2Section_6_5.java | 2 +- .../apache/coyote/http2/TestHttp2Section_6_6.java | 10 ++-- .../apache/coyote/http2/TestHttp2Section_6_7.java | 4 +- .../apache/coyote/http2/TestHttp2Section_6_8.java | 8 +-- .../apache/coyote/http2/TestHttp2Section_6_9.java | 38 ++-- .../apache/coyote/http2/TestHttp2Section_8_1.java | 32 +- .../org/apache/coyote/http2/TestHttp2Timeouts.java | 20 +++ .../coyote/http2/TestHttp2UpgradeHandler.java | 16 ++--- test/org/apache/coyote/http2/TestHttpServlet.java | 4 +- test/org/apache/coyote/http2/TestStream.java | 6 +- .../apache/coyote/http2/TestStreamProcessor.java | 14 ++--- .../apache/coyote/http2/TestStreamQueryString.java | 10 ++-- .../org/apache/coyote/http2/TesterHttp2Parser.java | 11 +++- webapps/docs/changelog.xml | 4 ++ 34 files changed, 241 insertions(+), 202 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Refactor to remove unnecessary parameter
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new ac42b133d6 Refactor to remove unnecessary parameter
ac42b133d6 is described below
commit ac42b133d6c33d3c72a0fc0cf2ba0243501b465d
Author: Mark Thomas
AuthorDate: Fri Sep 30 18:14:40 2022 +0100
Refactor to remove unnecessary parameter
---
java/org/apache/coyote/http2/Http2Parser.java | 18 ++
.../apache/coyote/http2/Http2UpgradeHandler.java | 2 +-
test/org/apache/coyote/http2/Http2TestBase.java| 30 +-
test/org/apache/coyote/http2/TestAsync.java| 8 +--
test/org/apache/coyote/http2/TestAsyncFlush.java | 4 +-
test/org/apache/coyote/http2/TestAsyncTimeout.java | 4 +-
.../apache/coyote/http2/TestCancelledUpload.java | 8 +--
test/org/apache/coyote/http2/TestFlowControl.java | 8 +--
test/org/apache/coyote/http2/TestHttp2Limits.java | 30 +-
.../apache/coyote/http2/TestHttp2Section_3_2.java | 6 +-
.../apache/coyote/http2/TestHttp2Section_3_5.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_4_2.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_4_3.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_5_1.java | 70 +++---
.../apache/coyote/http2/TestHttp2Section_5_2.java | 10 ++--
.../apache/coyote/http2/TestHttp2Section_5_3.java | 22 +++
.../apache/coyote/http2/TestHttp2Section_5_5.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_6_3.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_4.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_5.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_6.java | 10 ++--
.../apache/coyote/http2/TestHttp2Section_6_7.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_6_8.java | 8 +--
.../apache/coyote/http2/TestHttp2Section_6_9.java | 38 ++--
.../apache/coyote/http2/TestHttp2Section_8_1.java | 32 +-
.../org/apache/coyote/http2/TestHttp2Timeouts.java | 20 +++
.../coyote/http2/TestHttp2UpgradeHandler.java | 16 ++---
test/org/apache/coyote/http2/TestHttpServlet.java | 4 +-
test/org/apache/coyote/http2/TestStream.java | 6 +-
.../apache/coyote/http2/TestStreamProcessor.java | 14 ++---
.../apache/coyote/http2/TestStreamQueryString.java | 10 ++--
.../org/apache/coyote/http2/TesterHttp2Parser.java | 11 +++-
32 files changed, 219 insertions(+), 194 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index c03a17a5e9..72c30532e1 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -66,12 +66,30 @@ class Http2Parser {
* false
*
* @throws IOException If an IO error occurs while trying to read a frame
+ *
+ * @deprecated Unused. Will be removed in Tomcat 11 onwards.
*/
+@Deprecated
boolean readFrame(boolean block) throws Http2Exception, IOException {
return readFrame(block, null);
}
+/**
+ * Read and process a single frame. The initial read is non-blocking to
+ * determine if a frame is present. Once the start of a frame is read, the
+ * remainder will be read using blocking IO.
+ *
+ * @return true if a frame was read otherwise
+ * false
+ *
+ * @throws IOException If an IO error occurs while trying to read a frame
+ */
+boolean readFrame() throws Http2Exception, IOException {
+return readFrame(false, null);
+}
+
+
protected boolean readFrame(boolean block, FrameType expected)
throws IOException, Http2Exception {
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 068677905e..602fa0232c 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -350,7 +350,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
setConnectionTimeout(-1);
while (true) {
try {
-if (!parser.readFrame(false)) {
+if (!parser.readFrame()) {
break;
}
} catch (StreamException se) {
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java
b/test/org/apache/coyote/http2/Http2TestBase.java
index b80a8955e2..61b1e419bc 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -156,11 +156,11 @@ public abstract class Http2TestBase extends
TomcatBaseTest {
// - ping
// - headers (for response)
// - data (for response body)
-parser.re
[tomcat] branch 9.0.x updated: Refactor to remove unnecessary parameter
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new b2a58565a5 Refactor to remove unnecessary parameter
b2a58565a5 is described below
commit b2a58565a5d518955f6783a1b8472ae4d729ac16
Author: Mark Thomas
AuthorDate: Fri Sep 30 18:14:40 2022 +0100
Refactor to remove unnecessary parameter
---
java/org/apache/coyote/http2/Http2Parser.java | 18 ++
.../apache/coyote/http2/Http2UpgradeHandler.java | 2 +-
test/org/apache/coyote/http2/Http2TestBase.java| 30 +-
test/org/apache/coyote/http2/TestAsync.java| 8 +--
test/org/apache/coyote/http2/TestAsyncFlush.java | 4 +-
test/org/apache/coyote/http2/TestAsyncTimeout.java | 4 +-
.../apache/coyote/http2/TestCancelledUpload.java | 8 +--
test/org/apache/coyote/http2/TestFlowControl.java | 8 +--
test/org/apache/coyote/http2/TestHttp2Limits.java | 30 +-
.../apache/coyote/http2/TestHttp2Section_3_2.java | 6 +-
.../apache/coyote/http2/TestHttp2Section_3_5.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_4_2.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_4_3.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_5_1.java | 70 +++---
.../apache/coyote/http2/TestHttp2Section_5_2.java | 10 ++--
.../apache/coyote/http2/TestHttp2Section_5_3.java | 22 +++
.../apache/coyote/http2/TestHttp2Section_5_5.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_6_3.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_4.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_5.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_6.java | 10 ++--
.../apache/coyote/http2/TestHttp2Section_6_7.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_6_8.java | 8 +--
.../apache/coyote/http2/TestHttp2Section_6_9.java | 38 ++--
.../apache/coyote/http2/TestHttp2Section_8_1.java | 32 +-
.../org/apache/coyote/http2/TestHttp2Timeouts.java | 20 +++
.../coyote/http2/TestHttp2UpgradeHandler.java | 16 ++---
test/org/apache/coyote/http2/TestHttpServlet.java | 4 +-
test/org/apache/coyote/http2/TestStream.java | 6 +-
.../apache/coyote/http2/TestStreamProcessor.java | 14 ++---
.../apache/coyote/http2/TestStreamQueryString.java | 10 ++--
.../org/apache/coyote/http2/TesterHttp2Parser.java | 11 +++-
32 files changed, 219 insertions(+), 194 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index 868e4fe379..f7997f3d96 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -66,12 +66,30 @@ class Http2Parser {
* false
*
* @throws IOException If an IO error occurs while trying to read a frame
+ *
+ * @deprecated Unused. Will be removed in Tomcat 11 onwards.
*/
+@Deprecated
boolean readFrame(boolean block) throws Http2Exception, IOException {
return readFrame(block, null);
}
+/**
+ * Read and process a single frame. The initial read is non-blocking to
+ * determine if a frame is present. Once the start of a frame is read, the
+ * remainder will be read using blocking IO.
+ *
+ * @return true if a frame was read otherwise
+ * false
+ *
+ * @throws IOException If an IO error occurs while trying to read a frame
+ */
+boolean readFrame() throws Http2Exception, IOException {
+return readFrame(false, null);
+}
+
+
protected boolean readFrame(boolean block, FrameType expected)
throws IOException, Http2Exception {
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 48ed2f00b1..f82294c01a 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -350,7 +350,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
setConnectionTimeout(-1);
while (true) {
try {
-if (!parser.readFrame(false)) {
+if (!parser.readFrame()) {
break;
}
} catch (StreamException se) {
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java
b/test/org/apache/coyote/http2/Http2TestBase.java
index 82f3130907..66f178b208 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -154,11 +154,11 @@ public abstract class Http2TestBase extends
TomcatBaseTest {
// - ping
// - headers (for response)
// - data (for response body)
-parser.read
[tomcat] branch 8.5.x updated: Refactor to remove unnecessary parameter
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new a0fd011eb2 Refactor to remove unnecessary parameter
a0fd011eb2 is described below
commit a0fd011eb236aaf9752384161683d44476028304
Author: Mark Thomas
AuthorDate: Fri Sep 30 18:14:40 2022 +0100
Refactor to remove unnecessary parameter
---
java/org/apache/coyote/http2/Http2Parser.java | 18 ++
.../apache/coyote/http2/Http2UpgradeHandler.java | 2 +-
test/org/apache/coyote/http2/Http2TestBase.java| 30 +-
test/org/apache/coyote/http2/TestAsync.java| 8 +--
test/org/apache/coyote/http2/TestAsyncFlush.java | 4 +-
test/org/apache/coyote/http2/TestAsyncTimeout.java | 4 +-
.../apache/coyote/http2/TestCancelledUpload.java | 8 +--
test/org/apache/coyote/http2/TestFlowControl.java | 8 +--
test/org/apache/coyote/http2/TestHttp2Limits.java | 30 +-
.../apache/coyote/http2/TestHttp2Section_3_2.java | 6 +-
.../apache/coyote/http2/TestHttp2Section_3_5.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_4_2.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_4_3.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_5_1.java | 70 +++---
.../apache/coyote/http2/TestHttp2Section_5_2.java | 10 ++--
.../apache/coyote/http2/TestHttp2Section_5_3.java | 22 +++
.../apache/coyote/http2/TestHttp2Section_5_5.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_6_3.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_4.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_5.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_6_6.java | 10 ++--
.../apache/coyote/http2/TestHttp2Section_6_7.java | 4 +-
.../apache/coyote/http2/TestHttp2Section_6_8.java | 8 +--
.../apache/coyote/http2/TestHttp2Section_6_9.java | 38 ++--
.../apache/coyote/http2/TestHttp2Section_8_1.java | 32 +-
.../org/apache/coyote/http2/TestHttp2Timeouts.java | 20 +++
.../coyote/http2/TestHttp2UpgradeHandler.java | 16 ++---
test/org/apache/coyote/http2/TestHttpServlet.java | 4 +-
.../apache/coyote/http2/TestStreamProcessor.java | 14 ++---
.../apache/coyote/http2/TestStreamQueryString.java | 10 ++--
.../org/apache/coyote/http2/TesterHttp2Parser.java | 11 +++-
31 files changed, 216 insertions(+), 191 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index 97bd0d4ed7..e7d824bfac 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -64,12 +64,30 @@ class Http2Parser {
* false
*
* @throws IOException If an IO error occurs while trying to read a frame
+ *
+ * @deprecated Unused. Will be removed in Tomcat 11 onwards.
*/
+@Deprecated
boolean readFrame(boolean block) throws Http2Exception, IOException {
return readFrame(block, null);
}
+/**
+ * Read and process a single frame. The initial read is non-blocking to
+ * determine if a frame is present. Once the start of a frame is read, the
+ * remainder will be read using blocking IO.
+ *
+ * @return true if a frame was read otherwise
+ * false
+ *
+ * @throws IOException If an IO error occurs while trying to read a frame
+ */
+boolean readFrame() throws Http2Exception, IOException {
+return readFrame(false, null);
+}
+
+
private boolean readFrame(boolean block, FrameType expected)
throws IOException, Http2Exception {
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index e9651c510e..80f91b296b 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -344,7 +344,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
setConnectionTimeout(-1);
while (true) {
try {
-if (!parser.readFrame(false)) {
+if (!parser.readFrame()) {
break;
}
} catch (StreamException se) {
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java
b/test/org/apache/coyote/http2/Http2TestBase.java
index ce8c77c0f2..05b7992b05 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -134,11 +134,11 @@ public abstract class Http2TestBase extends
TomcatBaseTest {
// - ping
// - headers (for response)
// - data (for response body)
-parser.readFrame(true);
-parser.readFrame(true);
-parser.
[tomcat] branch 10.0.x updated: BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 5de2da1232 BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
5de2da1232 is described below
commit 5de2da123206e76e2e3c13199811f544721307a1
Author: Mark Thomas
AuthorDate: Fri Sep 30 18:17:14 2022 +0100
BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
Tiemouts may appear as client disconnections
https://bz.apache.org/bugzilla/show_bug.cgi?id=66281
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 18 ++
webapps/docs/changelog.xml| 4
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 602fa0232c..549594354d 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -265,6 +265,10 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
log.debug(sm.getString("upgradeHandler.prefaceReceived",
connectionId));
}
+// Allow streams and connection to determine timeouts
+socketWrapper.setReadTimeout(-1);
+socketWrapper.setWriteTimeout(-1);
+
processConnection(webConnection, stream);
}
@@ -343,10 +347,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
}
try {
-// There is data to read so use the read timeout while
-// reading frames ...
-socketWrapper.setReadTimeout(protocol.getReadTimeout());
-// ... and disable the connection timeout
+// Disable the connection timeout while frames are
processed
setConnectionTimeout(-1);
while (true) {
try {
@@ -1504,6 +1505,15 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
int thisRead = 0;
while (len > 0) {
+// Blocking reads use the protocol level read timeout. Non-blocking
+// reads do not timeout. The intention is that once a frame has
+// started to be read, the read timeout applies until it is
+// completely read.
+if (nextReadBlock) {
+socketWrapper.setReadTimeout(protocol.getReadTimeout());
+} else {
+socketWrapper.setReadTimeout(-1);
+}
thisRead = socketWrapper.read(nextReadBlock, data, pos, len);
if (thisRead == 0) {
if (nextReadBlock) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a14e88f9a0..b49a0d8ccb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
66276: Fix incorrect class cast when adding
a descendant of HTTP/2 streams. (lihan)
+
+66281: Fix unexpected timeouts that may appear as client
+disconnections when using HTTP/2 and NIO2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new fd17920c92 BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
fd17920c92 is described below
commit fd17920c925ba2754dcbc5d43c3dd5ddb7c829a7
Author: Mark Thomas
AuthorDate: Fri Sep 30 18:17:14 2022 +0100
BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
Tiemouts may appear as client disconnections
https://bz.apache.org/bugzilla/show_bug.cgi?id=66281
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 18 ++
webapps/docs/changelog.xml| 4
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index f82294c01a..108dca8be7 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -265,6 +265,10 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
log.debug(sm.getString("upgradeHandler.prefaceReceived",
connectionId));
}
+// Allow streams and connection to determine timeouts
+socketWrapper.setReadTimeout(-1);
+socketWrapper.setWriteTimeout(-1);
+
processConnection(webConnection, stream);
}
@@ -343,10 +347,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
}
try {
-// There is data to read so use the read timeout while
-// reading frames ...
-socketWrapper.setReadTimeout(protocol.getReadTimeout());
-// ... and disable the connection timeout
+// Disable the connection timeout while frames are
processed
setConnectionTimeout(-1);
while (true) {
try {
@@ -1504,6 +1505,15 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
int thisRead = 0;
while (len > 0) {
+// Blocking reads use the protocol level read timeout. Non-blocking
+// reads do not timeout. The intention is that once a frame has
+// started to be read, the read timeout applies until it is
+// completely read.
+if (nextReadBlock) {
+socketWrapper.setReadTimeout(protocol.getReadTimeout());
+} else {
+socketWrapper.setReadTimeout(-1);
+}
thisRead = socketWrapper.read(nextReadBlock, data, pos, len);
if (thisRead == 0) {
if (nextReadBlock) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3d7dbc485b..2381a62cb9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
66276: Fix incorrect class cast when adding
a descendant of HTTP/2 streams. (lihan)
+
+66281: Fix unexpected timeouts that may appear as client
+disconnections when using HTTP/2 and NIO2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new b01c241e56 BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
b01c241e56 is described below
commit b01c241e56cec904d3cd9fa00c9a2bc0b6831bbc
Author: Mark Thomas
AuthorDate: Fri Sep 30 18:17:14 2022 +0100
BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2
Timeouts may appear as client disconnections
https://bz.apache.org/bugzilla/show_bug.cgi?id=66281
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 18 ++
webapps/docs/changelog.xml| 4
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 80f91b296b..e9d982b95c 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -274,6 +274,10 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
throw new
ProtocolException(sm.getString("upgradeHandler.pingFailed"), ioe);
}
+// Allow streams and connection to determine timeouts
+socketWrapper.setReadTimeout(-1);
+socketWrapper.setWriteTimeout(-1);
+
if (webConnection != null) {
processStreamOnContainerThread(stream);
}
@@ -337,10 +341,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
}
try {
-// There is data to read so use the read timeout while
-// reading frames ...
-socketWrapper.setReadTimeout(getReadTimeout());
-// ... and disable the connection timeout
+// Disable the connection timeout while frames are
processed
setConnectionTimeout(-1);
while (true) {
try {
@@ -1603,6 +1604,15 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
int thisRead = 0;
while (len > 0) {
+// Blocking reads use the protocol level read timeout. Non-blocking
+// reads do not timeout. The intention is that once a frame has
+// started to be read, the read timeout applies until it is
+// completely read.
+if (nextReadBlock) {
+socketWrapper.setReadTimeout(protocol.getReadTimeout());
+} else {
+socketWrapper.setReadTimeout(-1);
+}
thisRead = socketWrapper.read(nextReadBlock, data, pos, len);
if (thisRead == 0) {
if (nextReadBlock) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 34ac069917..e1da0113de 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -186,6 +186,10 @@
66276: Fix incorrect class cast when adding
a descendant of HTTP/2 streams. (lihan)
+
+66281: Fix unexpected timeouts that may appear as client
+disconnections when using HTTP/2 and NIO2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update RewriteValve to use dotall mode
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 aa9499a732 Update RewriteValve to use dotall mode
aa9499a732 is described below
commit aa9499a732de05cd0041c339c99c06092028fcbd
Author: Mark Thomas
AuthorDate: Fri Sep 30 20:19:42 2022 +0100
Update RewriteValve to use dotall mode
---
java/org/apache/catalina/valves/rewrite/RewriteCond.java | 2 +-
java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
webapps/docs/changelog.xml | 9 +
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
index 47a904c1e0..90bdc5289a 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
@@ -151,7 +151,7 @@ public class RewriteCond {
this.condition = ncondition;
} else {
PatternCondition ncondition = new PatternCondition();
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index ca29223deb..d055882a13 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -47,7 +47,7 @@ public class RewriteRule {
positive = false;
patternString = patternString.substring(1);
}
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
@@ -89,7 +89,7 @@ public class RewriteRule {
Pattern pattern = this.pattern.get();
if (pattern == null) {
// Parse the pattern
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dc92160c4c..560749e7e4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,15 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Update the RewriteValve to perform pattern matching using
+dotall mode to avoid unexpected behaviour if the URL includes encoded
+line terminators. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update RewriteValve to use dotall mode
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 239aa9f5f5 Update RewriteValve to use dotall mode
239aa9f5f5 is described below
commit 239aa9f5f5a7239e3e3c13871424d01792f9488d
Author: Mark Thomas
AuthorDate: Fri Sep 30 20:19:42 2022 +0100
Update RewriteValve to use dotall mode
---
java/org/apache/catalina/valves/rewrite/RewriteCond.java | 2 +-
java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
webapps/docs/changelog.xml | 9 +
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
index 47a904c1e0..90bdc5289a 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
@@ -151,7 +151,7 @@ public class RewriteCond {
this.condition = ncondition;
} else {
PatternCondition ncondition = new PatternCondition();
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index ca29223deb..d055882a13 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -47,7 +47,7 @@ public class RewriteRule {
positive = false;
patternString = patternString.substring(1);
}
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
@@ -89,7 +89,7 @@ public class RewriteRule {
Pattern pattern = this.pattern.get();
if (pattern == null) {
// Parse the pattern
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b49a0d8ccb..405eb15bc8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,15 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Update the RewriteValve to perform pattern matching using
+dotall mode to avoid unexpected behaviour if the URL includes encoded
+line terminators. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Update RewriteValve to use dotall mode
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3e31c41c93 Update RewriteValve to use dotall mode
3e31c41c93 is described below
commit 3e31c41c93d8271acc5de780f81c3b2b266e9ca2
Author: Mark Thomas
AuthorDate: Fri Sep 30 20:19:42 2022 +0100
Update RewriteValve to use dotall mode
---
java/org/apache/catalina/valves/rewrite/RewriteCond.java | 2 +-
java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
webapps/docs/changelog.xml | 9 +
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
index 47a904c1e0..90bdc5289a 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
@@ -151,7 +151,7 @@ public class RewriteCond {
this.condition = ncondition;
} else {
PatternCondition ncondition = new PatternCondition();
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index ca29223deb..d055882a13 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -47,7 +47,7 @@ public class RewriteRule {
positive = false;
patternString = patternString.substring(1);
}
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
@@ -89,7 +89,7 @@ public class RewriteRule {
Pattern pattern = this.pattern.get();
if (pattern == null) {
// Parse the pattern
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2381a62cb9..7489d3762d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,15 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Update the RewriteValve to perform pattern matching using
+dotall mode to avoid unexpected behaviour if the URL includes encoded
+line terminators. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update RewriteValve to use dotall mode
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 75d11526ef Update RewriteValve to use dotall mode
75d11526ef is described below
commit 75d11526eff3e590490288b89d17fe1903e7da9a
Author: Mark Thomas
AuthorDate: Fri Sep 30 20:19:42 2022 +0100
Update RewriteValve to use dotall mode
---
java/org/apache/catalina/valves/rewrite/RewriteCond.java | 2 +-
java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
webapps/docs/changelog.xml | 5 +
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
index 47a904c1e0..90bdc5289a 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
@@ -151,7 +151,7 @@ public class RewriteCond {
this.condition = ncondition;
} else {
PatternCondition ncondition = new PatternCondition();
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 833a12c177..f4fd9b665c 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -47,7 +47,7 @@ public class RewriteRule {
positive = false;
patternString = patternString.substring(1);
}
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
@@ -89,7 +89,7 @@ public class RewriteRule {
Pattern pattern = this.pattern.get();
if (pattern == null) {
// Parse the pattern
-int flags = 0;
+int flags = Pattern.DOTALL;
if (isNocase()) {
flags |= Pattern.CASE_INSENSITIVE;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e1da0113de..d65398bf58 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,11 @@
ErrorReportValve that returns response as JSON instead of
HTML. Back-porting kfujino's implementation. (lihan)
+
+Update the RewriteValve to perform pattern matching using
+dotall mode to avoid unexpected behaviour if the URL includes encoded
+line terminators. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66281] NIO2 breaks HTTP2 responses after 5 seconds
https://bz.apache.org/bugzilla/show_bug.cgi?id=66281 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Fixed in: - 10.1.x for 10.1.1 onwards - 10.0.x for 10.0.27 onwards - 9.0.x for 9.0.68 onwards - 8.5.x for 8.5.83 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] mulkgun opened a new pull request, #553: Undocumented nonce parameter name
mulkgun opened a new pull request, #553: URL: https://github.com/apache/tomcat/pull/553 The "nonce parameter name" initialisation parameter is undocumented. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
