(tomcat) branch 10.1.x updated: Add constant
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 0e1c091bba Add constant
0e1c091bba is described below
commit 0e1c091bba4246361300c24daee8964c47f3ed04
Author: remm
AuthorDate: Mon Apr 22 16:48:52 2024 +0200
Add constant
For better readability, after reviewing the ConfigurationSource code.
---
.../apache/catalina/startup/CatalinaBaseConfigurationSource.java| 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
index cedc1cdd23..cd31f0fd1e 100644
--- a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
+++ b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
@@ -33,6 +33,8 @@ public class CatalinaBaseConfigurationSource implements
ConfigurationSource {
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+public static final String LEGACY_SERVER_EMBED_XML = "server-embed.xml";
+
private final String serverXmlPath;
private final File catalinaBaseFile;
private final URI catalinaBaseUri;
@@ -58,10 +60,10 @@ public class CatalinaBaseConfigurationSource implements
ConfigurationSource {
}
if (result == null) {
// Compatibility with legacy server-embed.xml location
-InputStream stream =
getClass().getClassLoader().getResourceAsStream("server-embed.xml");
+InputStream stream =
getClass().getClassLoader().getResourceAsStream(LEGACY_SERVER_EMBED_XML);
if (stream != null) {
try {
-result = new Resource(stream,
getClass().getClassLoader().getResource("server-embed.xml").toURI());
+result = new Resource(stream,
getClass().getClassLoader().getResource(LEGACY_SERVER_EMBED_XML).toURI());
} catch (URISyntaxException e) {
stream.close();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add constant
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 86bd1a42b1 Add constant
86bd1a42b1 is described below
commit 86bd1a42b15e186db4cdfa676f4e8652cba59490
Author: remm
AuthorDate: Mon Apr 22 16:48:52 2024 +0200
Add constant
For better readability, after reviewing the ConfigurationSource code.
---
.../apache/catalina/startup/CatalinaBaseConfigurationSource.java| 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
index cedc1cdd23..cd31f0fd1e 100644
--- a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
+++ b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
@@ -33,6 +33,8 @@ public class CatalinaBaseConfigurationSource implements
ConfigurationSource {
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+public static final String LEGACY_SERVER_EMBED_XML = "server-embed.xml";
+
private final String serverXmlPath;
private final File catalinaBaseFile;
private final URI catalinaBaseUri;
@@ -58,10 +60,10 @@ public class CatalinaBaseConfigurationSource implements
ConfigurationSource {
}
if (result == null) {
// Compatibility with legacy server-embed.xml location
-InputStream stream =
getClass().getClassLoader().getResourceAsStream("server-embed.xml");
+InputStream stream =
getClass().getClassLoader().getResourceAsStream(LEGACY_SERVER_EMBED_XML);
if (stream != null) {
try {
-result = new Resource(stream,
getClass().getClassLoader().getResource("server-embed.xml").toURI());
+result = new Resource(stream,
getClass().getClassLoader().getResource(LEGACY_SERVER_EMBED_XML).toURI());
} catch (URISyntaxException e) {
stream.close();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add OpenSSL listener to the silent list
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new cb570444c1 Add OpenSSL listener to the silent list
cb570444c1 is described below
commit cb570444c1eace2dcccf7bd27a5fba36978561d3
Author: remm
AuthorDate: Mon Apr 22 16:52:18 2024 +0200
Add OpenSSL listener to the silent list
It does the same thing as the APR one.
---
java/org/apache/catalina/startup/Tomcat.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/Tomcat.java
b/java/org/apache/catalina/startup/Tomcat.java
index 0932474c24..46f20b8e4b 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -839,7 +839,8 @@ public class Tomcat {
static final String[] silences =
new String[] { "org.apache.coyote.http11.Http11NioProtocol",
"org.apache.catalina.core.StandardService",
"org.apache.catalina.core.StandardEngine",
"org.apache.catalina.startup.ContextConfig",
-"org.apache.catalina.core.ApplicationContext",
"org.apache.catalina.core.AprLifecycleListener" };
+"org.apache.catalina.core.ApplicationContext",
"org.apache.catalina.core.AprLifecycleListener",
+"org.apache.catalina.core.OpenSSLLifecycleListener" };
private boolean silent = false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add OpenSSL listener to the silent list
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 2ac9660b4c Add OpenSSL listener to the silent list
2ac9660b4c is described below
commit 2ac9660b4c995018b2ccc7abc6ee0a914c4f1fec
Author: remm
AuthorDate: Mon Apr 22 16:52:18 2024 +0200
Add OpenSSL listener to the silent list
It does the same thing as the APR one.
---
java/org/apache/catalina/startup/Tomcat.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/Tomcat.java
b/java/org/apache/catalina/startup/Tomcat.java
index f1548a594a..2da827d3bc 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -838,7 +838,8 @@ public class Tomcat {
static final String[] silences =
new String[] { "org.apache.coyote.http11.Http11NioProtocol",
"org.apache.catalina.core.StandardService",
"org.apache.catalina.core.StandardEngine",
"org.apache.catalina.startup.ContextConfig",
-"org.apache.catalina.core.ApplicationContext",
"org.apache.catalina.core.AprLifecycleListener" };
+"org.apache.catalina.core.ApplicationContext",
"org.apache.catalina.core.AprLifecycleListener",
+"org.apache.catalina.core.OpenSSLLifecycleListener" };
private boolean silent = false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Add constant
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new c784581879 Add constant
c784581879 is described below
commit c784581879286a4d8388c04c04f74bfdf5e37f97
Author: remm
AuthorDate: Mon Apr 22 16:48:52 2024 +0200
Add constant
For better readability, after reviewing the ConfigurationSource code.
---
.../apache/catalina/startup/CatalinaBaseConfigurationSource.java| 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
index cedc1cdd23..cd31f0fd1e 100644
--- a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
+++ b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
@@ -33,6 +33,8 @@ public class CatalinaBaseConfigurationSource implements
ConfigurationSource {
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+public static final String LEGACY_SERVER_EMBED_XML = "server-embed.xml";
+
private final String serverXmlPath;
private final File catalinaBaseFile;
private final URI catalinaBaseUri;
@@ -58,10 +60,10 @@ public class CatalinaBaseConfigurationSource implements
ConfigurationSource {
}
if (result == null) {
// Compatibility with legacy server-embed.xml location
-InputStream stream =
getClass().getClassLoader().getResourceAsStream("server-embed.xml");
+InputStream stream =
getClass().getClassLoader().getResourceAsStream(LEGACY_SERVER_EMBED_XML);
if (stream != null) {
try {
-result = new Resource(stream,
getClass().getClassLoader().getResource("server-embed.xml").toURI());
+result = new Resource(stream,
getClass().getClassLoader().getResource(LEGACY_SERVER_EMBED_XML).toURI());
} catch (URISyntaxException e) {
stream.close();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r68584 - /release/tomcat/tomcat-11/KEYS
Author: remm Date: Tue Apr 16 15:05:29 2024 New Revision: 68584 Log: Add my key to the top level KEYS (just in case) Modified: release/tomcat/tomcat-11/KEYS Modified: release/tomcat/tomcat-11/KEYS == --- release/tomcat/tomcat-11/KEYS (original) +++ release/tomcat/tomcat-11/KEYS Tue Apr 16 15:05:29 2024 @@ -451,3 +451,63 @@ wgS+SH6oAHlGwpxhhzXBlqZsHXm+w+2oazWUhxFF yZUcTCEB33B2jQ9z0XUEp+6B2F5iZQ== =4AB7 -END PGP PUBLIC KEY BLOCK- + +pub rsa4096 2019-05-05 [SC] + 48F8 E69F 6390 C9F2 5CFE DCD2 6824 8959 359E 722B +uid [ultimate] Remy Maucherat +sig 368248959359E722B 2019-05-05 Remy Maucherat +sub rsa4096 2019-05-05 [E] +sig 68248959359E722B 2019-05-05 Remy Maucherat + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFzO4ecBEACVS86VyuTSJmLmApi92R6D3/L3EIBFXhagJbrLkodkTuG9efYo +vM1DJPWEFs5kux8a8UPwn2gbQFPJg1AH77GqjP8gtn0KHQvXgYC9+7cTqDl6C7k9 +n3BkB9bRIhHileYyIJfnycjJdrGFEmwGu0pBOEdr01R0kFprqYu9DwcD6oUvmZRn +OMoQQeLEC0cw/VzJ/ZqzJwO0t+rMCozqJ9/BfJZUqwijDZnJAZWnIVxjqxrUgyYA +5/0g9X8YHrIz09XuzaE64VAl0q3nrFJWvDCwE/ZM7w8jlUqtQgLu4K2U82G0YXw3 +KJ1EbigEmtEohu6HVnAToCJuOnQ8m0rZxbyNMeYF9pyohdFEca4I0B8Evy2dYFnJ +Y2gghuU80vct54536WWz9mAjKwBFQUtxX0EjYrYN9ckzCK6fRqrnVv0USVp7N/ZY +PQkOEJSdmRdpvTMwfCuAyT0/3cxuC7NyAWiZDXJv7OVcDr/REfWAA7XMQOErwdGJ +gViG58YhLw0Pgdumg+prqQXowzlRzGAsV5VntCh+4LV8/ESmvWAE3V+jgZFB3cSp +g58NKjp1EwKwX6BCICyX+Oe03cnlC0UJ7S9FccrjNrkiwxxOVAnmy4kxX/P3Cuqc +C/b6BeeUA1hBNWNe42mr6YczS+dhpCSUVWQJp/TxdoXA2fGG1OS1FMaICwARAQAB +tCBSZW15IE1hdWNoZXJhdCA8cmVtbUBhcGFjaGUub3JnPokCOAQTAQIAIgUCXM7h +5wIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQaCSJWTWecisVSA/9Eh3h +0jeyy51rA1nqq9imbH0YC85A/wZjhb06UXwWBPozJR8UJsOJZ7kBzCW4gfkC9zTD +GStSHHAej9o96FHVRLzCyjaaZVuRUl2qCz9U+pnGMxb5aRNVAQ/wE10hHu3Yc+48 +cc0sPCCPMdshAj1VOHczTU/LSv21TWBaKO3NMV9KilPzKvXHdPFYssVcUt2NgQLm +2Bx/ELTCVj5c9Ih2cz3T7kxf8LKsGALIfjcp8g9DlvMjVLKBFZqU94C4V0mba2Fd +6xHpdmcgMbSNo6poQ0M0O7CN5qVJFm/v4ZDooLNWRMeL66oen3LrZ8HRpPxfic77 +JLKn60dywuYU8WYp7cV+3AnaDn/ggvC1x79LSmX4PFyG9/F5M7gp0HFrVdyc0nBo +UTejZXehwKrfvF/isPf7pUv2fGXwg07zTz8OMLQo4h9poB5YuuinjuxjBfmc2AvB +WbRcKNvHXHUlaVeK+VvohfPuetJESS4YB7fLMQPdGIckDFQub4SvXPNPPToLsbDB +2GGguqhwWD9ECa2o1RqX8LnCdB71uBcyiW8UIkLxwaygsciVm7SFz+pqAKJgzWwI +AsVYVOIKdq0GWaLDtMGJGQFfxuMVmMGGbvueAMcOCSSsGemkElan33VS8Zu1sjeY +P0Jt4ws6gcbUHI27l5Pvk06uWzaN8uyXGA03d4y5Ag0EXM7h5wEQALG3oikRAQqf +um+wW6oW2d1mIk0PtnC3l3/kGTA92kIqJzQ3Ua0mFaVGxdg2J/I1MF7HdlZJbGyP +5b0PdbSjLHFbQfFD6LHsLw9StVrkjbBKYaP0gRWxEIHMN4Qv01I2Lyc9ONlMjUIf +xNK/AG6oT/Ia53VVET78HOj01L7JjBAPuW8UPoy27s2gQ02smbA7iRUeZ3dpN2fy +027aKbimIl1ZrxJbcbxw29PXWJZP+CxJEnqwEw78QbqSsFMAhR9wZHTfEtUzYy6h +hyngwYQ+iBnB+1cYTEB9KbWWpP5n12iuRin77r2RwrHYAW/RUILK2rOJqPcIg6CX +P1o9UKPeN5QE/ScU5427XKZZscaQrvBPoN3G2RWmMuHM2cchXgRRMMaSvufocLjj +gKj/aPUDCkvJ5MyTNtMfVDx0Tw3aQpf2Fr1L1Hu2GyBqifioZGdzLL0LtdeXzkJy +nZGj/L5jzIlNBnQG97rgCuPflbIl2S1izNexnuX2Z1dcyS2MTrj3nnK6HoW+gvCc +oqq01S410wxaAUidJeGwLzgUa9Ig+6BVPT7sZrbc0IoNP+JdoqPxiEkqy4Msy9WJ +RVeJM520Q2T1YM7xm/4E8C7H+Fis5u4GNswk5qsXEOyLcHBzGEik3BDylp+sJ6/F +DuAN7k64RV2m+lKpjngiKZxo9LmqnsWTABEBAAGJAh8EGAECAAkFAlzO4ecCGwwA +CgkQaCSJWTWecishvg//ZDuhkbSUgIIjG9Rzq3cHNxZ4sFrUwL19AtGNktiwt0QA +GCKPnf4SdHZGKSeOqUHeDT/l/5l4Xc/JgRk/t2bEeC3cHE/Xc5V6I2n28HQiJScX +UJdnO3QdTCMEYVedu/9JhmA37eznQhm+UAcxT9tew3nSd0KkkMQyW6YpBEgcdsFd +aLiFPzbySjRWplyCdELPRFtW2ZHnJ5gVGYZ060EOHcdPb/4Gz/mA6dIjQ5N+vKlA +GNdYZgv3w4NRGLmni5T7jDAY6T2CJXxvcgfYfh3oY3aiZaWzKKQyLEVaoZ6dJbsm +mi2if7MZ/SVCMdM3MXiRpCeyyw9MTylGzgwbDYSz2ZkGvy9k+1M75q5QEfvVM8R3 +guaBJR+e4fkfsRBUAqwmHy8TrXghf5eOCsJx/9yyRXvK4tnwSBUIzFa1q0POESul +jFWYFkvRjKIYfFWS6cY37sPNLvEQQmP2O07ttaYfIXcMcVF+HsDBUftGRWIkkPn2 +LucW7f0Lqlbv/mlJpqByz522jmJRNFLVQh87LYz91FgsLAgDkPpi8mzRrEfb2nHD ++PIKpoO499AKQ8hETMbfzmpJUIV2Bhd7OqKDSf+yHiYSje9evofP+4lDUx3u7tQ3 +4OUzLqBRVrhFDI9keHnhOFMJSrnrpXe7Cm9JujvTX/hy2iOpTOuflj0Djsc8dnQ= +=l4Ry +-END PGP PUBLIC KEY BLOCK- + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1917038 - in /tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache: catalina/util/ tomcat/dbcp/pool2/ tomcat/util/http/fileupload/servlet/
Author: remm Date: Tue Apr 16 14:58:12 2024 New Revision: 1917038 URL: http://svn.apache.org/viewvc?rev=1917038=rev Log: Javadoc update for 9.0.88 Added: tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/util/StringUtil.html Removed: tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.html tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.html tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.html Added: tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/util/StringUtil.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/util/StringUtil.html?rev=1917038=auto == --- tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/util/StringUtil.html (added) +++ tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/util/StringUtil.html Tue Apr 16 14:58:12 2024 @@ -0,0 +1,176 @@ + + + + +StringUtil (Apache Tomcat 9.0.88 API Documentation) + + + + + + + + + + + + +var evenRowColor = "even-row-color"; +var oddRowColor = "odd-row-color"; +var tableTab = "table-tab"; +var activeTableTab = "active-table-tab"; +var pathtoroot = "../../../../"; +loadScripts(document, 'script'); + +JavaScript is disabled on your browser. + + + + + + +Skip navigation links +Apache Tomcat® 9.0.88 + +Overview +Package +Class +Tree +Deprecated +Index +Help + + + + + +Summary: +Nested| +Field| +Constr| +Method + + +Detail: +Field| +Constr| +Method + + +SEARCH: + + + + + + + + + + + +Packageorg.apache.catalina.util +Class StringUtil + +https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html; title="class or interface in java.lang" class="external-link">java.lang.Object +org.apache.catalina.util.StringUtil + + + +public class StringUtil +extends https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html; title="class or interface in java.lang" class="external-link">Object + + + + + + +Constructor Summary +Constructors + +Constructor +Description +StringUtil() + + + + + + + +Method Summary + +All MethodsStatic MethodsConcrete Methods + + +Modifier and Type +Method +Description +static https://docs.oracle.com/javase/8/docs/api/java/lang/String.html; title="class or interface in java.lang" class="external-link">String[] +splitCommaSeparated(https://docs.oracle.com/javase/8/docs/api/java/lang/String.html; title="class or interface in java.lang" class="external-link">Strings) + +Splits a comma-separated string into an array of String values. + + + + + +Methods inherited from classjava.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html; title="class or interface in java.lang" class="external-link">Object +https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#clone--; title="class or interface in java.lang" class="external-link">clone, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#equals-java.lang.Object-; title="class or interface in java.lang" class="external-link">equals, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#finalize--; title="class or interface in java.lang" class="external-link">finalize, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#getClass--; title="class or interface in java.lang" class="external-link">getClass, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#hashCode--; title="class or interface in java.lang" class="external-link">hashCode, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#notify--; title="class or interface in java.lang" class="external-link">notify, https://docs.o racle.com/javase/8/docs/api/java/lang/Object.html#notifyAll--" title="class or interface in java.lang" class="external-link">notifyAll, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#toString--; title="class or interface in java.lang" class="external-link">toString, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait--; title="class or interface in java.lang" class="external-link">wait, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait-long-; title="class or interface in java.lang" class="external-link">wait, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait-long-int-; title="class or interface in java.lang" class="external-link">wait + + + + + + + + + +Constructor Details + + + +StringUti
svn commit: r1917037 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ annotationapi/ annotationapi/javax/annotation/ annotationapi/javax/annotation/security/ annotationapi/javax/annotation/sql/ api/ ap
Author: remm Date: Tue Apr 16 14:57:05 2024 New Revision: 1917037 URL: http://svn.apache.org/viewvc?rev=1917037=rev Log: Javadoc update for 9.0.88 [This commit notification would consist of 69 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1917036 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: remm Date: Tue Apr 16 14:51:28 2024 New Revision: 1917036 URL: http://svn.apache.org/viewvc?rev=1917036=rev Log: Website update for 9.0.88 Modified: tomcat/site/trunk/build.properties.default tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-90.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-9.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1917036=1917035=1917036=diff == --- tomcat/site/trunk/build.properties.default (original) +++ tomcat/site/trunk/build.properties.default Tue Apr 16 14:51:28 2024 @@ -37,7 +37,7 @@ tomcat.loc=https://downloads.apache.org/ # - Tomcat versions - tomcat8.5=8.5.100 -tomcat9.0=9.0.87 +tomcat9.0=9.0.88 tomcat10.1=10.1.20 tomcat11.0=11.0.0-M19 Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1917036=1917035=1917036=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Tue Apr 16 14:51:28 2024 @@ -74,8 +74,8 @@ Latest Stable 9.0.x Release -2024-03-14 -9.0.87 +2024-04-16 +9.0.88 Modified: tomcat/site/trunk/docs/download-90.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1917036=1917035=1917036=diff == --- tomcat/site/trunk/docs/download-90.html (original) +++ tomcat/site/trunk/docs/download-90.html Tue Apr 16 14:51:28 2024 @@ -10,7 +10,7 @@ Quick Navigation -[define v]9.0.87[end] +[define v]9.0.88[end] https://downloads.apache.org/tomcat/tomcat-9/KEYS;>KEYS | [v] | Browse | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1917036=1917035=1917036=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Apr 16 14:51:28 2024 @@ -34,6 +34,24 @@ wiki page. Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. +2024-04-16 Tomcat 9.0.88 Released + +The Apache Tomcat Project is proud to announce the release of version 9.0.88 +of Apache Tomcat. This release implements specifications that are part of the +Java EE 8 platform. The notable changes compared to 9.0.87 include: + +Cookies header generation enhancements. +Fix regression when reloading TLS configuration and files. + + +Full details of these changes, and all the other changes, are available in the +Tomcat 9 +changelog. + + + +https://tomcat.apache.org/download-90.cgi;>Download + 2024-04-16 Tomcat 11.0.0-M19 Released The Apache Tomcat Project is proud to announce the release of version 11.0.0-M19 Modified: tomcat/site/trunk/docs/migration-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1917036=1917035=1917036=diff == --- tomcat/site/trunk/docs/migration-9.html (original) +++ tomcat/site/trunk/docs/migration-9.html Tue Apr 16 14:51:28 2024 @@ -470,7 +470,8 @@ versions of Apache Tomcat9.0.83 9.0.84 9.0.85 -9.0.86 +9.0.86 +9.0.87 , new version: 9.0.0-M1 @@ -560,7 +561,8 @@ versions of Apache Tomcat9.0.84 9.0.85 9.0.86 -9.0.87 +9.0.87 +9.0.88 trunk (unreleased) Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1917036=1917035=1917036=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Tue Apr 16 14:51:28 2024 @@ -18,6 +18,32 @@ year 2011 year 2010 +2024-03-14 Tomcat 9.0.87 Released + +The Apache Tomcat Project is proud to announce the release of version 9.0.87 +of Apache Tomcat. This release implements specifications that are part of the +Java EE 8 platform. The notable changes compared to 9.0.86 include: + +When restoring a saved POST request after a successful FORM +authentication, ensure that neither the URI, the query string nor +the pr
svn commit: r1917034 - in /tomcat/site/trunk/docs/tomcat-11.0-doc: ./ annotationapi/ annotationapi/jakarta/annotation/ annotationapi/jakarta/annotation/security/ annotationapi/jakarta/annotation/sql/
Author: remm Date: Tue Apr 16 14:44:28 2024 New Revision: 1917034 URL: http://svn.apache.org/viewvc?rev=1917034=rev Log: Javadoc update for 11.0.0-M19 [This commit notification would consist of 72 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1917035 - /tomcat/site/trunk/docs/tomcat-11.0-doc/api/org/apache/catalina/util/StringUtil.html
Author: remm Date: Tue Apr 16 14:45:12 2024 New Revision: 1917035 URL: http://svn.apache.org/viewvc?rev=1917035=rev Log: Javadoc update for 11.0.0-M19 Added: tomcat/site/trunk/docs/tomcat-11.0-doc/api/org/apache/catalina/util/StringUtil.html Added: tomcat/site/trunk/docs/tomcat-11.0-doc/api/org/apache/catalina/util/StringUtil.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-11.0-doc/api/org/apache/catalina/util/StringUtil.html?rev=1917035=auto == --- tomcat/site/trunk/docs/tomcat-11.0-doc/api/org/apache/catalina/util/StringUtil.html (added) +++ tomcat/site/trunk/docs/tomcat-11.0-doc/api/org/apache/catalina/util/StringUtil.html Tue Apr 16 14:45:12 2024 @@ -0,0 +1,192 @@ + + + + +StringUtil (Apache Tomcat 11.0.0-M19 API Documentation) + + + + + + + + + + + +var pathtoroot = "../../../../"; +loadScripts(document, 'script'); + +JavaScript is disabled on your browser. + + + + + +Skip navigation links +Apache Tomcat® 11.0.0-M19 + +Overview +Package +Class +Tree +Deprecated +Index +Help + + + +Summary: + +Nested +Field +Constr +Method + + + +Detail: + +Field +Constr +Method + + + + + + + +Summary: +Nested| +Field| +Constr| +Method + + +Detail: +Field| +Constr| +Method + + +SEARCH + + + + + + + + + + +Packageorg.apache.catalina.util +Class StringUtil + +https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html; title="class or interface in java.lang" class="external-link">java.lang.Object +org.apache.catalina.util.StringUtil + + + + +public class StringUtil +extends https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html; title="class or interface in java.lang" class="external-link">Object + + + + + + + +Constructor Summary +Constructors + +Constructor +Description +StringUtil() + + + + + + + +Method Summary + +All MethodsStatic MethodsConcrete Methods + + +Modifier and Type +Method +Description +static https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html; title="class or interface in java.lang" class="external-link">String[] +splitCommaSeparated(https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html; title="class or interface in java.lang" class="external-link">Strings) + +Splits a comma-separated string into an array of String values. + + + + + +Methods inherited from classjava.lang.https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html; title="class or interface in java.lang" class="external-link">Object +https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone, https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals, https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize, https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass, https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode, https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Objec t.html#notify()" title="class or interface in java.lang" class="external-link">notify, https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll, https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString, https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait, https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait, https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait + + + + + + + + + +Constructor Details + + + +StringUtil + +publicStringUtil() + + + + + + + + + +Method Details
svn commit: r1917033 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: remm
Date: Tue Apr 16 14:38:49 2024
New Revision: 1917033
URL: http://svn.apache.org/viewvc?rev=1917033=rev
Log:
Website update for 11.0.0-M19
Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/download-11.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-11.0.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/download-11.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-11.0.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1917033=1917032=1917033=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Tue Apr 16 14:38:49 2024
@@ -39,7 +39,7 @@ tomcat.loc=https://downloads.apache.org/
tomcat8.5=8.5.100
tomcat9.0=9.0.87
tomcat10.1=10.1.20
-tomcat11.0=11.0.0-M17
+tomcat11.0=11.0.0-M19
# - Download destination -
tomcat-site-docs.home=${base.path}/tomcat-site-docs/
Modified: tomcat/site/trunk/docs/download-11.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-11.html?rev=1917033=1917032=1917033=diff
==
--- tomcat/site/trunk/docs/download-11.html (original)
+++ tomcat/site/trunk/docs/download-11.html Tue Apr 16 14:38:49 2024
@@ -19,7 +19,7 @@
Quick Navigation
-[define v]11.0.0-M18[end]
+[define v]11.0.0-M19[end]
https://downloads.apache.org/tomcat/tomcat-11/KEYS;>KEYS |
[v] (alpha) |
Browse |
Modified: tomcat/site/trunk/docs/index.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1917033=1917032=1917033=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue Apr 16 14:38:49 2024
@@ -34,6 +34,34 @@ wiki page.
Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
project logo are trademarks of the Apache Software Foundation.
+2024-04-16 Tomcat 11.0.0-M19 Released
+
+The Apache Tomcat Project is proud to announce the release of version
11.0.0-M19
+(alpha) of Apache Tomcat. This release is a milestone release and is targeted
at
+Jakarta EE 11.
+Users of Tomcat 10 onwards should be aware that, as a result of the move
from
+Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse
+Foundation, the primary package for all implemented APIs has changed from
+javax.* to jakarta.*. This will almost certainly
+require code changes to enable applications to migrate from Tomcat 9 and
earlier
+to Tomcat 10 and later. A
+https://github.com/apache/tomcat-jakartaee-migration;>migration
+tool is available to aid this process.
+The notable changes in this release are:
+
+Finalize update to the Jakarta EE 11 specifications.
+Cookies header generation enhancements.
+Fix regression when reloading TLS configuration and files.
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 11
+(alpha) changelog.
+
+
+
+https://tomcat.apache.org/download-11.cgi;>Download
+
2024-03-25 Tomcat 10.1.20 Released
The Apache Tomcat Project is proud to announce the release of version 10.1.20
@@ -128,39 +156,6 @@ changelog.
https://tomcat.apache.org/download-90.cgi;>Download
-2024-03-14 Tomcat 11.0.0-M18 Released
-
-The Apache Tomcat Project is proud to announce the release of version
11.0.0-M18
-(alpha) of Apache Tomcat. This release is a milestone release and is targeted
at
-Jakarta EE 11.
-Users of Tomcat 10 onwards should be aware that, as a result of the move
from
-Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse
-Foundation, the primary package for all implemented APIs has changed from
-javax.* to jakarta.*. This will almost certainly
-require code changes to enable applications to migrate from Tomcat 9 and
earlier
-to Tomcat 10 and later. A
-https://github.com/apache/tomcat-jakartaee-migration;>migration
-tool is available to aid this process.
-The notable changes in this release are:
-
-Reduce minimum Java version to Java 17
-When restoring a saved POST request after a successful FORM
-authentication, ensure that neither the URI, the query string no
-the protocol are corrupted when restoring the request body.
-Align error handling for Writer and OutputStream. Ensure use of either
-once the response has been recycled triggers a NullPointerException
-provided that discardFacades is configured with the default value of
-true.
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 11
-(alpha) changelo
svn commit: r68578 - /dev/tomcat/tomcat-9/v9.0.88/ /release/tomcat/tomcat-9/v9.0.88/
Author: remm Date: Tue Apr 16 13:13:27 2024 New Revision: 68578 Log: Release Tomcat 9.0.88 Added: release/tomcat/tomcat-9/v9.0.88/ - copied from r68577, dev/tomcat/tomcat-9/v9.0.88/ Removed: dev/tomcat/tomcat-9/v9.0.88/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r68577 - /dev/tomcat/tomcat-11/v11.0.0-M19/ /release/tomcat/tomcat-11/v11.0.0-M19/
Author: remm Date: Tue Apr 16 13:12:36 2024 New Revision: 68577 Log: Release Tomcat 11.0.0-M19 Added: release/tomcat/tomcat-11/v11.0.0-M19/ - copied from r68576, dev/tomcat/tomcat-11/v11.0.0-M19/ Removed: dev/tomcat/tomcat-11/v11.0.0-M19/ - 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
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 11fa0211a6 Update 11fa0211a6 is described below commit 11fa0211a61b2163a0bcc7828a05068567eb98f8 Author: remm AuthorDate: Fri Apr 12 14:56:41 2024 +0200 Update --- README.md | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6cef104c45..1961da67fa 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,9 @@ project logo are trademarks of the Apache Software Foundation. For every major Tomcat version there is one download page containing links to the latest binary and source code downloads, but also links for browsing the download directories and archives: +- [Tomcat 11](https://tomcat.apache.org/download-11.cgi) - [Tomcat 10](https://tomcat.apache.org/download-10.cgi) - [Tomcat 9](https://tomcat.apache.org/download-90.cgi) -- [Tomcat 8](https://tomcat.apache.org/download-80.cgi) To facilitate choosing the right major Tomcat version one, we have provided a [version overview page](https://tomcat.apache.org/whichversion.html). @@ -42,10 +42,9 @@ The documentation available as of the date of this release is included in the docs webapp which ships with tomcat. You can access that webapp by starting tomcat and visiting <http://localhost:8080/docs/> in your browser. The most up-to-date documentation for each version can be found at: -- [Tomcat 10.1](https://tomcat.apache.org/tomcat-10.1-doc/) -- [Tomcat 10.0](https://tomcat.apache.org/tomcat-10.0-doc/) +- [Tomcat 11](https://tomcat.apache.org/tomcat-11.0-doc/) +- [Tomcat 10](https://tomcat.apache.org/tomcat-10.1-doc/) - [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/) -- [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/) ### Installation - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Updates
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 0ea75904cd Updates 0ea75904cd is described below commit 0ea75904cd3b56356f050419e7c371f22fdaccbc Author: remm AuthorDate: Fri Apr 12 14:52:00 2024 +0200 Updates --- README.md | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6cef104c45..678db89c97 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ ### What Is It? -The Apache Tomcat® software is an open source implementation of the Java -Servlet, JavaServer Pages, Java Expression Language and Java WebSocket -technologies. The Java Servlet, JavaServer Pages, Java Expression Language and -Java WebSocket specifications are developed under the -[Java Community Process](https://jcp.org/en/introduction/overview). +The Apache Tomcat® software is an open source implementation of the Jakarta +Servlet, Jakarta Pages, Jakarta Expression Language and Jakarta WebSocket +technologies. The Jakarta Servlet, Jakarta Server Pages, Jakarta Expression Language and +Jakarta WebSocket specifications are developed as part of the +[Jakarta EE Platform](https://jakarta.ee/specifications/). The Apache Tomcat software is developed in an open and participatory environment and released under the @@ -29,9 +29,9 @@ project logo are trademarks of the Apache Software Foundation. For every major Tomcat version there is one download page containing links to the latest binary and source code downloads, but also links for browsing the download directories and archives: +- [Tomcat 11](https://tomcat.apache.org/download-11.cgi) - [Tomcat 10](https://tomcat.apache.org/download-10.cgi) - [Tomcat 9](https://tomcat.apache.org/download-90.cgi) -- [Tomcat 8](https://tomcat.apache.org/download-80.cgi) To facilitate choosing the right major Tomcat version one, we have provided a [version overview page](https://tomcat.apache.org/whichversion.html). @@ -42,10 +42,9 @@ The documentation available as of the date of this release is included in the docs webapp which ships with tomcat. You can access that webapp by starting tomcat and visiting <http://localhost:8080/docs/> in your browser. The most up-to-date documentation for each version can be found at: -- [Tomcat 10.1](https://tomcat.apache.org/tomcat-10.1-doc/) -- [Tomcat 10.0](https://tomcat.apache.org/tomcat-10.0-doc/) +- [Tomcat 11](https://tomcat.apache.org/tomcat-11.0-doc/) +- [Tomcat 10](https://tomcat.apache.org/tomcat-10.1-doc/) - [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/) -- [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/) ### Installation - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Switch to Jakarta
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 8a16506abf Switch to Jakarta 8a16506abf is described below commit 8a16506abf926dbc2a803de502de7cd6816127f5 Author: remm AuthorDate: Fri Apr 12 14:51:21 2024 +0200 Switch to Jakarta --- README.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1961da67fa..3b4507570e 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ ### What Is It? -The Apache Tomcat® software is an open source implementation of the Java -Servlet, JavaServer Pages, Java Expression Language and Java WebSocket -technologies. The Java Servlet, JavaServer Pages, Java Expression Language and -Java WebSocket specifications are developed under the -[Java Community Process](https://jcp.org/en/introduction/overview). +The Apache Tomcat® software is an open source implementation of the Jakarta +Servlet, Jakarta Pages, Jakarta Expression Language and Jakarta WebSocket +technologies. The Jakarta Servlet, Jakarta Pages, Jakarta Expression Language and +Jakarta WebSocket specifications are developed as part of the +[Jakarta EE Platform](https://jakarta.ee/specifications/). The Apache Tomcat software is developed in an open and participatory environment and released under the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update version numbers
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 4fd19f0297 Update version numbers 4fd19f0297 is described below commit 4fd19f0297440018ed43473aa637d3969a207fd9 Author: remm AuthorDate: Fri Apr 12 14:44:09 2024 +0200 Update version numbers --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 17c7c7c2df..1961da67fa 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ links for browsing the download directories and archives: - [Tomcat 11](https://tomcat.apache.org/download-11.cgi) - [Tomcat 10](https://tomcat.apache.org/download-10.cgi) - [Tomcat 9](https://tomcat.apache.org/download-90.cgi) -- [Tomcat 8](https://tomcat.apache.org/download-80.cgi) To facilitate choosing the right major Tomcat version one, we have provided a [version overview page](https://tomcat.apache.org/whichversion.html). @@ -43,10 +42,9 @@ The documentation available as of the date of this release is included in the docs webapp which ships with tomcat. You can access that webapp by starting tomcat and visiting <http://localhost:8080/docs/> in your browser. The most up-to-date documentation for each version can be found at: -- [Tomcat 11.0](https://tomcat.apache.org/tomcat-11.0-doc/) +- [Tomcat 11](https://tomcat.apache.org/tomcat-11.0-doc/) - [Tomcat 10](https://tomcat.apache.org/tomcat-10.1-doc/) - [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/) -- [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/) ### Installation - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update version numbers, remove Tomcat 8.5
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new fa1cc930c5 Update version numbers, remove Tomcat 8.5
fa1cc930c5 is described below
commit fa1cc930c5627c30581a1dbd81be05014a47cdd2
Author: remm
AuthorDate: Fri Apr 12 09:42:05 2024 +0200
Update version numbers, remove Tomcat 8.5
---
.github/workflows/ci.yml | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4867591919..a4a5788c37 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,6 @@ on:
- main
- 10.1.x
- 9.0.x
- - 8.5.x
pull_request:
branches:
- main
@@ -33,17 +32,13 @@ jobs:
matrix:
isMain:
- ${{ contains(github.ref, 'main') }}
-java: [ 17, 20, 21 ]
+java: [ 17, 21, 22 ]
os: [ ubuntu-latest, windows-latest ]
exclude:
- isMain: true
java: 17
- - isMain: true
-java: 20
- - os: windows-latest
-java: 20
- os: windows-latest
-java: 21
+java: 22
name: JDK${{ matrix.java }} ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Remove deprecated items
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 56fc7a8f40 Remove deprecated items
56fc7a8f40 is described below
commit 56fc7a8f40490cb4d1cc32bc3be74d9415b78613
Author: remm
AuthorDate: Fri Apr 12 09:21:06 2024 +0200
Remove deprecated items
---
java/org/apache/catalina/Manager.java | 10 --
java/org/apache/catalina/session/ManagerBase.java | 43 ---
2 files changed, 53 deletions(-)
diff --git a/java/org/apache/catalina/Manager.java
b/java/org/apache/catalina/Manager.java
index b8438b1150..ed52490b33 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -85,16 +85,6 @@ public interface Manager {
long getSessionCounter();
-/**
- * Sets the total number of sessions created by this manager.
- *
- * @param sessionCounter Total number of sessions created by this manager.
- * @deprecated This will be removed in Tomcat 11
- */
-@Deprecated
-void setSessionCounter(long sessionCounter);
-
-
/**
* Gets the maximum number of sessions that have been active at the same
* time.
diff --git a/java/org/apache/catalina/session/ManagerBase.java
b/java/org/apache/catalina/session/ManagerBase.java
index 68bb0195d7..54845485ae 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -127,13 +127,6 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
*/
protected Map sessions = new ConcurrentHashMap<>();
-/**
- * Number of sessions created by this manager.
- * @deprecated This will be removed in Tomcat 11
- */
-@Deprecated
-protected long sessionCounter = 0;
-
protected volatile int maxActive = 0;
private final Object maxActiveUpdateLock = new Object();
@@ -148,13 +141,6 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
*/
protected int rejectedSessions = 0;
-/**
- * Number of duplicated session ids, anything > 0 means we have problems.
- * @deprecated This will be removed in Tomcat 11
- */
-@Deprecated
-protected volatile int duplicates = 0;
-
/**
* Processing time during session expiration.
*/
@@ -892,41 +878,12 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
// Package Methods
-@Override
-public void setSessionCounter(long sessionCounter) {
-this.sessionCounter = sessionCounter;
-}
-
-
@Override
public long getSessionCounter() {
return getActiveSessions() + getExpiredSessions();
}
-/**
- * Number of duplicated session IDs generated by the random source.
Anything bigger than 0 means problems.
- *
- * @return The count of duplicates
- * @deprecated This will be removed in Tomcat 11
- */
-@Deprecated
-public int getDuplicates() {
-return duplicates;
-}
-
-
-/**
- * Set duplicates count.
- * @param duplicates the new duplicates count
- * @deprecated This will be removed in Tomcat 11
- */
-@Deprecated
-public void setDuplicates(int duplicates) {
-this.duplicates = duplicates;
-}
-
-
@Override
public int getActiveSessions() {
return sessions.size();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Bump version numbers
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 3972a030b4 Bump version numbers 3972a030b4 is described below commit 3972a030b4db63c08bd1de99659a481c6c5aae9d Author: remm AuthorDate: Thu Apr 11 20:58:18 2024 +0200 Bump version numbers --- modules/openssl-foreign/pom.xml | 2 +- modules/openssl-java17/pom.xml | 2 +- modules/openssl-java21/pom.xml | 2 +- modules/stuffed/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openssl-foreign/pom.xml b/modules/openssl-foreign/pom.xml index 5a926d3d23..a484633961 100644 --- a/modules/openssl-foreign/pom.xml +++ b/modules/openssl-foreign/pom.xml @@ -31,7 +31,7 @@ 0.1-SNAPSHOT -11.0.0-M14 +11.0.0-M18 2021-12-02T12:00:00Z diff --git a/modules/openssl-java17/pom.xml b/modules/openssl-java17/pom.xml index 6ea18cba54..ed7a336e4b 100644 --- a/modules/openssl-java17/pom.xml +++ b/modules/openssl-java17/pom.xml @@ -31,7 +31,7 @@ 0.1-SNAPSHOT -9.0.83 +9.0.87 2021-12-02T12:00:00Z diff --git a/modules/openssl-java21/pom.xml b/modules/openssl-java21/pom.xml index 0bea4f06bf..a06e972e8e 100644 --- a/modules/openssl-java21/pom.xml +++ b/modules/openssl-java21/pom.xml @@ -31,7 +31,7 @@ 0.1-SNAPSHOT -9.0.83 +9.0.87 2021-12-02T12:00:00Z diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml index a45c58b901..b8ce011bd9 100644 --- a/modules/stuffed/pom.xml +++ b/modules/stuffed/pom.xml @@ -29,7 +29,7 @@ UTF-8 org.apache.catalina.startup.Tomcat -11.0.0-M16 +11.0.0-M18 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Revert option that breaks on Java 11
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 86b7beeb8e Revert option that breaks on Java 11 86b7beeb8e is described below commit 86b7beeb8eb52ef8854fe4dacaf639279075e0ed Author: remm AuthorDate: Thu Apr 11 20:55:00 2024 +0200 Revert option that breaks on Java 11 Caused by a testing error. --- bin/catalina.bat | 1 - bin/catalina.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/bin/catalina.bat b/bin/catalina.bat index 9a30371013..9c55ae940e 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -223,7 +223,6 @@ set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.io=ALL-UNNAMED" set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.util=ALL-UNNAMED" set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" -set "JAVA_OPTS=%JAVA_OPTS% --enable-native-access=ALL-UNNAMED" rem - Execute The Requested Command --- diff --git a/bin/catalina.sh b/bin/catalina.sh index ed647a2dea..32f87ffb6f 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -296,7 +296,6 @@ JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --enable-native-access=ALL-UNNAMED" # - Execute The Requested Command - - 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: Deprecate sessionCounter and duplicates statistics
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new a41afc8e80 Deprecate sessionCounter and duplicates statistics
a41afc8e80 is described below
commit a41afc8e804835e5c20b37d48e4a339e398fdc1c
Author: remm
AuthorDate: Thu Apr 11 16:47:23 2024 +0200
Deprecate sessionCounter and duplicates statistics
Will be removed in Tomcat 11.
Replaced with: sessionCounter = activeSessions + expiredSessions.
Related to PR713 since tracking this statistic does not seem that
worthwhile.
Duplicates is removed since it is supposed to track collisions from the
id generator. If feedback is that this is useful, will be replaced by a
scary log instead when a collision occurs.
---
java/org/apache/catalina/Manager.java | 6 +++-
.../apache/catalina/ha/session/DeltaManager.java | 6 +---
java/org/apache/catalina/session/ManagerBase.java | 40 +++---
.../apache/catalina/session/StandardManager.java | 1 -
webapps/docs/changelog.xml | 11 ++
5 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/catalina/Manager.java
b/java/org/apache/catalina/Manager.java
index 6ade69155d..ad59ac6a9f 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -76,7 +76,9 @@ public interface Manager {
/**
- * Returns the total number of sessions created by this manager.
+ * Returns the total number of sessions created by this manager, which is
+ * approximated as the number of active sessions plus the number of
+ * expired sessions.
*
* @return Total number of sessions created by this manager.
*/
@@ -87,7 +89,9 @@ public interface Manager {
* Sets the total number of sessions created by this manager.
*
* @param sessionCounter Total number of sessions created by this manager.
+ * @deprecated This will be removed in Tomcat 11
*/
+@Deprecated
void setSessionCounter(long sessionCounter);
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 5183025868..a3653c74c9 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -691,10 +691,7 @@ public class DeltaManager extends ClusterManagerBase {
session.setAccessCount(0);
session.resetDeltaRequest();
// FIXME How inform other session id cache like SingleSignOn
-// increment sessionCounter to correct stats report
-if (findSession(session.getIdInternal()) == null) {
-sessionCounter++;
-} else {
+if (findSession(session.getIdInternal()) != null) {
sessionReplaceCounter++;
// FIXME better is to grap this sessions again !
if (log.isWarnEnabled()) {
@@ -1098,7 +1095,6 @@ public class DeltaManager extends ClusterManagerBase {
sessionReplaceCounter = 0;
counterNoStateTransferred = 0;
setMaxActive(getActiveSessions());
-sessionCounter = getActiveSessions();
counterReceive_EVT_ALL_SESSION_DATA = 0;
counterReceive_EVT_GET_ALL_SESSIONS = 0;
counterReceive_EVT_SESSION_ACCESSED = 0;
diff --git a/java/org/apache/catalina/session/ManagerBase.java
b/java/org/apache/catalina/session/ManagerBase.java
index cd144bb524..bd31322f79 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -127,7 +127,11 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
*/
protected Map sessions = new ConcurrentHashMap<>();
-// Number of sessions created by this manager
+/**
+ * Number of sessions created by this manager.
+ * @deprecated This will be removed in Tomcat 11
+ */
+@Deprecated
protected long sessionCounter = 0;
protected volatile int maxActive = 0;
@@ -144,7 +148,11 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
*/
protected int rejectedSessions = 0;
-// number of duplicated session ids - anything >0 means we have problems
+/**
+ * Number of duplicated session ids, anything > 0 means we have problems.
+ * @deprecated This will be removed in Tomcat 11
+ */
+@Deprecated
protected volatile int duplicates = 0;
/**
@@ -718,7 +726,6 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
id = generateSessionId();
}
session.setId(id);
-sessionCounter++;
SessionTiming timing = new S
(tomcat) branch 10.1.x updated: Deprecate sessionCounter and duplicates statistics
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 0eafa69cb7 Deprecate sessionCounter and duplicates statistics
0eafa69cb7 is described below
commit 0eafa69cb752ccbafb421f1e6e3f23f8b87a1d57
Author: remm
AuthorDate: Thu Apr 11 16:47:23 2024 +0200
Deprecate sessionCounter and duplicates statistics
Will be removed in Tomcat 11.
Replaced with: sessionCounter = activeSessions + expiredSessions.
Related to PR713 since tracking this statistic does not seem that
worthwhile.
Duplicates is removed since it is supposed to track collisions from the
id generator. If feedback is that this is useful, will be replaced by a
scary log instead when a collision occurs.
---
java/org/apache/catalina/Manager.java | 6 +++-
.../apache/catalina/ha/session/DeltaManager.java | 6 +---
java/org/apache/catalina/session/ManagerBase.java | 40 +++---
.../apache/catalina/session/StandardManager.java | 1 -
webapps/docs/changelog.xml | 11 ++
5 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/catalina/Manager.java
b/java/org/apache/catalina/Manager.java
index 41e3211945..b8438b1150 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -76,7 +76,9 @@ public interface Manager {
/**
- * Returns the total number of sessions created by this manager.
+ * Returns the total number of sessions created by this manager, which is
+ * approximated as the number of active sessions plus the number of
+ * expired sessions.
*
* @return Total number of sessions created by this manager.
*/
@@ -87,7 +89,9 @@ public interface Manager {
* Sets the total number of sessions created by this manager.
*
* @param sessionCounter Total number of sessions created by this manager.
+ * @deprecated This will be removed in Tomcat 11
*/
+@Deprecated
void setSessionCounter(long sessionCounter);
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 2bb7439986..3fd0b961e0 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -572,10 +572,7 @@ public class DeltaManager extends ClusterManagerBase {
session.setAccessCount(0);
session.resetDeltaRequest();
// FIXME How inform other session id cache like SingleSignOn
-// increment sessionCounter to correct stats report
-if (findSession(session.getIdInternal()) == null) {
-sessionCounter++;
-} else {
+if (findSession(session.getIdInternal()) != null) {
sessionReplaceCounter++;
// FIXME better is to grap this sessions again !
if (log.isWarnEnabled()) {
@@ -979,7 +976,6 @@ public class DeltaManager extends ClusterManagerBase {
sessionReplaceCounter = 0;
counterNoStateTransferred = 0;
setMaxActive(getActiveSessions());
-sessionCounter = getActiveSessions();
counterReceive_EVT_ALL_SESSION_DATA = 0;
counterReceive_EVT_GET_ALL_SESSIONS = 0;
counterReceive_EVT_SESSION_ACCESSED = 0;
diff --git a/java/org/apache/catalina/session/ManagerBase.java
b/java/org/apache/catalina/session/ManagerBase.java
index 405f6762cd..794972045b 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -127,7 +127,11 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
*/
protected Map sessions = new ConcurrentHashMap<>();
-// Number of sessions created by this manager
+/**
+ * Number of sessions created by this manager.
+ * @deprecated This will be removed in Tomcat 11
+ */
+@Deprecated
protected long sessionCounter = 0;
protected volatile int maxActive = 0;
@@ -144,7 +148,11 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
*/
protected int rejectedSessions = 0;
-// number of duplicated session ids - anything >0 means we have problems
+/**
+ * Number of duplicated session ids, anything > 0 means we have problems.
+ * @deprecated This will be removed in Tomcat 11
+ */
+@Deprecated
protected volatile int duplicates = 0;
/**
@@ -710,7 +718,6 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
id = generateSessionId();
}
session.setId(id);
-sessionCounter++;
SessionTiming timing = new S
(tomcat) branch main updated: Deprecate sessionCounter and duplicates statistics
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new f8bb3601e6 Deprecate sessionCounter and duplicates statistics
f8bb3601e6 is described below
commit f8bb3601e610d7c0f5d7c108099f8cb9265224f6
Author: remm
AuthorDate: Thu Apr 11 16:47:23 2024 +0200
Deprecate sessionCounter and duplicates statistics
Will be removed in Tomcat 11.
Replaced with: sessionCounter = activeSessions + expiredSessions.
Related to PR713 since tracking this statistic does not seem that
worthwhile.
Duplicates is removed since it is supposed to track collisions from the
id generator. If feedback is that this is useful, will be replaced by a
scary log instead when a collision occurs.
---
java/org/apache/catalina/Manager.java | 6 +++-
.../apache/catalina/ha/session/DeltaManager.java | 6 +---
java/org/apache/catalina/session/ManagerBase.java | 40 +++---
.../apache/catalina/session/StandardManager.java | 1 -
webapps/docs/changelog.xml | 11 ++
5 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/catalina/Manager.java
b/java/org/apache/catalina/Manager.java
index 41e3211945..b8438b1150 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -76,7 +76,9 @@ public interface Manager {
/**
- * Returns the total number of sessions created by this manager.
+ * Returns the total number of sessions created by this manager, which is
+ * approximated as the number of active sessions plus the number of
+ * expired sessions.
*
* @return Total number of sessions created by this manager.
*/
@@ -87,7 +89,9 @@ public interface Manager {
* Sets the total number of sessions created by this manager.
*
* @param sessionCounter Total number of sessions created by this manager.
+ * @deprecated This will be removed in Tomcat 11
*/
+@Deprecated
void setSessionCounter(long sessionCounter);
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 2bb7439986..3fd0b961e0 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -572,10 +572,7 @@ public class DeltaManager extends ClusterManagerBase {
session.setAccessCount(0);
session.resetDeltaRequest();
// FIXME How inform other session id cache like SingleSignOn
-// increment sessionCounter to correct stats report
-if (findSession(session.getIdInternal()) == null) {
-sessionCounter++;
-} else {
+if (findSession(session.getIdInternal()) != null) {
sessionReplaceCounter++;
// FIXME better is to grap this sessions again !
if (log.isWarnEnabled()) {
@@ -979,7 +976,6 @@ public class DeltaManager extends ClusterManagerBase {
sessionReplaceCounter = 0;
counterNoStateTransferred = 0;
setMaxActive(getActiveSessions());
-sessionCounter = getActiveSessions();
counterReceive_EVT_ALL_SESSION_DATA = 0;
counterReceive_EVT_GET_ALL_SESSIONS = 0;
counterReceive_EVT_SESSION_ACCESSED = 0;
diff --git a/java/org/apache/catalina/session/ManagerBase.java
b/java/org/apache/catalina/session/ManagerBase.java
index a0e0d716a4..68bb0195d7 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -127,7 +127,11 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
*/
protected Map sessions = new ConcurrentHashMap<>();
-// Number of sessions created by this manager
+/**
+ * Number of sessions created by this manager.
+ * @deprecated This will be removed in Tomcat 11
+ */
+@Deprecated
protected long sessionCounter = 0;
protected volatile int maxActive = 0;
@@ -144,7 +148,11 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
*/
protected int rejectedSessions = 0;
-// number of duplicated session ids - anything >0 means we have problems
+/**
+ * Number of duplicated session ids, anything > 0 means we have problems.
+ * @deprecated This will be removed in Tomcat 11
+ */
+@Deprecated
protected volatile int duplicates = 0;
/**
@@ -695,7 +703,6 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
id = generateSessionId();
}
session.setId(id);
-sessionCounter++;
SessionTiming timing = new S
(tomcat) branch 10.1.x updated: Add OpenSSL FFM classes to tomcat-embed-core
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 844ec7f9f6 Add OpenSSL FFM classes to tomcat-embed-core 844ec7f9f6 is described below commit 844ec7f9f6fb4d0af8e2df296932c594ae6f784a Author: remm AuthorDate: Thu Apr 11 11:53:49 2024 +0200 Add OpenSSL FFM classes to tomcat-embed-core --- res/bnd/tomcat-embed-core.jar.tmp.bnd | 2 ++ webapps/docs/changelog.xml| 3 +++ 2 files changed, 5 insertions(+) diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd b/res/bnd/tomcat-embed-core.jar.tmp.bnd index bf5f844e2f..067a86fd6f 100644 --- a/res/bnd/tomcat-embed-core.jar.tmp.bnd +++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd @@ -82,6 +82,8 @@ Export-Package: \ org.apache.tomcat.util.net,\ org.apache.tomcat.util.net.openssl,\ org.apache.tomcat.util.net.openssl.ciphers,\ +org.apache.tomcat.util.net.openssl.panama,\ +org.apache.tomcat.util.openssl,\ org.apache.tomcat.util.res,\ org.apache.tomcat.util.scan,\ org.apache.tomcat.util.security,\ diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 53ead63848..efef5c49bd 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -110,6 +110,9 @@ Fix bnd jar descriptor to include the OpenSSL FFM support. (remm) + +Add OpenSSL FFM classes to tomcat-embed-core.jar. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add OpenSSL FFM classes to tomcat-embed-core
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new b33f4d4f8f Add OpenSSL FFM classes to tomcat-embed-core b33f4d4f8f is described below commit b33f4d4f8f9b4151c8d2fbe416368ba7ec4ee889 Author: remm AuthorDate: Thu Apr 11 11:53:49 2024 +0200 Add OpenSSL FFM classes to tomcat-embed-core --- res/bnd/tomcat-embed-core.jar.tmp.bnd | 2 ++ webapps/docs/changelog.xml| 7 +++ 2 files changed, 9 insertions(+) diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd b/res/bnd/tomcat-embed-core.jar.tmp.bnd index e3cce68d88..4dc0cda772 100644 --- a/res/bnd/tomcat-embed-core.jar.tmp.bnd +++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd @@ -82,6 +82,8 @@ Export-Package: \ org.apache.tomcat.util.net,\ org.apache.tomcat.util.net.openssl,\ org.apache.tomcat.util.net.openssl.ciphers,\ +org.apache.tomcat.util.net.openssl.panama,\ +org.apache.tomcat.util.openssl,\ org.apache.tomcat.util.res,\ org.apache.tomcat.util.scan,\ org.apache.tomcat.util.security,\ diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b380cb21e5..b28c567093 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,13 @@ issues do not "pop up" wrt. others). --> + + + +Add OpenSSL FFM classes to tomcat-embed-core.jar. (remm) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix bnd packaging for the tomcat-coyote jar
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new cfb055095d Fix bnd packaging for the tomcat-coyote jar cfb055095d is described below commit cfb055095dc8b4f7b982253cd6449646f4e829d1 Author: remm AuthorDate: Thu Apr 11 11:16:05 2024 +0200 Fix bnd packaging for the tomcat-coyote jar --- res/bnd/tomcat-coyote.jar.tmp.bnd | 4 +++- webapps/docs/changelog.xml| 13 - 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/res/bnd/tomcat-coyote.jar.tmp.bnd b/res/bnd/tomcat-coyote.jar.tmp.bnd index 0f9314adf3..9900a31ccc 100644 --- a/res/bnd/tomcat-coyote.jar.tmp.bnd +++ b/res/bnd/tomcat-coyote.jar.tmp.bnd @@ -37,7 +37,9 @@ Export-Package: \ org.apache.tomcat.util.net,\ org.apache.tomcat.util.net.jsse,\ org.apache.tomcat.util.net.openssl,\ -org.apache.tomcat.util.net.openssl.ciphers +org.apache.tomcat.util.net.openssl.ciphers,\ +org.apache.tomcat.util.net.openssl.panama,\ +org.apache.tomcat.util.openssl -includepackage: \ org.apache.tomcat.util.bcel,\ diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 269ca46299..53ead63848 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,18 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + + +Fix bnd jar descriptor to include the OpenSSL FFM support. (remm) + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Revert "Add Java 22+ check for release"
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 2ee3c2e22f Revert "Add Java 22+ check for release" 2ee3c2e22f is described below commit 2ee3c2e22f0935b0d3ad1a3009b01db50d2c18c5 Author: remm AuthorDate: Wed Apr 10 23:45:34 2024 +0200 Revert "Add Java 22+ check for release" This reverts commit 8803269601aa83fe356ee7b1c72727ae2aace004. --- build.xml | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 19e575a11e..7c4cbfaadf 100644 --- a/build.xml +++ b/build.xml @@ -2699,11 +2699,16 @@ skip.installer property in build.properties" /> + + + + +JAVA VERSION 22 OR NEWER IS REQUIRED FOR RELEASE - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add Java 22+ check for release
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 8803269601 Add Java 22+ check for release 8803269601 is described below commit 8803269601aa83fe356ee7b1c72727ae2aace004 Author: remm AuthorDate: Wed Apr 10 20:44:22 2024 +0200 Add Java 22+ check for release --- build.xml | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 7c4cbfaadf..19e575a11e 100644 --- a/build.xml +++ b/build.xml @@ -2699,16 +2699,11 @@ skip.installer property in build.properties" /> - - - - -JAVA VERSION 22 OR NEWER IS REQUIRED FOR RELEASE + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add Java 22+ check for release
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new d2f8d8351f Add Java 22+ check for release d2f8d8351f is described below commit d2f8d8351fe66e153ca5d5fde15cef820f70cfef Author: remm AuthorDate: Wed Apr 10 20:44:22 2024 +0200 Add Java 22+ check for release --- build.xml | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 636072a402..ecc7ee4767 100644 --- a/build.xml +++ b/build.xml @@ -2671,16 +2671,11 @@ skip.installer property in build.properties" /> - - - - -JAVA VERSION 22 OR NEWER IS REQUIRED FOR RELEASE + - 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: Next is 9.0.89
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new a90704ab50 Next is 9.0.89 a90704ab50 is described below commit a90704ab5015395314846b324935f833bdc6d81e Author: remm AuthorDate: Tue Apr 9 15:52:17 2024 +0200 Next is 9.0.89 --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 9033fe4eba..b597c46e56 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=9 version.minor=0 -version.build=88 +version.build=89 version.patch=0 version.suffix= version.dev=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index d4acd46e6c..b18bc924c5 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=9.0.88 +maven.asf.release.deploy.version=9.0.89 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9f6d7f51b5..21aac5e54c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r68406 - in /dev/tomcat/tomcat-9/v9.0.88: ./ bin/ bin/embed/ src/
Author: remm Date: Tue Apr 9 13:29:15 2024 New Revision: 68406 Log: Upload Tomcat 9.0.88 for voting Added: dev/tomcat/tomcat-9/v9.0.88/ dev/tomcat/tomcat-9/v9.0.88/KEYS dev/tomcat/tomcat-9/v9.0.88/README.html dev/tomcat/tomcat-9/v9.0.88/RELEASE-NOTES dev/tomcat/tomcat-9/v9.0.88/bin/ dev/tomcat/tomcat-9/v9.0.88/bin/README.html dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.zip (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.zip.sha512 dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-fulldocs.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-fulldocs.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x64.zip (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x64.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x64.zip.sha512 dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x86.zip (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x86.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x86.zip.sha512 dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.exe (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.exe.asc (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.exe.sha512 dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.zip (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.zip.sha512 dev/tomcat/tomcat-9/v9.0.88/bin/embed/ dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.zip (with props) dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.zip.sha512 dev/tomcat/tomcat-9/v9.0.88/src/ dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.zip (with props) dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.zip.sha512 Added: dev/tomcat/tomcat-9/v9.0.88/KEYS == --- dev/tomcat/tomcat-9/v9.0.88/KEYS (added) +++ dev/tomcat/tomcat-9/v9.0.88/KEYS Tue Apr 9 13:29:15 2024 @@ -0,0 +1,237 @@ +This file contains the PGP keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 1024D/33C60243 2004-09-12 + Key fingerprint = DCFD 35E0 BF8C A734 4752 DE8B 6FB2 1E89 33C6 0243 +uid Mark E D Thomas +uid Mark E D Thomas +uid Mark E D Thomas +sub 2048g/0BECE548 2004-09-12 + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.9 (MingW32) + +mQGiBEFEjegRBADocGttfROvtLGrTOW3xRqZHmFWybmEaI6jmnRdN/1gGXmb3wQL +rHsS3fLFIIOYLPph0Kov9q4qNq36LekShIvjMBDFoj2/wRxaUtFq81asaRZg8Mcw +4kVeIoe8OIOuWmvYhU8SH2jJNUnVVrpTPAa6QWquTmseNi6UJMjLxuL7DwCg//9u +k2yj0vk6e4WSO6Fe5+EkQDED/AjQsy0kj9TpNHkKSSUR2evRlWPYA0YtxBSbsgON +tT0cYipAp5IcYt6Zq5QzHiZr
(tomcat) 01/01: Tag 9.0.88
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to tag 9.0.88 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit e644d98329aca2ccf7f2014c0670c5fabc7fcb16 Author: remm AuthorDate: Tue Apr 9 15:26:34 2024 +0200 Tag 9.0.88 --- build.properties.release | 54 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10202 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10202 bytes res/maven/mvn.properties.release | 27 webapps/docs/changelog.xml | 2 +- 5 files changed, 82 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..49010a3b57 --- /dev/null +++ b/build.properties.release @@ -0,0 +1,54 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Any unwanted settings may be over-ridden in a build.properties file located +# in the same directory as this file. + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds. +ant.tstamp.now.iso=2024-04-09T13:22:30Z + +# Enable insertion of detached signatures into the Windows installer. +do.codesigning=true + +# Re-use the same GPG executable. +gpg.exec=/usr/bin/gpg + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process. +# +# Apache Ant: Apache Ant(TM) version 1.10.14 compiled on August 16 2023 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Eclipse Adoptium +# Java Version:17.0.10+7 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build environment is consistent with this information. +# +# OS: amd64 Linux 6.8.4-200.fc39.x86_64 +# File encoding: UTF-8 +# +# Release Manager: remm +release-java-version=17.0.10+7 +release-ant-version=1.10.14 diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..6239f3bda2 Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..6fc50c9262 Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..3c38627728 --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Remove "-dev" from the version since this is not a development release. +maven.asf.release.deploy.version=9.0.88 + +# Re-use the
(tomcat) tag 9.0.88 created (now e644d98329)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to tag 9.0.88 in repository https://gitbox.apache.org/repos/asf/tomcat.git at e644d98329 (commit) This tag includes the following new commits: new e644d98329 Tag 9.0.88 The 1 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. - 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: Avoid sendError ISE
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new bfb6ffcad7 Avoid sendError ISE
bfb6ffcad7 is described below
commit bfb6ffcad7cea76712f5e398fb4c19a5d10248ac
Author: remm
AuthorDate: Tue Apr 9 14:23:35 2024 +0200
Avoid sendError ISE
BZ68862
---
java/org/apache/catalina/filters/FailedRequestFilter.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java
b/java/org/apache/catalina/filters/FailedRequestFilter.java
index 2d14bac26d..8d4e451c6b 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -87,7 +87,11 @@ public class FailedRequestFilter extends FilterBase {
break;
}
-((HttpServletResponse) response).sendError(status);
+try {
+((HttpServletResponse) response).sendError(status);
+} catch (IllegalStateException e) {
+// Already committed, ignore
+}
return;
}
chain.doFilter(request, response);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Avoid sendError ISE
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new a2ab554c33 Avoid sendError ISE
a2ab554c33 is described below
commit a2ab554c335fa30931473ad9314456dab7ddf874
Author: remm
AuthorDate: Tue Apr 9 14:23:35 2024 +0200
Avoid sendError ISE
BZ68862
---
java/org/apache/catalina/filters/FailedRequestFilter.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java
b/java/org/apache/catalina/filters/FailedRequestFilter.java
index 389575c7ce..bbed7cbd8a 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -87,7 +87,11 @@ public class FailedRequestFilter extends FilterBase {
break;
}
-((HttpServletResponse) response).sendError(status);
+try {
+((HttpServletResponse) response).sendError(status);
+} catch (IllegalStateException e) {
+// Already committed, ignore
+}
return;
}
chain.doFilter(request, response);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Next is M20
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 61531b18be Next is M20 61531b18be is described below commit 61531b18be5905da7d1e4d2282c6e6cae2a32a2a Author: remm AuthorDate: Tue Apr 9 14:22:22 2024 +0200 Next is M20 --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 0780fd796b..0d6d7cabdc 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=11 version.minor=0 version.build=0 version.patch=0 -version.suffix=-M19 +version.suffix=-M20 version.dev=-dev # - Build tools - diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index c6ec943726..b24d1afa20 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=11.0.0-M19 +maven.asf.release.deploy.version=11.0.0-M20 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 52b61cd0d1..b380cb21e5 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r68404 - in /dev/tomcat/tomcat-11/v11.0.0-M19: ./ bin/ bin/embed/ src/
Author: remm Date: Tue Apr 9 12:13:57 2024 New Revision: 68404 Log: Upload Tomcat 11.0.0-M19 for voting Added: dev/tomcat/tomcat-11/v11.0.0-M19/ dev/tomcat/tomcat-11/v11.0.0-M19/KEYS dev/tomcat/tomcat-11/v11.0.0-M19/README.html dev/tomcat/tomcat-11/v11.0.0-M19/RELEASE-NOTES dev/tomcat/tomcat-11/v11.0.0-M19/bin/ dev/tomcat/tomcat-11/v11.0.0-M19/bin/README.html dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.tar.gz.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.zip.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-fulldocs.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-fulldocs.tar.gz.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-windows-x64.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-windows-x64.zip.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-windows-x64.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.exe (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.exe.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.exe.sha512 dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.tar.gz.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.zip.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/ dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.tar.gz.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.zip.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M19/src/ dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.tar.gz.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.zip.asc (with props) dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.zip.sha512 Added: dev/tomcat/tomcat-11/v11.0.0-M19/KEYS == --- dev/tomcat/tomcat-11/v11.0.0-M19/KEYS (added) +++ dev/tomcat/tomcat-11/v11.0.0-M19/KEYS Tue Apr 9 12:13:57 2024 @@ -0,0 +1,514 @@ +This file contains the PGP keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M +UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq
(tomcat) tag 11.0.0-M19 created (now 19e301275f)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to tag 11.0.0-M19 in repository https://gitbox.apache.org/repos/asf/tomcat.git at 19e301275f (commit) This tag includes the following new commits: new 19e301275f Tag 11.0.0-M19 The 1 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. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/01: Tag 11.0.0-M19
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to tag 11.0.0-M19 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 19e301275f23056e3c46ab296c87cf6e16fbe68f Author: remm AuthorDate: Tue Apr 9 14:10:33 2024 +0200 Tag 11.0.0-M19 --- build.properties.release | 54 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10202 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10202 bytes res/maven/mvn.properties.release | 27 webapps/docs/changelog.xml | 2 +- 5 files changed, 82 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..bfc17d64d9 --- /dev/null +++ b/build.properties.release @@ -0,0 +1,54 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Any unwanted settings may be over-ridden in a build.properties file located +# in the same directory as this file. + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds. +ant.tstamp.now.iso=2024-04-09T12:06:10Z + +# Enable insertion of detached signatures into the Windows installer. +do.codesigning=true + +# Re-use the same GPG executable. +gpg.exec=/usr/bin/gpg + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process. +# +# Apache Ant: Apache Ant(TM) version 1.10.14 compiled on August 16 2023 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Eclipse Adoptium +# Java Version:22+36 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build environment is consistent with this information. +# +# OS: amd64 Linux 6.8.4-200.fc39.x86_64 +# File encoding: UTF-8 +# +# Release Manager: remm +release-java-version=22+36 +release-ant-version=1.10.14 diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..52b3cd5fe8 Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..43a67b8e2d Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..393a8b3fda --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Remove "-dev" from the version since this is not a development release. +maven.asf.release.deploy.version=11.0.0-M19 + +# Re-use
(tomcat) branch main updated: Add sign key
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9c107b50f5 Add sign key 9c107b50f5 is described below commit 9c107b50f5e25145d787dfe8a69a962d558c1ef1 Author: remm AuthorDate: Tue Apr 9 14:05:36 2024 +0200 Add sign key --- KEYS | 61 + 1 file changed, 61 insertions(+) diff --git a/KEYS b/KEYS index 4b5ee9f4ca..9d46a9cfe6 100644 --- a/KEYS +++ b/KEYS @@ -451,3 +451,64 @@ wgS+SH6oAHlGwpxhhzXBlqZsHXm+w+2oazWUhxFFGEe5U245GEtNf0AznBMDWTqg yZUcTCEB33B2jQ9z0XUEp+6B2F5iZQ== =4AB7 -END PGP PUBLIC KEY BLOCK- + +pub rsa4096 2019-05-05 [SC] + 48F8 E69F 6390 C9F2 5CFE DCD2 6824 8959 359E 722B +uid [ultimate] Remy Maucherat +sig 368248959359E722B 2019-05-05 Remy Maucherat +sub rsa4096 2019-05-05 [E] +sig 68248959359E722B 2019-05-05 Remy Maucherat + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFzO4ecBEACVS86VyuTSJmLmApi92R6D3/L3EIBFXhagJbrLkodkTuG9efYo +vM1DJPWEFs5kux8a8UPwn2gbQFPJg1AH77GqjP8gtn0KHQvXgYC9+7cTqDl6C7k9 +n3BkB9bRIhHileYyIJfnycjJdrGFEmwGu0pBOEdr01R0kFprqYu9DwcD6oUvmZRn +OMoQQeLEC0cw/VzJ/ZqzJwO0t+rMCozqJ9/BfJZUqwijDZnJAZWnIVxjqxrUgyYA +5/0g9X8YHrIz09XuzaE64VAl0q3nrFJWvDCwE/ZM7w8jlUqtQgLu4K2U82G0YXw3 +KJ1EbigEmtEohu6HVnAToCJuOnQ8m0rZxbyNMeYF9pyohdFEca4I0B8Evy2dYFnJ +Y2gghuU80vct54536WWz9mAjKwBFQUtxX0EjYrYN9ckzCK6fRqrnVv0USVp7N/ZY +PQkOEJSdmRdpvTMwfCuAyT0/3cxuC7NyAWiZDXJv7OVcDr/REfWAA7XMQOErwdGJ +gViG58YhLw0Pgdumg+prqQXowzlRzGAsV5VntCh+4LV8/ESmvWAE3V+jgZFB3cSp +g58NKjp1EwKwX6BCICyX+Oe03cnlC0UJ7S9FccrjNrkiwxxOVAnmy4kxX/P3Cuqc +C/b6BeeUA1hBNWNe42mr6YczS+dhpCSUVWQJp/TxdoXA2fGG1OS1FMaICwARAQAB +tCBSZW15IE1hdWNoZXJhdCA8cmVtbUBhcGFjaGUub3JnPokCOAQTAQIAIgUCXM7h +5wIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQaCSJWTWecisVSA/9Eh3h +0jeyy51rA1nqq9imbH0YC85A/wZjhb06UXwWBPozJR8UJsOJZ7kBzCW4gfkC9zTD +GStSHHAej9o96FHVRLzCyjaaZVuRUl2qCz9U+pnGMxb5aRNVAQ/wE10hHu3Yc+48 +cc0sPCCPMdshAj1VOHczTU/LSv21TWBaKO3NMV9KilPzKvXHdPFYssVcUt2NgQLm +2Bx/ELTCVj5c9Ih2cz3T7kxf8LKsGALIfjcp8g9DlvMjVLKBFZqU94C4V0mba2Fd +6xHpdmcgMbSNo6poQ0M0O7CN5qVJFm/v4ZDooLNWRMeL66oen3LrZ8HRpPxfic77 +JLKn60dywuYU8WYp7cV+3AnaDn/ggvC1x79LSmX4PFyG9/F5M7gp0HFrVdyc0nBo +UTejZXehwKrfvF/isPf7pUv2fGXwg07zTz8OMLQo4h9poB5YuuinjuxjBfmc2AvB +WbRcKNvHXHUlaVeK+VvohfPuetJESS4YB7fLMQPdGIckDFQub4SvXPNPPToLsbDB +2GGguqhwWD9ECa2o1RqX8LnCdB71uBcyiW8UIkLxwaygsciVm7SFz+pqAKJgzWwI +AsVYVOIKdq0GWaLDtMGJGQFfxuMVmMGGbvueAMcOCSSsGemkElan33VS8Zu1sjeY +P0Jt4ws6gcbUHI27l5Pvk06uWzaN8uyXGA03d4y5Ag0EXM7h5wEQALG3oikRAQqf +um+wW6oW2d1mIk0PtnC3l3/kGTA92kIqJzQ3Ua0mFaVGxdg2J/I1MF7HdlZJbGyP +5b0PdbSjLHFbQfFD6LHsLw9StVrkjbBKYaP0gRWxEIHMN4Qv01I2Lyc9ONlMjUIf +xNK/AG6oT/Ia53VVET78HOj01L7JjBAPuW8UPoy27s2gQ02smbA7iRUeZ3dpN2fy +027aKbimIl1ZrxJbcbxw29PXWJZP+CxJEnqwEw78QbqSsFMAhR9wZHTfEtUzYy6h +hyngwYQ+iBnB+1cYTEB9KbWWpP5n12iuRin77r2RwrHYAW/RUILK2rOJqPcIg6CX +P1o9UKPeN5QE/ScU5427XKZZscaQrvBPoN3G2RWmMuHM2cchXgRRMMaSvufocLjj +gKj/aPUDCkvJ5MyTNtMfVDx0Tw3aQpf2Fr1L1Hu2GyBqifioZGdzLL0LtdeXzkJy +nZGj/L5jzIlNBnQG97rgCuPflbIl2S1izNexnuX2Z1dcyS2MTrj3nnK6HoW+gvCc +oqq01S410wxaAUidJeGwLzgUa9Ig+6BVPT7sZrbc0IoNP+JdoqPxiEkqy4Msy9WJ +RVeJM520Q2T1YM7xm/4E8C7H+Fis5u4GNswk5qsXEOyLcHBzGEik3BDylp+sJ6/F +DuAN7k64RV2m+lKpjngiKZxo9LmqnsWTABEBAAGJAh8EGAECAAkFAlzO4ecCGwwA +CgkQaCSJWTWecishvg//ZDuhkbSUgIIjG9Rzq3cHNxZ4sFrUwL19AtGNktiwt0QA +GCKPnf4SdHZGKSeOqUHeDT/l/5l4Xc/JgRk/t2bEeC3cHE/Xc5V6I2n28HQiJScX +UJdnO3QdTCMEYVedu/9JhmA37eznQhm+UAcxT9tew3nSd0KkkMQyW6YpBEgcdsFd +aLiFPzbySjRWplyCdELPRFtW2ZHnJ5gVGYZ060EOHcdPb/4Gz/mA6dIjQ5N+vKlA +GNdYZgv3w4NRGLmni5T7jDAY6T2CJXxvcgfYfh3oY3aiZaWzKKQyLEVaoZ6dJbsm +mi2if7MZ/SVCMdM3MXiRpCeyyw9MTylGzgwbDYSz2ZkGvy9k+1M75q5QEfvVM8R3 +guaBJR+e4fkfsRBUAqwmHy8TrXghf5eOCsJx/9yyRXvK4tnwSBUIzFa1q0POESul +jFWYFkvRjKIYfFWS6cY37sPNLvEQQmP2O07ttaYfIXcMcVF+HsDBUftGRWIkkPn2 +LucW7f0Lqlbv/mlJpqByz522jmJRNFLVQh87LYz91FgsLAgDkPpi8mzRrEfb2nHD ++PIKpoO499AKQ8hETMbfzmpJUIV2Bhd7OqKDSf+yHiYSje9evofP+4lDUx3u7tQ3 +4OUzLqBRVrhFDI9keHnhOFMJSrnrpXe7Cm9JujvTX/hy2iOpTOuflj0Djsc8dnQ= +=l4Ry +-END PGP PUBLIC KEY BLOCK- + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add release date
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 129b79c1a0 Add release date 129b79c1a0 is described below commit 129b79c1a0dd1ac60f8d9625643220adafb61d8f Author: remm AuthorDate: Tue Apr 9 10:04:48 2024 +0200 Add release date --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f15e82d6ef..269ca46299 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -159,7 +159,7 @@ - + - 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: Handle response committed when processing read error
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 0970fbaa12 Handle response committed when processing read error
0970fbaa12 is described below
commit 0970fbaa12a45b31117b94e2781f8b7fa5c37f07
Author: remm
AuthorDate: Tue Apr 9 09:58:22 2024 +0200
Handle response committed when processing read error
BZ68862
---
java/org/apache/catalina/connector/InputBuffer.java | 16 ++--
webapps/docs/changelog.xml | 4
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/connector/InputBuffer.java
b/java/org/apache/catalina/connector/InputBuffer.java
index b9f67768a9..162c6fd314 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -332,9 +332,21 @@ public class InputBuffer extends Reader implements
ByteChunk.ByteInputChannel, A
Response response = request.getResponse();
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, e);
if (e instanceof SocketTimeoutException) {
-response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+try {
+response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_REQUEST_TIMEOUT);
+response.setError();
+}
} else {
-response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+try {
+response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+response.setError();
+}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 358930589e..9f6d7f51b5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,6 +139,10 @@
file via the Servlet API and the file is larger than
Integer.MAX_VALUE. (markt)
+
+68862: Handle possible response commit when processing read
+errors. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Handle response committed when processing read error
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new e7f902bb73 Handle response committed when processing read error
e7f902bb73 is described below
commit e7f902bb73c15a75e153c4a25036eabe788d3bb6
Author: remm
AuthorDate: Tue Apr 9 09:58:22 2024 +0200
Handle response committed when processing read error
BZ68862
---
java/org/apache/catalina/connector/InputBuffer.java | 16 ++--
webapps/docs/changelog.xml | 4
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/connector/InputBuffer.java
b/java/org/apache/catalina/connector/InputBuffer.java
index 03c9586630..e22ef9694c 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -332,9 +332,21 @@ public class InputBuffer extends Reader implements
ByteChunk.ByteInputChannel, A
Response response = request.getResponse();
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, e);
if (e instanceof SocketTimeoutException) {
-response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+try {
+response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_REQUEST_TIMEOUT);
+response.setError();
+}
} else {
-response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+try {
+response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+response.setError();
+}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5c21e3bb99..f15e82d6ef 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,6 +122,10 @@
file via the Servlet API and the file is larger than
Integer.MAX_VALUE. (markt)
+
+68862: Handle possible response commit when processing read
+errors. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Handle response committed when processing read error
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 2fa6bbc81f Handle response committed when processing read error
2fa6bbc81f is described below
commit 2fa6bbc81fd090b0563a506db62c94aabbfd29d0
Author: remm
AuthorDate: Tue Apr 9 09:58:22 2024 +0200
Handle response committed when processing read error
BZ68862
---
java/org/apache/catalina/connector/InputBuffer.java | 16 ++--
webapps/docs/changelog.xml | 4
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/connector/InputBuffer.java
b/java/org/apache/catalina/connector/InputBuffer.java
index 3957ec93c2..db85a3415a 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -316,9 +316,21 @@ public class InputBuffer extends Reader implements
ByteChunk.ByteInputChannel, A
Response response = request.getResponse();
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, e);
if (e instanceof SocketTimeoutException) {
-response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+try {
+response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_REQUEST_TIMEOUT);
+response.setError();
+}
} else {
-response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+try {
+response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+response.setError();
+}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c3708d8d0d..52b61cd0d1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,10 @@
file via the Servlet API and the file is larger than
Integer.MAX_VALUE. (markt)
+
+68862: Handle possible response commit when processing read
+errors. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Changelog update
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 2e0b0cb3b5 Changelog update 2e0b0cb3b5 is described below commit 2e0b0cb3b5da7397ed4ccc35f0ac83e0eb18f5e5 Author: remm AuthorDate: Mon Apr 8 09:54:49 2024 +0200 Changelog update --- webapps/docs/changelog.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b382f8d67f..5c21e3bb99 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -143,6 +143,15 @@ Update the internal fork of Apache Commons Codec to 1.16.1. (markt) + +Improvements to French translations. (remm) + + +Improvements to Japanese translations by tak7iji. (remm) + + +Improvements to Chinese translations by leeyazhou. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Sync strings with poeditor
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 4755b6305f Sync strings with poeditor
4755b6305f is described below
commit 4755b6305f26c9b4bae4a28437caa9728caef3c8
Author: remm
AuthorDate: Mon Apr 8 09:44:28 2024 +0200
Sync strings with poeditor
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_ja.properties | 11 +++
java/org/apache/catalina/filters/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/filters/LocalStrings_ja.properties | 1 +
.../org/apache/catalina/filters/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/security/LocalStrings_fr.properties | 3 +++
java/org/apache/catalina/servlets/LocalStrings_fr.properties | 2 ++
java/org/apache/catalina/servlets/LocalStrings_ja.properties | 2 ++
.../apache/catalina/storeconfig/LocalStrings_fr.properties| 1 +
.../apache/catalina/storeconfig/LocalStrings_ja.properties| 1 +
.../tribes/membership/cloud/LocalStrings_fr.properties| 6 ++
.../tribes/membership/cloud/LocalStrings_ja.properties| 6 ++
.../apache/catalina/valves/rewrite/LocalStrings_fr.properties | 5 +
.../apache/catalina/valves/rewrite/LocalStrings_ja.properties | 5 +
.../tomcat/util/http/parser/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_fr.properties| 2 ++
java/org/apache/tomcat/util/net/LocalStrings_ja.properties| 2 ++
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 1 +
.../org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml| 9 +
21 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 94bfd20f05..22b2082f46 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -42,6 +42,7 @@ applicationContext.setSessionTracking.iae.ssl=Les modes de
suivi de session pour
applicationContext.setSessionTracking.ise=Les modes de suivi de session
("session tracking") du contexte [{0}] ne peuvent être définis pendant que le
contexte est en cours d''exécution
applicationDispatcher.allocateException=Exception d''allocation pour la
servlet [{0}]
+applicationDispatcher.customResponse=La réponse de classe [{0}] n''a pas
permis d''obtenir la réponse de Catalina et sera fermée immédiatement après le
forward
applicationDispatcher.deallocateException=Exception de désallocation pour la
servlet [{0}]
applicationDispatcher.forward.ise=Impossible d'utiliser faire-suivre (forward)
après que la réponse ait été envoyée
applicationDispatcher.isUnavailable=La servlet [{0}] est actuellement
indisponible
@@ -55,6 +56,8 @@ applicationFilterConfig.jmxUnregisterFail=Le
désenregistrement JMX du filtre de
applicationFilterConfig.preDestroy=Echec lors de l''appel de preDestroy pour
le filtre nommé [{0}] de type [{1}]
applicationFilterConfig.release=Impossible de détruite le filtre nommé [{0}]
de type [{1}]
+applicationFilterFactory.noFilterConfig=Aucune configuration de filtre trouvée
pour [{0}]
+
applicationFilterRegistration.nullInitParam=Impossible de fixer le paramètre
d''initialisation du filtre, à cause d''un nom ou d''une valeur nulle, nom
[{0}], valeur [{1}]
applicationFilterRegistration.nullInitParams=Impossible de fixer les
paramètres d''initialisation du filtre, à cause d''un nom ou d''une valeur
nulle, nom [{0}], valeur [{1}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index a0dd1db928..c966e1f43f 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -42,6 +42,7 @@ applicationContext.setSessionTracking.iae.ssl=コンテキスト [{0}] に対し
applicationContext.setSessionTracking.ise=コンテキスト [{0}]
は実行中のためセッション追跡モードを構成できません。
applicationDispatcher.allocateException=サーブレット [{0}] に例外を割り当てます
+applicationDispatcher.customResponse=レスポンスクラス [{0}] は Catalina
レスポンスクラスにアンラップできませんでした。転送後すぐに閉じられます
applicationDispatcher.deallocateException=サーブレット [{0}] の例外を解除します
applicationDispatcher.forward.ise=レスポンスをコミットした後でフォワードできません
applicationDispatcher.isUnavailable=サーブレット [{0}] は現在利用できません
@@ -55,6 +56,8 @@ applicationFilterConfig.jmxUnregisterFail=クラス [{0}] 名前 [{1}]
の JMX
applicationFilterConfig.preDestroy=[{1}]型の名[{0}]というフィルタのpreDestroyへの呼び出しに失敗しました
applicationFilterConfig.release=タイプ [{1}] の名前 [{0}] のフィルタを
(tomcat) branch 10.1.x updated: Sync strings with poeditor
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new d9254d5497 Sync strings with poeditor
d9254d5497 is described below
commit d9254d5497ce27934f1d7e55c246c3b31a61
Author: remm
AuthorDate: Mon Apr 8 09:44:28 2024 +0200
Sync strings with poeditor
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_ja.properties | 11 +++
java/org/apache/catalina/filters/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/filters/LocalStrings_ja.properties | 1 +
.../org/apache/catalina/filters/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/security/LocalStrings_fr.properties | 3 +++
java/org/apache/catalina/servlets/LocalStrings_fr.properties | 2 ++
java/org/apache/catalina/servlets/LocalStrings_ja.properties | 2 ++
java/org/apache/catalina/session/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/session/LocalStrings_ja.properties | 1 +
.../apache/catalina/storeconfig/LocalStrings_fr.properties| 1 +
.../apache/catalina/storeconfig/LocalStrings_ja.properties| 1 +
.../tribes/membership/cloud/LocalStrings_fr.properties| 6 ++
.../tribes/membership/cloud/LocalStrings_ja.properties| 6 ++
.../apache/catalina/valves/rewrite/LocalStrings_fr.properties | 5 +
.../apache/catalina/valves/rewrite/LocalStrings_ja.properties | 5 +
.../tomcat/util/http/parser/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_fr.properties| 2 ++
java/org/apache/tomcat/util/net/LocalStrings_ja.properties| 2 ++
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 1 +
.../org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 1 +
22 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 88d4f41730..3a88c9aab9 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -42,6 +42,7 @@ applicationContext.setSessionTracking.iae.ssl=Les modes de
suivi de session pour
applicationContext.setSessionTracking.ise=Les modes de suivi de session
("session tracking") du contexte [{0}] ne peuvent être définis pendant que le
contexte est en cours d''exécution
applicationDispatcher.allocateException=Exception d''allocation pour la
servlet [{0}]
+applicationDispatcher.customResponse=La réponse de classe [{0}] n''a pas
permis d''obtenir la réponse de Catalina et sera fermée immédiatement après le
forward
applicationDispatcher.deallocateException=Exception de désallocation pour la
servlet [{0}]
applicationDispatcher.forward.ise=Impossible d'utiliser faire-suivre (forward)
après que la réponse ait été envoyée
applicationDispatcher.isUnavailable=La servlet [{0}] est actuellement
indisponible
@@ -55,6 +56,8 @@ applicationFilterConfig.jmxUnregisterFail=Le
désenregistrement JMX du filtre de
applicationFilterConfig.preDestroy=Echec lors de l''appel de preDestroy pour
le filtre nommé [{0}] de type [{1}]
applicationFilterConfig.release=Impossible de détruite le filtre nommé [{0}]
de type [{1}]
+applicationFilterFactory.noFilterConfig=Aucune configuration de filtre trouvée
pour [{0}]
+
applicationFilterRegistration.nullInitParam=Impossible de fixer le paramètre
d''initialisation du filtre, à cause d''un nom ou d''une valeur nulle, nom
[{0}], valeur [{1}]
applicationFilterRegistration.nullInitParams=Impossible de fixer les
paramètres d''initialisation du filtre, à cause d''un nom ou d''une valeur
nulle, nom [{0}], valeur [{1}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 4f0611e1ed..714d5f408c 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -42,6 +42,7 @@ applicationContext.setSessionTracking.iae.ssl=コンテキスト [{0}] に対し
applicationContext.setSessionTracking.ise=コンテキスト [{0}]
は実行中のためセッション追跡モードを構成できません。
applicationDispatcher.allocateException=サーブレット [{0}] に例外を割り当てます
+applicationDispatcher.customResponse=レスポンスクラス [{0}] は Catalina
レスポンスクラスにアンラップできませんでした。転送後すぐに閉じられます
applicationDispatcher.deallocateException=サーブレット [{0}] の例外を解除します
applicationDispatcher.forward.ise=レスポンスをコミットした後でフォワードできません
applicationDispatcher.isUnavailable=サーブレット [{0}] は現在利用できません
@@ -55,6 +56,8 @@ applicationFilterConfig.jmxUnregisterFail=クラス [{0}] 名前 [{1}]
の JMX
applicationFilterConfig.preDestroy=[{1}]型の名[{0}]というフィルタのpreDestroyへの呼び出しに失敗しました
applicationFilterConfig.relea
(tomcat) branch main updated: Add changelog entry
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 8111b180d2 Add changelog entry 8111b180d2 is described below commit 8111b180d2bdd7b35ca9dca3dae859af7291eff3 Author: remm AuthorDate: Mon Apr 8 09:45:31 2024 +0200 Add changelog entry --- webapps/docs/changelog.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 28d80fd214..c3708d8d0d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -216,6 +216,15 @@ Update the internal fork of Apache Commons Codec to 1.16.1. (markt) + +Improvements to French translations. (remm) + + +Improvements to Japanese translations by tak7iji. (remm) + + +Improvements to Chinese translations by leeyazhou. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Sync strings with poeditor
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new fe3ac1e2c0 Sync strings with poeditor
fe3ac1e2c0 is described below
commit fe3ac1e2c05819b5f487a3c9c09462270237efa4
Author: remm
AuthorDate: Mon Apr 8 09:44:28 2024 +0200
Sync strings with poeditor
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_ja.properties | 11 +++
java/org/apache/catalina/filters/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/filters/LocalStrings_ja.properties | 1 +
.../org/apache/catalina/filters/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/security/LocalStrings_fr.properties | 3 +++
java/org/apache/catalina/servlets/LocalStrings_fr.properties | 2 ++
java/org/apache/catalina/servlets/LocalStrings_ja.properties | 2 ++
java/org/apache/catalina/session/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/session/LocalStrings_ja.properties | 1 +
.../apache/catalina/storeconfig/LocalStrings_fr.properties| 1 +
.../apache/catalina/storeconfig/LocalStrings_ja.properties| 1 +
.../tribes/membership/cloud/LocalStrings_fr.properties| 6 ++
.../tribes/membership/cloud/LocalStrings_ja.properties| 6 ++
.../apache/catalina/valves/rewrite/LocalStrings_fr.properties | 5 +
.../apache/catalina/valves/rewrite/LocalStrings_ja.properties | 5 +
.../tomcat/util/http/parser/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_fr.properties| 2 ++
java/org/apache/tomcat/util/net/LocalStrings_ja.properties| 2 ++
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 1 +
.../org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 1 +
22 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 4a89d6078e..86aa847a14 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -42,6 +42,7 @@ applicationContext.setSessionTracking.iae.ssl=Les modes de
suivi de session pour
applicationContext.setSessionTracking.ise=Les modes de suivi de session
("session tracking") du contexte [{0}] ne peuvent être définis pendant que le
contexte est en cours d''exécution
applicationDispatcher.allocateException=Exception d''allocation pour la
servlet [{0}]
+applicationDispatcher.customResponse=La réponse de classe [{0}] n''a pas
permis d''obtenir la réponse de Catalina et sera fermée immédiatement après le
forward
applicationDispatcher.deallocateException=Exception de désallocation pour la
servlet [{0}]
applicationDispatcher.forward.ise=Impossible d'utiliser faire-suivre (forward)
après que la réponse ait été envoyée
applicationDispatcher.isUnavailable=La servlet [{0}] est actuellement
indisponible
@@ -55,6 +56,8 @@ applicationFilterConfig.jmxUnregisterFail=Le
désenregistrement JMX du filtre de
applicationFilterConfig.preDestroy=Echec lors de l''appel de preDestroy pour
le filtre nommé [{0}] de type [{1}]
applicationFilterConfig.release=Impossible de détruite le filtre nommé [{0}]
de type [{1}]
+applicationFilterFactory.noFilterConfig=Aucune configuration de filtre trouvée
pour [{0}]
+
applicationFilterRegistration.nullInitParam=Impossible de fixer le paramètre
d''initialisation du filtre, à cause d''un nom ou d''une valeur nulle, nom
[{0}], valeur [{1}]
applicationFilterRegistration.nullInitParams=Impossible de fixer les
paramètres d''initialisation du filtre, à cause d''un nom ou d''une valeur
nulle, nom [{0}], valeur [{1}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 694a2bd691..f5c012fb0e 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -42,6 +42,7 @@ applicationContext.setSessionTracking.iae.ssl=コンテキスト [{0}] に対し
applicationContext.setSessionTracking.ise=コンテキスト [{0}]
は実行中のためセッション追跡モードを構成できません。
applicationDispatcher.allocateException=サーブレット [{0}] に例外を割り当てます
+applicationDispatcher.customResponse=レスポンスクラス [{0}] は Catalina
レスポンスクラスにアンラップできませんでした。転送後すぐに閉じられます
applicationDispatcher.deallocateException=サーブレット [{0}] の例外を解除します
applicationDispatcher.forward.ise=レスポンスをコミットした後でフォワードできません
applicationDispatcher.isUnavailable=サーブレット [{0}] は現在利用できません
@@ -55,6 +56,8 @@ applicationFilterConfig.jmxUnregisterFail=クラス [{0}] 名前 [{1}]
の JMX
applicationFilterConfig.preDestroy=[{1}]型の名[{0}]というフィルタのpreDestroyへの呼び出しに失敗しました
applicationFilterConfig.release=タイプ
(tomcat) branch 9.0.x updated: Harmonize syncs for some components
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new a23f153837 Harmonize syncs for some components
a23f153837 is described below
commit a23f15383766ea108b3e560c964cee1703321b87
Author: remm
AuthorDate: Fri Apr 5 14:08:16 2024 +0200
Harmonize syncs for some components
Take lifecycle operations (which have their own sync) and notifications
out of sync.
---
java/org/apache/catalina/core/ContainerBase.java | 105 -
java/org/apache/catalina/core/StandardContext.java | 79
java/org/apache/catalina/core/StandardServer.java | 80 ++--
java/org/apache/catalina/core/StandardService.java | 86 +
webapps/docs/changelog.xml | 4 +-
5 files changed, 176 insertions(+), 178 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index c15298a359..43201c19ed 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -152,6 +152,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
* The child Containers belonging to this Container, keyed by name.
*/
protected final HashMap children = new HashMap<>();
+private final ReadWriteLock childrenLock = new ReentrantReadWriteLock();
/**
@@ -398,32 +399,31 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
return;
}
this.cluster = cluster;
-
-// Stop the old component if necessary
-if (getState().isAvailable() && (oldCluster instanceof Lifecycle))
{
-try {
-((Lifecycle) oldCluster).stop();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.cluster.stop"), e);
-}
-}
-
// Start the new component if necessary
if (cluster != null) {
cluster.setContainer(this);
}
-
-if (getState().isAvailable() && (cluster instanceof Lifecycle)) {
-try {
-((Lifecycle) cluster).start();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.cluster.start"), e);
-}
-}
} finally {
writeLock.unlock();
}
+// Stop the old component if necessary
+if (getState().isAvailable() && (oldCluster instanceof Lifecycle)) {
+try {
+((Lifecycle) oldCluster).stop();
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.cluster.stop"), e);
+}
+}
+
+if (getState().isAvailable() && (cluster instanceof Lifecycle)) {
+try {
+((Lifecycle) cluster).start();
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.cluster.start"), e);
+}
+}
+
// Report this property change to interested listeners
support.firePropertyChange("cluster", oldCluster, cluster);
}
@@ -592,43 +592,44 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
@Override
public void setRealm(Realm realm) {
+Realm oldRealm = null;
Lock l = realmLock.writeLock();
l.lock();
try {
// Change components if necessary
-Realm oldRealm = this.realm;
+oldRealm = this.realm;
if (oldRealm == realm) {
return;
}
this.realm = realm;
-// Stop the old component if necessary
-if (getState().isAvailable() && (oldRealm instanceof Lifecycle)) {
-try {
-((Lifecycle) oldRealm).stop();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.realm.stop"), e);
-}
-}
-
// Start the new component if necessary
if (realm != null) {
realm.setContainer(this);
}
-if (getState().isAvailable() && (realm instanceof Lifecycle)) {
-try {
-((Lifecycle) realm).start();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.realm.start"), e);
-}
-}
-
-// Report this property change to interested
(tomcat) branch 10.1.x updated: Harmonize syncs for some components
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 6bcd35e129 Harmonize syncs for some components
6bcd35e129 is described below
commit 6bcd35e129ef3e1d17df44fb3444d5481a73115f
Author: remm
AuthorDate: Fri Apr 5 14:08:16 2024 +0200
Harmonize syncs for some components
Take lifecycle operations (which have their own sync) and notifications
out of sync.
---
java/org/apache/catalina/core/ContainerBase.java | 105 -
java/org/apache/catalina/core/StandardContext.java | 79
java/org/apache/catalina/core/StandardServer.java | 80 ++--
java/org/apache/catalina/core/StandardService.java | 86 +
webapps/docs/changelog.xml | 6 +-
5 files changed, 177 insertions(+), 179 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index c15298a359..43201c19ed 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -152,6 +152,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
* The child Containers belonging to this Container, keyed by name.
*/
protected final HashMap children = new HashMap<>();
+private final ReadWriteLock childrenLock = new ReentrantReadWriteLock();
/**
@@ -398,32 +399,31 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
return;
}
this.cluster = cluster;
-
-// Stop the old component if necessary
-if (getState().isAvailable() && (oldCluster instanceof Lifecycle))
{
-try {
-((Lifecycle) oldCluster).stop();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.cluster.stop"), e);
-}
-}
-
// Start the new component if necessary
if (cluster != null) {
cluster.setContainer(this);
}
-
-if (getState().isAvailable() && (cluster instanceof Lifecycle)) {
-try {
-((Lifecycle) cluster).start();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.cluster.start"), e);
-}
-}
} finally {
writeLock.unlock();
}
+// Stop the old component if necessary
+if (getState().isAvailable() && (oldCluster instanceof Lifecycle)) {
+try {
+((Lifecycle) oldCluster).stop();
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.cluster.stop"), e);
+}
+}
+
+if (getState().isAvailable() && (cluster instanceof Lifecycle)) {
+try {
+((Lifecycle) cluster).start();
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.cluster.start"), e);
+}
+}
+
// Report this property change to interested listeners
support.firePropertyChange("cluster", oldCluster, cluster);
}
@@ -592,43 +592,44 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
@Override
public void setRealm(Realm realm) {
+Realm oldRealm = null;
Lock l = realmLock.writeLock();
l.lock();
try {
// Change components if necessary
-Realm oldRealm = this.realm;
+oldRealm = this.realm;
if (oldRealm == realm) {
return;
}
this.realm = realm;
-// Stop the old component if necessary
-if (getState().isAvailable() && (oldRealm instanceof Lifecycle)) {
-try {
-((Lifecycle) oldRealm).stop();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.realm.stop"), e);
-}
-}
-
// Start the new component if necessary
if (realm != null) {
realm.setContainer(this);
}
-if (getState().isAvailable() && (realm instanceof Lifecycle)) {
-try {
-((Lifecycle) realm).start();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.realm.start"), e);
-}
-}
-
-// Report this property change to interested
(tomcat) branch main updated: Harmonize syncs for some components
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 50abe03121 Harmonize syncs for some components
50abe03121 is described below
commit 50abe031215a2065c7a0f7d610be3269329d44c9
Author: remm
AuthorDate: Fri Apr 5 14:08:16 2024 +0200
Harmonize syncs for some components
Take lifecycle operations (which have their own sync) and notifications
out of sync.
---
java/org/apache/catalina/core/ContainerBase.java | 105 -
java/org/apache/catalina/core/StandardContext.java | 79
java/org/apache/catalina/core/StandardServer.java | 80 ++--
java/org/apache/catalina/core/StandardService.java | 86 +
webapps/docs/changelog.xml | 4 +-
5 files changed, 176 insertions(+), 178 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index 4edd4edf9d..7963ededb9 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -129,6 +129,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
* The child Containers belonging to this Container, keyed by name.
*/
protected final HashMap children = new HashMap<>();
+private final ReadWriteLock childrenLock = new ReentrantReadWriteLock();
/**
@@ -375,32 +376,31 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
return;
}
this.cluster = cluster;
-
-// Stop the old component if necessary
-if (getState().isAvailable() && (oldCluster instanceof Lifecycle))
{
-try {
-((Lifecycle) oldCluster).stop();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.cluster.stop"), e);
-}
-}
-
// Start the new component if necessary
if (cluster != null) {
cluster.setContainer(this);
}
-
-if (getState().isAvailable() && (cluster instanceof Lifecycle)) {
-try {
-((Lifecycle) cluster).start();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.cluster.start"), e);
-}
-}
} finally {
writeLock.unlock();
}
+// Stop the old component if necessary
+if (getState().isAvailable() && (oldCluster instanceof Lifecycle)) {
+try {
+((Lifecycle) oldCluster).stop();
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.cluster.stop"), e);
+}
+}
+
+if (getState().isAvailable() && (cluster instanceof Lifecycle)) {
+try {
+((Lifecycle) cluster).start();
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.cluster.start"), e);
+}
+}
+
// Report this property change to interested listeners
support.firePropertyChange("cluster", oldCluster, cluster);
}
@@ -569,43 +569,44 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
@Override
public void setRealm(Realm realm) {
+Realm oldRealm = null;
Lock l = realmLock.writeLock();
l.lock();
try {
// Change components if necessary
-Realm oldRealm = this.realm;
+oldRealm = this.realm;
if (oldRealm == realm) {
return;
}
this.realm = realm;
-// Stop the old component if necessary
-if (getState().isAvailable() && (oldRealm instanceof Lifecycle)) {
-try {
-((Lifecycle) oldRealm).stop();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.realm.stop"), e);
-}
-}
-
// Start the new component if necessary
if (realm != null) {
realm.setContainer(this);
}
-if (getState().isAvailable() && (realm instanceof Lifecycle)) {
-try {
-((Lifecycle) realm).start();
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.realm.start"), e);
-}
-}
-
-// Report this property change to interested
(tomcat) branch 9.0.x updated: Revert "Further locking harmonizations for main components"
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new a202a68cb3 Revert "Further locking harmonizations for main components"
a202a68cb3 is described below
commit a202a68cb3d32c40e2f8886455777075e28887ef
Author: remm
AuthorDate: Thu Apr 4 16:03:58 2024 +0200
Revert "Further locking harmonizations for main components"
This reverts commit 63eb105bf14fed5fdf29dc9171e46f73fae28128.
---
java/org/apache/catalina/core/ContainerBase.java | 86 +-
java/org/apache/catalina/core/StandardService.java | 22 +++---
webapps/docs/changelog.xml | 5 +-
3 files changed, 47 insertions(+), 66 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index fd295cb52f..c15298a359 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -152,7 +152,6 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
* The child Containers belonging to this Container, keyed by name.
*/
protected final HashMap children = new HashMap<>();
-private final ReadWriteLock childrenLock = new ReentrantReadWriteLock();
/**
@@ -666,30 +665,26 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
log.debug(sm.getString("containerBase.child.add", child, this));
}
-childrenLock.writeLock().lock();
-try {
+synchronized (children) {
if (children.get(child.getName()) != null) {
throw new
IllegalArgumentException(sm.getString("containerBase.child.notUnique",
child.getName()));
}
child.setParent(this); // May throw IAE
children.put(child.getName(), child);
+}
-fireContainerEvent(ADD_CHILD_EVENT, child);
+fireContainerEvent(ADD_CHILD_EVENT, child);
-// Start child
-// Don't do this inside sync block - start can be a slow process
and
-// locking the children object can cause problems elsewhere
-try {
-if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
-child.start();
-}
-} catch (LifecycleException e) {
-throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
+// Start child
+// Don't do this inside sync block - start can be a slow process and
+// locking the children object can cause problems elsewhere
+try {
+if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
+child.start();
}
-} finally {
-childrenLock.writeLock().unlock();
+} catch (LifecycleException e) {
+throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
}
-
}
@@ -726,11 +721,8 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
if (name == null) {
return null;
}
-childrenLock.readLock().lock();
-try {
+synchronized (children) {
return children.get(name);
-} finally {
-childrenLock.readLock().unlock();
}
}
@@ -741,11 +733,8 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
*/
@Override
public Container[] findChildren() {
-childrenLock.readLock().lock();
-try {
+synchronized (children) {
return children.values().toArray(new Container[0]);
-} finally {
-childrenLock.readLock().unlock();
}
}
@@ -772,40 +761,36 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
return;
}
-childrenLock.writeLock().lock();
try {
-try {
-if (child.getState().isAvailable()) {
-child.stop();
-}
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.child.stop"), e);
+if (child.getState().isAvailable()) {
+child.stop();
}
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.child.stop"), e);
+}
-boolean destroy = false;
-try {
-// child.destroy() may have already been called which would
have
-
(tomcat) branch 10.1.x updated: Revert "Further locking harmonizations for main components"
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 7ee8ca1f0e Revert "Further locking harmonizations for main components"
7ee8ca1f0e is described below
commit 7ee8ca1f0ea6a0984aba1ecf34b24f717886f329
Author: remm
AuthorDate: Thu Apr 4 16:03:33 2024 +0200
Revert "Further locking harmonizations for main components"
This reverts commit b241b08c9d5b92a183eb686886e8c5bbed9b9835.
---
java/org/apache/catalina/core/ContainerBase.java | 86 +-
java/org/apache/catalina/core/StandardService.java | 22 +++---
webapps/docs/changelog.xml | 7 +-
3 files changed, 48 insertions(+), 67 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index fd295cb52f..c15298a359 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -152,7 +152,6 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
* The child Containers belonging to this Container, keyed by name.
*/
protected final HashMap children = new HashMap<>();
-private final ReadWriteLock childrenLock = new ReentrantReadWriteLock();
/**
@@ -666,30 +665,26 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
log.debug(sm.getString("containerBase.child.add", child, this));
}
-childrenLock.writeLock().lock();
-try {
+synchronized (children) {
if (children.get(child.getName()) != null) {
throw new
IllegalArgumentException(sm.getString("containerBase.child.notUnique",
child.getName()));
}
child.setParent(this); // May throw IAE
children.put(child.getName(), child);
+}
-fireContainerEvent(ADD_CHILD_EVENT, child);
+fireContainerEvent(ADD_CHILD_EVENT, child);
-// Start child
-// Don't do this inside sync block - start can be a slow process
and
-// locking the children object can cause problems elsewhere
-try {
-if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
-child.start();
-}
-} catch (LifecycleException e) {
-throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
+// Start child
+// Don't do this inside sync block - start can be a slow process and
+// locking the children object can cause problems elsewhere
+try {
+if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
+child.start();
}
-} finally {
-childrenLock.writeLock().unlock();
+} catch (LifecycleException e) {
+throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
}
-
}
@@ -726,11 +721,8 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
if (name == null) {
return null;
}
-childrenLock.readLock().lock();
-try {
+synchronized (children) {
return children.get(name);
-} finally {
-childrenLock.readLock().unlock();
}
}
@@ -741,11 +733,8 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
*/
@Override
public Container[] findChildren() {
-childrenLock.readLock().lock();
-try {
+synchronized (children) {
return children.values().toArray(new Container[0]);
-} finally {
-childrenLock.readLock().unlock();
}
}
@@ -772,40 +761,36 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
return;
}
-childrenLock.writeLock().lock();
try {
-try {
-if (child.getState().isAvailable()) {
-child.stop();
-}
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.child.stop"), e);
+if (child.getState().isAvailable()) {
+child.stop();
}
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.child.stop"), e);
+}
-boolean destroy = false;
-try {
-// child.destroy() may have already been called which would
have
-
(tomcat) branch main updated: Revert "Further locking harmonizations for main components"
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new cf05b38e5e Revert "Further locking harmonizations for main components"
cf05b38e5e is described below
commit cf05b38e5ede77bc46ca02128b8a1fe0d0168494
Author: remm
AuthorDate: Thu Apr 4 16:02:45 2024 +0200
Revert "Further locking harmonizations for main components"
This reverts commit fba89a6f05223768e7d7026cd886d7f8356d.
---
java/org/apache/catalina/core/ContainerBase.java | 86 +-
java/org/apache/catalina/core/StandardService.java | 22 +++---
webapps/docs/changelog.xml | 5 +-
3 files changed, 47 insertions(+), 66 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index 846f4e27d8..4edd4edf9d 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -129,7 +129,6 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
* The child Containers belonging to this Container, keyed by name.
*/
protected final HashMap children = new HashMap<>();
-private final ReadWriteLock childrenLock = new ReentrantReadWriteLock();
/**
@@ -633,30 +632,26 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
log.debug(sm.getString("containerBase.child.add", child, this));
}
-childrenLock.writeLock().lock();
-try {
+synchronized (children) {
if (children.get(child.getName()) != null) {
throw new
IllegalArgumentException(sm.getString("containerBase.child.notUnique",
child.getName()));
}
child.setParent(this); // May throw IAE
children.put(child.getName(), child);
+}
-fireContainerEvent(ADD_CHILD_EVENT, child);
+fireContainerEvent(ADD_CHILD_EVENT, child);
-// Start child
-// Don't do this inside sync block - start can be a slow process
and
-// locking the children object can cause problems elsewhere
-try {
-if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
-child.start();
-}
-} catch (LifecycleException e) {
-throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
+// Start child
+// Don't do this inside sync block - start can be a slow process and
+// locking the children object can cause problems elsewhere
+try {
+if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
+child.start();
}
-} finally {
-childrenLock.writeLock().unlock();
+} catch (LifecycleException e) {
+throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
}
-
}
@@ -693,11 +688,8 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
if (name == null) {
return null;
}
-childrenLock.readLock().lock();
-try {
+synchronized (children) {
return children.get(name);
-} finally {
-childrenLock.readLock().unlock();
}
}
@@ -708,11 +700,8 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
*/
@Override
public Container[] findChildren() {
-childrenLock.readLock().lock();
-try {
+synchronized (children) {
return children.values().toArray(new Container[0]);
-} finally {
-childrenLock.readLock().unlock();
}
}
@@ -739,40 +728,36 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
return;
}
-childrenLock.writeLock().lock();
try {
-try {
-if (child.getState().isAvailable()) {
-child.stop();
-}
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.child.stop"), e);
+if (child.getState().isAvailable()) {
+child.stop();
}
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.child.stop"), e);
+}
-boolean destroy = false;
-try {
-// child.destroy() may have already been called which would
have
-
(tomcat) branch 9.0.x updated: Further locking harmonizations for main components
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 63eb105bf1 Further locking harmonizations for main components
63eb105bf1 is described below
commit 63eb105bf14fed5fdf29dc9171e46f73fae28128
Author: remm
AuthorDate: Thu Apr 4 14:43:02 2024 +0200
Further locking harmonizations for main components
Also for lifecycle operations.
---
java/org/apache/catalina/core/ContainerBase.java | 86 +-
java/org/apache/catalina/core/StandardService.java | 22 +++---
webapps/docs/changelog.xml | 5 +-
3 files changed, 66 insertions(+), 47 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index c15298a359..fd295cb52f 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -152,6 +152,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
* The child Containers belonging to this Container, keyed by name.
*/
protected final HashMap children = new HashMap<>();
+private final ReadWriteLock childrenLock = new ReentrantReadWriteLock();
/**
@@ -665,26 +666,30 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
log.debug(sm.getString("containerBase.child.add", child, this));
}
-synchronized (children) {
+childrenLock.writeLock().lock();
+try {
if (children.get(child.getName()) != null) {
throw new
IllegalArgumentException(sm.getString("containerBase.child.notUnique",
child.getName()));
}
child.setParent(this); // May throw IAE
children.put(child.getName(), child);
-}
-fireContainerEvent(ADD_CHILD_EVENT, child);
+fireContainerEvent(ADD_CHILD_EVENT, child);
-// Start child
-// Don't do this inside sync block - start can be a slow process and
-// locking the children object can cause problems elsewhere
-try {
-if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
-child.start();
+// Start child
+// Don't do this inside sync block - start can be a slow process
and
+// locking the children object can cause problems elsewhere
+try {
+if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
+child.start();
+}
+} catch (LifecycleException e) {
+throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
}
-} catch (LifecycleException e) {
-throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
+} finally {
+childrenLock.writeLock().unlock();
}
+
}
@@ -721,8 +726,11 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
if (name == null) {
return null;
}
-synchronized (children) {
+childrenLock.readLock().lock();
+try {
return children.get(name);
+} finally {
+childrenLock.readLock().unlock();
}
}
@@ -733,8 +741,11 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
*/
@Override
public Container[] findChildren() {
-synchronized (children) {
+childrenLock.readLock().lock();
+try {
return children.values().toArray(new Container[0]);
+} finally {
+childrenLock.readLock().unlock();
}
}
@@ -761,36 +772,40 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
return;
}
+childrenLock.writeLock().lock();
try {
-if (child.getState().isAvailable()) {
-child.stop();
+try {
+if (child.getState().isAvailable()) {
+child.stop();
+}
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.child.stop"), e);
}
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.child.stop"), e);
-}
-boolean destroy = false;
-try {
-// child.destroy() may have already been called which would have
-// triggered this call. If that is the case, no need to destroy the
-
(tomcat) branch 10.1.x updated: Further locking harmonizations for main components
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new b241b08c9d Further locking harmonizations for main components
b241b08c9d is described below
commit b241b08c9d5b92a183eb686886e8c5bbed9b9835
Author: remm
AuthorDate: Thu Apr 4 14:43:02 2024 +0200
Further locking harmonizations for main components
Also for lifecycle operations.
---
java/org/apache/catalina/core/ContainerBase.java | 86 +-
java/org/apache/catalina/core/StandardService.java | 22 +++---
webapps/docs/changelog.xml | 7 +-
3 files changed, 67 insertions(+), 48 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index c15298a359..fd295cb52f 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -152,6 +152,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
* The child Containers belonging to this Container, keyed by name.
*/
protected final HashMap children = new HashMap<>();
+private final ReadWriteLock childrenLock = new ReentrantReadWriteLock();
/**
@@ -665,26 +666,30 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
log.debug(sm.getString("containerBase.child.add", child, this));
}
-synchronized (children) {
+childrenLock.writeLock().lock();
+try {
if (children.get(child.getName()) != null) {
throw new
IllegalArgumentException(sm.getString("containerBase.child.notUnique",
child.getName()));
}
child.setParent(this); // May throw IAE
children.put(child.getName(), child);
-}
-fireContainerEvent(ADD_CHILD_EVENT, child);
+fireContainerEvent(ADD_CHILD_EVENT, child);
-// Start child
-// Don't do this inside sync block - start can be a slow process and
-// locking the children object can cause problems elsewhere
-try {
-if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
-child.start();
+// Start child
+// Don't do this inside sync block - start can be a slow process
and
+// locking the children object can cause problems elsewhere
+try {
+if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
+child.start();
+}
+} catch (LifecycleException e) {
+throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
}
-} catch (LifecycleException e) {
-throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
+} finally {
+childrenLock.writeLock().unlock();
}
+
}
@@ -721,8 +726,11 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
if (name == null) {
return null;
}
-synchronized (children) {
+childrenLock.readLock().lock();
+try {
return children.get(name);
+} finally {
+childrenLock.readLock().unlock();
}
}
@@ -733,8 +741,11 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
*/
@Override
public Container[] findChildren() {
-synchronized (children) {
+childrenLock.readLock().lock();
+try {
return children.values().toArray(new Container[0]);
+} finally {
+childrenLock.readLock().unlock();
}
}
@@ -761,36 +772,40 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
return;
}
+childrenLock.writeLock().lock();
try {
-if (child.getState().isAvailable()) {
-child.stop();
+try {
+if (child.getState().isAvailable()) {
+child.stop();
+}
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.child.stop"), e);
}
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.child.stop"), e);
-}
-boolean destroy = false;
-try {
-// child.destroy() may have already been called which would have
-// triggered this call. If that is the case, no need to destroy the
-
(tomcat) branch main updated: Further locking harmonizations for main components
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new fba89a Further locking harmonizations for main components
fba89a is described below
commit fba89a6f05223768e7d7026cd886d7f8356d
Author: remm
AuthorDate: Thu Apr 4 14:43:02 2024 +0200
Further locking harmonizations for main components
Also for lifecycle operations.
---
java/org/apache/catalina/core/ContainerBase.java | 86 +-
java/org/apache/catalina/core/StandardService.java | 22 +++---
webapps/docs/changelog.xml | 5 +-
3 files changed, 66 insertions(+), 47 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index 4edd4edf9d..846f4e27d8 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -129,6 +129,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
* The child Containers belonging to this Container, keyed by name.
*/
protected final HashMap children = new HashMap<>();
+private final ReadWriteLock childrenLock = new ReentrantReadWriteLock();
/**
@@ -632,26 +633,30 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
log.debug(sm.getString("containerBase.child.add", child, this));
}
-synchronized (children) {
+childrenLock.writeLock().lock();
+try {
if (children.get(child.getName()) != null) {
throw new
IllegalArgumentException(sm.getString("containerBase.child.notUnique",
child.getName()));
}
child.setParent(this); // May throw IAE
children.put(child.getName(), child);
-}
-fireContainerEvent(ADD_CHILD_EVENT, child);
+fireContainerEvent(ADD_CHILD_EVENT, child);
-// Start child
-// Don't do this inside sync block - start can be a slow process and
-// locking the children object can cause problems elsewhere
-try {
-if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
-child.start();
+// Start child
+// Don't do this inside sync block - start can be a slow process
and
+// locking the children object can cause problems elsewhere
+try {
+if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) && startChildren) {
+child.start();
+}
+} catch (LifecycleException e) {
+throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
}
-} catch (LifecycleException e) {
-throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
+} finally {
+childrenLock.writeLock().unlock();
}
+
}
@@ -688,8 +693,11 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
if (name == null) {
return null;
}
-synchronized (children) {
+childrenLock.readLock().lock();
+try {
return children.get(name);
+} finally {
+childrenLock.readLock().unlock();
}
}
@@ -700,8 +708,11 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
*/
@Override
public Container[] findChildren() {
-synchronized (children) {
+childrenLock.readLock().lock();
+try {
return children.values().toArray(new Container[0]);
+} finally {
+childrenLock.readLock().unlock();
}
}
@@ -728,36 +739,40 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
return;
}
+childrenLock.writeLock().lock();
try {
-if (child.getState().isAvailable()) {
-child.stop();
+try {
+if (child.getState().isAvailable()) {
+child.stop();
+}
+} catch (LifecycleException e) {
+log.error(sm.getString("containerBase.child.stop"), e);
}
-} catch (LifecycleException e) {
-log.error(sm.getString("containerBase.child.stop"), e);
-}
-boolean destroy = false;
-try {
-// child.destroy() may have already been called which would have
-// triggered this call. If that is the case, no need to destroy the
-
(tomcat) branch 9.0.x updated: Also add a lock for connectors
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 047daa0d0f Also add a lock for connectors
047daa0d0f is described below
commit 047daa0d0fc1ac7a388d1ee672d22501dae76e85
Author: remm
AuthorDate: Wed Apr 3 16:49:11 2024 +0200
Also add a lock for connectors
---
java/org/apache/catalina/core/StandardService.java | 107 +++--
webapps/docs/changelog.xml | 6 +-
2 files changed, 63 insertions(+), 50 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardService.java
b/java/org/apache/catalina/core/StandardService.java
index a194c3dd6e..dbb32e55ce 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -20,6 +20,9 @@ package org.apache.catalina.core;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.ArrayList;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.management.ObjectName;
@@ -76,7 +79,7 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
* The set of Connectors associated with this Service.
*/
protected Connector connectors[] = new Connector[0];
-private final Object connectorsLock = new Object();
+private final ReadWriteLock connectorsLock = new ReentrantReadWriteLock();
/**
* The list of executors held by the service.
@@ -219,12 +222,16 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
@Override
public void addConnector(Connector connector) {
-synchronized (connectorsLock) {
+Lock writeLock = connectorsLock.writeLock();
+writeLock.lock();
+try {
connector.setService(this);
Connector results[] = new Connector[connectors.length + 1];
System.arraycopy(connectors, 0, results, 0, connectors.length);
results[connectors.length] = connector;
connectors = results;
+} finally {
+writeLock.unlock();
}
try {
@@ -241,12 +248,16 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
public ObjectName[] getConnectorNames() {
-synchronized (connectorsLock) {
+Lock readLock = connectorsLock.readLock();
+readLock.lock();
+try {
ObjectName results[] = new ObjectName[connectors.length];
for (int i = 0; i < results.length; i++) {
results[i] = connectors[i].getObjectName();
}
return results;
+} finally {
+readLock.unlock();
}
}
@@ -266,9 +277,13 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
*/
@Override
public Connector[] findConnectors() {
-synchronized (connectorsLock) {
+Lock readLock = connectorsLock.readLock();
+readLock.lock();
+try {
// shallow copy
return connectors.clone();
+} finally {
+readLock.unlock();
}
}
@@ -282,7 +297,9 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
@Override
public void removeConnector(Connector connector) {
-synchronized (connectorsLock) {
+Lock writeLock = connectorsLock.writeLock();
+writeLock.lock();
+try {
int j = -1;
for (int i = 0; i < connectors.length; i++) {
if (connector == connectors[i]) {
@@ -312,7 +329,10 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
// Report this property change to interested listeners
support.firePropertyChange("connector", connector, null);
+} finally {
+writeLock.unlock();
}
+
}
@@ -443,12 +463,10 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
mapperListener.start();
// Start our defined Connectors second
-synchronized (connectorsLock) {
-for (Connector connector : connectors) {
-// If it has already failed, don't try and start it
-if (connector.getState() != LifecycleState.FAILED) {
-connector.start();
-}
+for (Connector connector : findConnectors()) {
+// If it has already failed, don't try and start it
+if (connector.getState() != LifecycleState.FAILED) {
+connector.start();
}
}
}
@@ -463,28 +481,27 @@ public class StandardService extends LifecycleMBeanBase
im
(tomcat) branch 10.1.x updated: Also add a lock for connectors
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new e6b6e8c1c1 Also add a lock for connectors
e6b6e8c1c1 is described below
commit e6b6e8c1c1ebf2c542a36324a39120c0fb351ef9
Author: remm
AuthorDate: Wed Apr 3 16:49:11 2024 +0200
Also add a lock for connectors
---
java/org/apache/catalina/core/StandardService.java | 107 +++--
webapps/docs/changelog.xml | 6 +-
2 files changed, 63 insertions(+), 50 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardService.java
b/java/org/apache/catalina/core/StandardService.java
index a194c3dd6e..dbb32e55ce 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -20,6 +20,9 @@ package org.apache.catalina.core;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.ArrayList;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.management.ObjectName;
@@ -76,7 +79,7 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
* The set of Connectors associated with this Service.
*/
protected Connector connectors[] = new Connector[0];
-private final Object connectorsLock = new Object();
+private final ReadWriteLock connectorsLock = new ReentrantReadWriteLock();
/**
* The list of executors held by the service.
@@ -219,12 +222,16 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
@Override
public void addConnector(Connector connector) {
-synchronized (connectorsLock) {
+Lock writeLock = connectorsLock.writeLock();
+writeLock.lock();
+try {
connector.setService(this);
Connector results[] = new Connector[connectors.length + 1];
System.arraycopy(connectors, 0, results, 0, connectors.length);
results[connectors.length] = connector;
connectors = results;
+} finally {
+writeLock.unlock();
}
try {
@@ -241,12 +248,16 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
public ObjectName[] getConnectorNames() {
-synchronized (connectorsLock) {
+Lock readLock = connectorsLock.readLock();
+readLock.lock();
+try {
ObjectName results[] = new ObjectName[connectors.length];
for (int i = 0; i < results.length; i++) {
results[i] = connectors[i].getObjectName();
}
return results;
+} finally {
+readLock.unlock();
}
}
@@ -266,9 +277,13 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
*/
@Override
public Connector[] findConnectors() {
-synchronized (connectorsLock) {
+Lock readLock = connectorsLock.readLock();
+readLock.lock();
+try {
// shallow copy
return connectors.clone();
+} finally {
+readLock.unlock();
}
}
@@ -282,7 +297,9 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
@Override
public void removeConnector(Connector connector) {
-synchronized (connectorsLock) {
+Lock writeLock = connectorsLock.writeLock();
+writeLock.lock();
+try {
int j = -1;
for (int i = 0; i < connectors.length; i++) {
if (connector == connectors[i]) {
@@ -312,7 +329,10 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
// Report this property change to interested listeners
support.firePropertyChange("connector", connector, null);
+} finally {
+writeLock.unlock();
}
+
}
@@ -443,12 +463,10 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
mapperListener.start();
// Start our defined Connectors second
-synchronized (connectorsLock) {
-for (Connector connector : connectors) {
-// If it has already failed, don't try and start it
-if (connector.getState() != LifecycleState.FAILED) {
-connector.start();
-}
+for (Connector connector : findConnectors()) {
+// If it has already failed, don't try and start it
+if (connector.getState() != LifecycleState.FAILED) {
+connector.start();
}
}
}
@@ -463,28 +481,27 @@ public class StandardService extends LifecycleMBeanBase
im
(tomcat) branch main updated: Also add a lock for connectors
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new a8360d3cbe Also add a lock for connectors
a8360d3cbe is described below
commit a8360d3cbe1d530391a23208de8faf0eea031245
Author: remm
AuthorDate: Wed Apr 3 16:49:11 2024 +0200
Also add a lock for connectors
---
java/org/apache/catalina/core/StandardService.java | 107 +++--
webapps/docs/changelog.xml | 6 +-
2 files changed, 63 insertions(+), 50 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardService.java
b/java/org/apache/catalina/core/StandardService.java
index a194c3dd6e..dbb32e55ce 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -20,6 +20,9 @@ package org.apache.catalina.core;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.ArrayList;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.management.ObjectName;
@@ -76,7 +79,7 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
* The set of Connectors associated with this Service.
*/
protected Connector connectors[] = new Connector[0];
-private final Object connectorsLock = new Object();
+private final ReadWriteLock connectorsLock = new ReentrantReadWriteLock();
/**
* The list of executors held by the service.
@@ -219,12 +222,16 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
@Override
public void addConnector(Connector connector) {
-synchronized (connectorsLock) {
+Lock writeLock = connectorsLock.writeLock();
+writeLock.lock();
+try {
connector.setService(this);
Connector results[] = new Connector[connectors.length + 1];
System.arraycopy(connectors, 0, results, 0, connectors.length);
results[connectors.length] = connector;
connectors = results;
+} finally {
+writeLock.unlock();
}
try {
@@ -241,12 +248,16 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
public ObjectName[] getConnectorNames() {
-synchronized (connectorsLock) {
+Lock readLock = connectorsLock.readLock();
+readLock.lock();
+try {
ObjectName results[] = new ObjectName[connectors.length];
for (int i = 0; i < results.length; i++) {
results[i] = connectors[i].getObjectName();
}
return results;
+} finally {
+readLock.unlock();
}
}
@@ -266,9 +277,13 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
*/
@Override
public Connector[] findConnectors() {
-synchronized (connectorsLock) {
+Lock readLock = connectorsLock.readLock();
+readLock.lock();
+try {
// shallow copy
return connectors.clone();
+} finally {
+readLock.unlock();
}
}
@@ -282,7 +297,9 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
@Override
public void removeConnector(Connector connector) {
-synchronized (connectorsLock) {
+Lock writeLock = connectorsLock.writeLock();
+writeLock.lock();
+try {
int j = -1;
for (int i = 0; i < connectors.length; i++) {
if (connector == connectors[i]) {
@@ -312,7 +329,10 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
// Report this property change to interested listeners
support.firePropertyChange("connector", connector, null);
+} finally {
+writeLock.unlock();
}
+
}
@@ -443,12 +463,10 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
mapperListener.start();
// Start our defined Connectors second
-synchronized (connectorsLock) {
-for (Connector connector : connectors) {
-// If it has already failed, don't try and start it
-if (connector.getState() != LifecycleState.FAILED) {
-connector.start();
-}
+for (Connector connector : findConnectors()) {
+// If it has already failed, don't try and start it
+if (connector.getState() != LifecycleState.FAILED) {
+connector.start();
}
}
}
@@ -463,28 +481,27 @@ public class StandardService extends LifecycleMBeanBase
im
(tomcat) branch 9.0.x updated: Use inheritdoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 66fa9b7103 Use inheritdoc
66fa9b7103 is described below
commit 66fa9b71030d847490b9f95b4f0f44ffce208350
Author: remm
AuthorDate: Tue Apr 2 17:06:36 2024 +0200
Use inheritdoc
---
java/org/apache/catalina/connector/Request.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 13761b976e..67ad9e5ca3 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -925,8 +925,9 @@ public class Request implements HttpServletRequest {
/**
- * Return the names of all request attributes for this Request, or an
empty Enumeration if there are
- * none. Note that the attribute names returned will only be those for the
attributes set via
+ * {@inheritDoc}
+ *
+ * The attribute names returned will only be those for the attributes set
via
* {@link #setAttribute(String, Object)}. Tomcat internal attributes will
not be included although they are
* accessible via {@link #getAttribute(String)}. The Tomcat internal
attributes include:
*
@@ -947,8 +948,6 @@ public class Request implements HttpServletRequest {
*
* Connector implementations may return some, all or none of these
attributes and may also support additional
* attributes.
- *
- * @return the attribute names enumeration
*/
@Override
public Enumeration getAttributeNames() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Use inheritdoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 7d604721ec Use inheritdoc
7d604721ec is described below
commit 7d604721ecec74c76afddf27f775b3855839f198
Author: remm
AuthorDate: Tue Apr 2 17:06:36 2024 +0200
Use inheritdoc
---
java/org/apache/catalina/connector/Request.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index b5240f6602..234275e158 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -896,8 +896,9 @@ public class Request implements HttpServletRequest {
/**
- * Return the names of all request attributes for this Request, or an
empty Enumeration if there are
- * none. Note that the attribute names returned will only be those for the
attributes set via
+ * {@inheritDoc}
+ *
+ * The attribute names returned will only be those for the attributes set
via
* {@link #setAttribute(String, Object)}. Tomcat internal attributes will
not be included although they are
* accessible via {@link #getAttribute(String)}. The Tomcat internal
attributes include:
*
@@ -918,8 +919,6 @@ public class Request implements HttpServletRequest {
*
* Connector implementations may return some, all or none of these
attributes and may also support additional
* attributes.
- *
- * @return the attribute names enumeration
*/
@Override
public Enumeration getAttributeNames() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Use inheritdoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 8310e9f449 Use inheritdoc
8310e9f449 is described below
commit 8310e9f449d293cecf4c6e9437bfabec8d0a1b5a
Author: remm
AuthorDate: Tue Apr 2 17:06:36 2024 +0200
Use inheritdoc
---
java/org/apache/catalina/connector/Request.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index f57888357f..390ca9daa1 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -899,8 +899,9 @@ public class Request implements HttpServletRequest {
/**
- * Return the names of all request attributes for this Request, or an
empty Enumeration if there are
- * none. Note that the attribute names returned will only be those for the
attributes set via
+ * {@inheritDoc}
+ *
+ * The attribute names returned will only be those for the attributes set
via
* {@link #setAttribute(String, Object)}. Tomcat internal attributes will
not be included although they are
* accessible via {@link #getAttribute(String)}. The Tomcat internal
attributes include:
*
@@ -921,8 +922,6 @@ public class Request implements HttpServletRequest {
*
* Connector implementations may return some, all or none of these
attributes and may also support additional
* attributes.
- *
- * @return the attribute names enumeration
*/
@Override
public Enumeration getAttributeNames() {
-
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: Remove override javadoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 1ad7d0e371 Remove override javadoc
1ad7d0e371 is described below
commit 1ad7d0e3711c001928fed65a7bc2ec90f8d4c810
Author: remm
AuthorDate: Fri Mar 29 11:52:04 2024 +0100
Remove override javadoc
Remove very outdated boilerplate override javadoc from the
Servlet/Catalina API.
---
.../apache/catalina/ha/session/DeltaSession.java | 148
.../apache/catalina/session/StandardSession.java | 259 -
2 files changed, 407 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 7e6b7e7b6e..b8a355ceef 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -116,34 +116,16 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
// - ReplicatedMapEntry
-/**
- * Has the object changed since last replication and is not in a locked
state
- *
- * @return boolean
- */
@Override
public boolean isDirty() {
return deltaRequest.getSize() > 0;
}
-/**
- * If this returns true, the map will extract the diff using getDiff()
Otherwise it will serialize the entire
- * object.
- *
- * @return boolean
- */
@Override
public boolean isDiffable() {
return true;
}
-/**
- * Returns a diff and sets the dirty map to false
- *
- * @return a serialized view of the difference
- *
- * @throws IOException IO error serializing
- */
@Override
public byte[] getDiff() throws IOException {
SynchronizedStack deltaRequestPool = null;
@@ -183,15 +165,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
return null;
}
-/**
- * Applies a diff to an existing object.
- *
- * @param diff Serialized diff data
- * @param offset Array offset
- * @param length Array length
- *
- * @throws IOException IO error deserializing
- */
@Override
public void applyDiff(byte[] diff, int offset, int length) throws
IOException, ClassNotFoundException {
Thread currentThread = Thread.currentThread();
@@ -267,11 +240,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
}
-/**
- * If this returns true, to replicate that an object has been accessed
- *
- * @return boolean
- */
@Override
public boolean isAccessReplicate() {
long replDelta = System.currentTimeMillis() - getLastTimeReplicated();
@@ -281,9 +249,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
return false;
}
-/**
- * Access to an existing object.
- */
@Override
public void accessEntry() {
this.access();
@@ -293,19 +258,11 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
// - Session Properties
-/**
- * returns true if this session is the primary session, if that is the
case, the manager can expire it upon timeout.
- */
@Override
public boolean isPrimarySession() {
return isPrimarySession;
}
-/**
- * Sets whether this is the primary session or not.
- *
- * @param primarySession Flag value
- */
@Override
public void setPrimarySession(boolean primarySession) {
this.isPrimarySession = primarySession;
@@ -324,11 +281,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
-/**
- * Set the session identifier for this session.
- *
- * @param id The new session identifier
- */
@Override
public void setId(String id) {
setId(id, true);
@@ -353,11 +305,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
}
-/**
- * Set the isNew flag for this session.
- *
- * @param isNew The new value for the isNew flag
- */
@Override
public void setNew(boolean isNew) {
setNew(isNew, true);
@@ -375,13 +322,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
}
-/**
- * Set the authenticated Principal that is associated with this Session.
This provides an Authenticator
- * with a means to cache a previously authenticated Principal, and avoid
potentially expensive
- * Realm.authenticate() calls on every request.
- *
- * @param principal The new Principal, or n
(tomcat) branch 10.1.x updated: Remove override javadoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new f900353ea7 Remove override javadoc
f900353ea7 is described below
commit f900353ea79667ae17c933ee19d08ef04700881c
Author: remm
AuthorDate: Fri Mar 29 11:52:04 2024 +0100
Remove override javadoc
Remove very outdated boilerplate override javadoc from the
Servlet/Catalina API.
---
.../apache/catalina/ha/session/DeltaSession.java | 148 --
.../apache/catalina/session/StandardSession.java | 214 -
2 files changed, 362 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index a20d4db0b8..6e18731831 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -116,34 +116,16 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
// - ReplicatedMapEntry
-/**
- * Has the object changed since last replication and is not in a locked
state
- *
- * @return boolean
- */
@Override
public boolean isDirty() {
return deltaRequest.getSize() > 0;
}
-/**
- * If this returns true, the map will extract the diff using getDiff()
Otherwise it will serialize the entire
- * object.
- *
- * @return boolean
- */
@Override
public boolean isDiffable() {
return true;
}
-/**
- * Returns a diff and sets the dirty map to false
- *
- * @return a serialized view of the difference
- *
- * @throws IOException IO error serializing
- */
@Override
public byte[] getDiff() throws IOException {
SynchronizedStack deltaRequestPool = null;
@@ -183,15 +165,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
return null;
}
-/**
- * Applies a diff to an existing object.
- *
- * @param diff Serialized diff data
- * @param offset Array offset
- * @param length Array length
- *
- * @throws IOException IO error deserializing
- */
@Override
public void applyDiff(byte[] diff, int offset, int length) throws
IOException, ClassNotFoundException {
Thread currentThread = Thread.currentThread();
@@ -267,11 +240,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
}
-/**
- * If this returns true, to replicate that an object has been accessed
- *
- * @return boolean
- */
@Override
public boolean isAccessReplicate() {
long replDelta = System.currentTimeMillis() - getLastTimeReplicated();
@@ -281,9 +249,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
return false;
}
-/**
- * Access to an existing object.
- */
@Override
public void accessEntry() {
this.access();
@@ -293,19 +258,11 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
// - Session Properties
-/**
- * returns true if this session is the primary session, if that is the
case, the manager can expire it upon timeout.
- */
@Override
public boolean isPrimarySession() {
return isPrimarySession;
}
-/**
- * Sets whether this is the primary session or not.
- *
- * @param primarySession Flag value
- */
@Override
public void setPrimarySession(boolean primarySession) {
this.isPrimarySession = primarySession;
@@ -324,11 +281,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
-/**
- * Set the session identifier for this session.
- *
- * @param id The new session identifier
- */
@Override
public void setId(String id) {
setId(id, true);
@@ -353,11 +305,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
}
-/**
- * Set the isNew flag for this session.
- *
- * @param isNew The new value for the isNew flag
- */
@Override
public void setNew(boolean isNew) {
setNew(isNew, true);
@@ -375,13 +322,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
}
-/**
- * Set the authenticated Principal that is associated with this Session.
This provides an Authenticator
- * with a means to cache a previously authenticated Principal, and avoid
potentially expensive
- * Realm.authenticate() calls on every request.
- *
- * @param principal The new Principal, or n
(tomcat) branch main updated: Remove override javadoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 2c3e8e19d7 Remove override javadoc
2c3e8e19d7 is described below
commit 2c3e8e19d7c67ca6e3e9c319d33c2d6e3f53cbab
Author: remm
AuthorDate: Fri Mar 29 11:52:04 2024 +0100
Remove override javadoc
Remove very outdated boilerplate override javadoc from the
Servlet/Catalina API.
---
.../apache/catalina/ha/session/DeltaSession.java | 148 --
.../apache/catalina/session/StandardSession.java | 214 -
2 files changed, 362 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index a20d4db0b8..6e18731831 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -116,34 +116,16 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
// - ReplicatedMapEntry
-/**
- * Has the object changed since last replication and is not in a locked
state
- *
- * @return boolean
- */
@Override
public boolean isDirty() {
return deltaRequest.getSize() > 0;
}
-/**
- * If this returns true, the map will extract the diff using getDiff()
Otherwise it will serialize the entire
- * object.
- *
- * @return boolean
- */
@Override
public boolean isDiffable() {
return true;
}
-/**
- * Returns a diff and sets the dirty map to false
- *
- * @return a serialized view of the difference
- *
- * @throws IOException IO error serializing
- */
@Override
public byte[] getDiff() throws IOException {
SynchronizedStack deltaRequestPool = null;
@@ -183,15 +165,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
return null;
}
-/**
- * Applies a diff to an existing object.
- *
- * @param diff Serialized diff data
- * @param offset Array offset
- * @param length Array length
- *
- * @throws IOException IO error deserializing
- */
@Override
public void applyDiff(byte[] diff, int offset, int length) throws
IOException, ClassNotFoundException {
Thread currentThread = Thread.currentThread();
@@ -267,11 +240,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
}
-/**
- * If this returns true, to replicate that an object has been accessed
- *
- * @return boolean
- */
@Override
public boolean isAccessReplicate() {
long replDelta = System.currentTimeMillis() - getLastTimeReplicated();
@@ -281,9 +249,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
return false;
}
-/**
- * Access to an existing object.
- */
@Override
public void accessEntry() {
this.access();
@@ -293,19 +258,11 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
// - Session Properties
-/**
- * returns true if this session is the primary session, if that is the
case, the manager can expire it upon timeout.
- */
@Override
public boolean isPrimarySession() {
return isPrimarySession;
}
-/**
- * Sets whether this is the primary session or not.
- *
- * @param primarySession Flag value
- */
@Override
public void setPrimarySession(boolean primarySession) {
this.isPrimarySession = primarySession;
@@ -324,11 +281,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
-/**
- * Set the session identifier for this session.
- *
- * @param id The new session identifier
- */
@Override
public void setId(String id) {
setId(id, true);
@@ -353,11 +305,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
}
-/**
- * Set the isNew flag for this session.
- *
- * @param isNew The new value for the isNew flag
- */
@Override
public void setNew(boolean isNew) {
setNew(isNew, true);
@@ -375,13 +322,6 @@ public class DeltaSession extends StandardSession
implements Externalizable, Clu
}
}
-/**
- * Set the authenticated Principal that is associated with this Session.
This provides an Authenticator
- * with a means to cache a previously authenticated Principal, and avoid
potentially expensive
- * Realm.authenticate() calls on every request.
- *
- * @param principal The new Principal, or n
(tomcat) branch 9.0.x updated: Remove override javadoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 9b9e1ad66e Remove override javadoc
9b9e1ad66e is described below
commit 9b9e1ad66e5dc6f558bcfbd452f5b85815668f8c
Author: remm
AuthorDate: Fri Mar 29 11:26:25 2024 +0100
Remove override javadoc
Remove very outdated boilerplate override javadoc from the Servlet API.
---
.../org/apache/catalina/core/ApplicationContext.java | 10 --
.../apache/catalina/core/ApplicationDispatcher.java | 20
.../apache/catalina/core/ApplicationFilterChain.java | 10 --
.../catalina/core/ApplicationFilterConfig.java | 18 --
java/org/apache/catalina/core/StandardWrapper.java | 15 ---
5 files changed, 73 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index 7561bb7172..3f38defb05 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -331,11 +331,6 @@ public class ApplicationContext implements ServletContext {
}
-/**
- * Return the MIME type of the specified file, or null if the
MIME type cannot be determined.
- *
- * @param file Filename for which to identify a MIME type
- */
@Override
public String getMimeType(String file) {
@@ -355,11 +350,6 @@ public class ApplicationContext implements ServletContext {
}
-/**
- * Return a RequestDispatcher object that acts as a wrapper
for the named servlet.
- *
- * @param name Name of the servlet for which a dispatcher is requested
- */
@Override
public RequestDispatcher getNamedDispatcher(String name) {
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index d50bf7c66f..bd7f3de397 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -267,16 +267,6 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
// - Public Methods
-/**
- * Forward this request and response to another resource for processing.
Any runtime exception, IOException, or
- * ServletException thrown by the called servlet will be propagated to the
caller.
- *
- * @param request The servlet request to be forwarded
- * @param response The servlet response to be forwarded
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- */
@Override
public void forward(ServletRequest request, ServletResponse response)
throws ServletException, IOException {
if (Globals.IS_SECURITY_ENABLED) {
@@ -452,16 +442,6 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
}
-/**
- * Include the response from another resource in the current response. Any
runtime exception, IOException, or
- * ServletException thrown by the called servlet will be propagated to the
caller.
- *
- * @param request The servlet request that is including this one
- * @param response The servlet response to be appended to
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- */
@Override
public void include(ServletRequest request, ServletResponse response)
throws ServletException, IOException {
if (Globals.IS_SECURITY_ENABLED) {
diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java
b/java/org/apache/catalina/core/ApplicationFilterChain.java
index e6a45a05dc..50f7c3ee98 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -117,16 +117,6 @@ public final class ApplicationFilterChain implements
FilterChain {
// FilterChain Methods
-/**
- * Invoke the next filter in this chain, passing the specified request and
response. If there are no more filters in
- * this chain, invoke the service() method of the servlet
itself.
- *
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- */
@Override
public void doFilter(ServletRequest request, ServletResponse response)
throws IOException, ServletException {
diff --git a/java/org/apache/catalina
(tomcat) branch 10.1.x updated: Remove override javadoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new bafc402415 Remove override javadoc
bafc402415 is described below
commit bafc40241579a7349ecec721fac219dc0e71d7da
Author: remm
AuthorDate: Fri Mar 29 11:26:25 2024 +0100
Remove override javadoc
Remove very outdated boilerplate override javadoc from the Servlet API.
---
.../org/apache/catalina/core/ApplicationContext.java | 10 --
.../apache/catalina/core/ApplicationDispatcher.java | 20
.../apache/catalina/core/ApplicationFilterChain.java | 10 --
.../catalina/core/ApplicationFilterConfig.java | 18 --
java/org/apache/catalina/core/StandardWrapper.java | 15 ---
5 files changed, 73 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index bd8dceb6d3..522d56417a 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -303,11 +303,6 @@ public class ApplicationContext implements ServletContext {
}
-/**
- * Return the MIME type of the specified file, or null if the
MIME type cannot be determined.
- *
- * @param file Filename for which to identify a MIME type
- */
@Override
public String getMimeType(String file) {
@@ -327,11 +322,6 @@ public class ApplicationContext implements ServletContext {
}
-/**
- * Return a RequestDispatcher object that acts as a wrapper
for the named servlet.
- *
- * @param name Name of the servlet for which a dispatcher is requested
- */
@Override
public RequestDispatcher getNamedDispatcher(String name) {
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index abb7b2fe4d..e2f1ad3a02 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -250,16 +250,6 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
// - Public Methods
-/**
- * Forward this request and response to another resource for processing.
Any runtime exception, IOException, or
- * ServletException thrown by the called servlet will be propagated to the
caller.
- *
- * @param request The servlet request to be forwarded
- * @param response The servlet response to be forwarded
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- */
@Override
public void forward(ServletRequest request, ServletResponse response)
throws ServletException, IOException {
if (Globals.IS_SECURITY_ENABLED) {
@@ -446,16 +436,6 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
}
-/**
- * Include the response from another resource in the current response. Any
runtime exception, IOException, or
- * ServletException thrown by the called servlet will be propagated to the
caller.
- *
- * @param request The servlet request that is including this one
- * @param response The servlet response to be appended to
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- */
@Override
public void include(ServletRequest request, ServletResponse response)
throws ServletException, IOException {
if (Globals.IS_SECURITY_ENABLED) {
diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java
b/java/org/apache/catalina/core/ApplicationFilterChain.java
index 321be19258..2dc3147781 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -113,16 +113,6 @@ public final class ApplicationFilterChain implements
FilterChain {
// FilterChain Methods
-/**
- * Invoke the next filter in this chain, passing the specified request and
response. If there are no more filters in
- * this chain, invoke the service() method of the servlet
itself.
- *
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- */
@Override
public void doFilter(ServletRequest request, ServletResponse response)
throws IOException, ServletException {
diff --git a/java/org/apache
(tomcat) branch main updated: Remove override javadoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 156d01a719 Remove override javadoc
156d01a719 is described below
commit 156d01a719c13531917a9d21bf6cdd8ef8062a9a
Author: remm
AuthorDate: Fri Mar 29 11:26:25 2024 +0100
Remove override javadoc
Remove very outdated boilerplate override javadoc from the Servlet API.
---
.../org/apache/catalina/core/ApplicationContext.java | 10 --
.../apache/catalina/core/ApplicationDispatcher.java | 20
.../apache/catalina/core/ApplicationFilterChain.java | 10 --
.../catalina/core/ApplicationFilterConfig.java | 18 --
java/org/apache/catalina/core/StandardWrapper.java | 15 ---
5 files changed, 73 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index b01ee91382..806ce3710d 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -303,11 +303,6 @@ public class ApplicationContext implements ServletContext {
}
-/**
- * Return the MIME type of the specified file, or null if the
MIME type cannot be determined.
- *
- * @param file Filename for which to identify a MIME type
- */
@Override
public String getMimeType(String file) {
@@ -327,11 +322,6 @@ public class ApplicationContext implements ServletContext {
}
-/**
- * Return a RequestDispatcher object that acts as a wrapper
for the named servlet.
- *
- * @param name Name of the servlet for which a dispatcher is requested
- */
@Override
public RequestDispatcher getNamedDispatcher(String name) {
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 08e43c84a2..245a1a85ea 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -198,16 +198,6 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
// - Public Methods
-/**
- * Forward this request and response to another resource for processing.
Any runtime exception, IOException, or
- * ServletException thrown by the called servlet will be propagated to the
caller.
- *
- * @param request The servlet request to be forwarded
- * @param response The servlet response to be forwarded
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- */
@Override
public void forward(ServletRequest request, ServletResponse response)
throws ServletException, IOException {
// Reset any output that has been buffered, but keep headers/cookies
@@ -390,16 +380,6 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
}
-/**
- * Include the response from another resource in the current response. Any
runtime exception, IOException, or
- * ServletException thrown by the called servlet will be propagated to the
caller.
- *
- * @param request The servlet request that is including this one
- * @param response The servlet response to be appended to
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- */
@Override
public void include(ServletRequest request, ServletResponse response)
throws ServletException, IOException {
// Set up to handle the specified request and response
diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java
b/java/org/apache/catalina/core/ApplicationFilterChain.java
index fd7a892d1a..9d4a3a3437 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -95,16 +95,6 @@ public final class ApplicationFilterChain implements
FilterChain {
// FilterChain Methods
-/**
- * Invoke the next filter in this chain, passing the specified request and
response. If there are no more filters in
- * this chain, invoke the service() method of the servlet
itself.
- *
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
- */
@Override
public void doFilter(ServletRequest request, ServletResponse response)
throws IOException
(tomcat) branch 9.0.x updated: Remove override javadoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new bd2e5cec01 Remove override javadoc
bd2e5cec01 is described below
commit bd2e5cec0115a6dc526d1646974eb394a22326c6
Author: remm
AuthorDate: Fri Mar 29 11:05:39 2024 +0100
Remove override javadoc
Remove very outdated boilerplate override javadoc from the Servlet API.
---
java/org/apache/catalina/connector/Request.java | 209 ---
java/org/apache/catalina/connector/Response.java | 161 -
2 files changed, 370 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index e429bd00cf..13761b976e 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -859,11 +859,6 @@ public class Request implements HttpServletRequest {
// - ServletRequest Methods
-/**
- * @return the specified request attribute if it exists; otherwise, return
null.
- *
- * @param name Name of the request attribute to return
- */
@Override
public Object getAttribute(String name) {
// Special attributes
@@ -967,9 +962,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the character encoding for this Request.
- */
@Override
public String getCharacterEncoding() {
String characterEncoding = coyoteRequest.getCharacterEncoding();
@@ -1013,18 +1005,12 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the content length for this Request.
- */
@Override
public int getContentLength() {
return coyoteRequest.getContentLength();
}
-/**
- * @return the content type for this Request.
- */
@Override
public String getContentType() {
return coyoteRequest.getContentType();
@@ -1041,13 +1027,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the servlet input stream for this Request. The default
implementation returns a servlet input stream
- * created by createInputStream().
- *
- * @exception IllegalStateException if getReader() has
already been called for this request
- * @exception IOException if an input/output error occurs
- */
@Override
public ServletInputStream getInputStream() throws IOException {
@@ -1064,11 +1043,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the preferred Locale that the client will accept content in,
based on the value for the first
- * Accept-Language header that was encountered.
If the request did not specify a preferred
- * language, the server's default Locale is returned.
- */
@Override
public Locale getLocale() {
@@ -1084,11 +1058,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the set of preferred Locales that the client will accept
content in, based on the values for any
- * Accept-Language headers that were encountered.
If the request did not specify a
- * preferred language, the server's default Locale is returned.
- */
@Override
public Enumeration getLocales() {
@@ -1183,24 +1152,12 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the protocol and version used to make this Request.
- */
@Override
public String getProtocol() {
return coyoteRequest.protocol().toStringType();
}
-/**
- * Read the Reader wrapping the input stream for this Request. The default
implementation wraps a
- * BufferedReader around the servlet input stream returned by
createInputStream().
- *
- * @return a buffered reader for the request
- *
- * @exception IllegalStateException if getInputStream() has
already been called for this request
- * @exception IOException if an input/output error occurs
- */
@Override
public BufferedReader getReader() throws IOException {
@@ -1236,13 +1193,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the real path of the specified virtual path.
- *
- * @param path Path to be translated
- *
- * @deprecated As of version 2.1 of the Java Servlet API, use
ServletContext.getRealPath().
- */
@Override
@Deprecated
public String getRealPath(String path) {
@@ -1264,9 +1214,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the remote IP address making this Request.
- */
@Override
public String
(tomcat) branch 10.1.x updated: Remove override javadoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 639ee683b5 Remove override javadoc
639ee683b5 is described below
commit 639ee683b57acfc95b7547e871b3b176edc4f3ca
Author: remm
AuthorDate: Fri Mar 29 11:05:39 2024 +0100
Remove override javadoc
Remove very outdated boilerplate override javadoc from the Servlet API.
---
java/org/apache/catalina/connector/Request.java | 197 ---
java/org/apache/catalina/connector/Response.java | 152 -
2 files changed, 349 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index a013f88bca..b5240f6602 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -830,11 +830,6 @@ public class Request implements HttpServletRequest {
// - ServletRequest Methods
-/**
- * @return the specified request attribute if it exists; otherwise, return
null.
- *
- * @param name Name of the request attribute to return
- */
@Override
public Object getAttribute(String name) {
// Special attributes
@@ -938,9 +933,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the character encoding for this Request.
- */
@Override
public String getCharacterEncoding() {
String characterEncoding = coyoteRequest.getCharacterEncoding();
@@ -984,18 +976,12 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the content length for this Request.
- */
@Override
public int getContentLength() {
return coyoteRequest.getContentLength();
}
-/**
- * @return the content type for this Request.
- */
@Override
public String getContentType() {
return coyoteRequest.getContentType();
@@ -1012,13 +998,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the servlet input stream for this Request. The default
implementation returns a servlet input stream
- * created by createInputStream().
- *
- * @exception IllegalStateException if getReader() has
already been called for this request
- * @exception IOException if an input/output error occurs
- */
@Override
public ServletInputStream getInputStream() throws IOException {
@@ -1035,11 +1014,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the preferred Locale that the client will accept content in,
based on the value for the first
- * Accept-Language header that was encountered.
If the request did not specify a preferred
- * language, the server's default Locale is returned.
- */
@Override
public Locale getLocale() {
@@ -1055,11 +1029,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the set of preferred Locales that the client will accept
content in, based on the values for any
- * Accept-Language headers that were encountered.
If the request did not specify a
- * preferred language, the server's default Locale is returned.
- */
@Override
public Enumeration getLocales() {
@@ -1154,24 +1123,12 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the protocol and version used to make this Request.
- */
@Override
public String getProtocol() {
return coyoteRequest.protocol().toStringType();
}
-/**
- * Read the Reader wrapping the input stream for this Request. The default
implementation wraps a
- * BufferedReader around the servlet input stream returned by
createInputStream().
- *
- * @return a buffered reader for the request
- *
- * @exception IllegalStateException if getInputStream() has
already been called for this request
- * @exception IOException if an input/output error occurs
- */
@Override
public BufferedReader getReader() throws IOException {
@@ -1207,9 +1164,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the remote IP address making this Request.
- */
@Override
public String getRemoteAddr() {
if (remoteAddr == null) {
@@ -1232,9 +1186,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the remote host name making this Request.
- */
@Override
public String getRemoteHost() {
if (remoteHost == null) {
@@ -1248,9 +1199,6 @@ public class Request implements HttpServletRequest {
return
(tomcat) branch main updated: Remove override javadoc
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new c327f7be9f Remove override javadoc
c327f7be9f is described below
commit c327f7be9fb77892c4da59d318288ce5bc760a2c
Author: remm
AuthorDate: Fri Mar 29 11:05:39 2024 +0100
Remove override javadoc
Remove very outdated boilerplate override javadoc from the Servlet API.
---
java/org/apache/catalina/connector/Request.java | 197 ---
java/org/apache/catalina/connector/Response.java | 152 -
2 files changed, 349 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index d78887ce3a..f57888357f 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -831,11 +831,6 @@ public class Request implements HttpServletRequest {
// - ServletRequest Methods
-/**
- * @return the specified request attribute if it exists; otherwise, return
null.
- *
- * @param name Name of the request attribute to return
- */
@SuppressWarnings("deprecation")
@Override
public Object getAttribute(String name) {
@@ -941,9 +936,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the character encoding for this Request.
- */
@Override
public String getCharacterEncoding() {
String characterEncoding = coyoteRequest.getCharsetHolder().getName();
@@ -977,18 +969,12 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the content length for this Request.
- */
@Override
public int getContentLength() {
return coyoteRequest.getContentLength();
}
-/**
- * @return the content type for this Request.
- */
@Override
public String getContentType() {
return coyoteRequest.getContentType();
@@ -1005,13 +991,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the servlet input stream for this Request. The default
implementation returns a servlet input stream
- * created by createInputStream().
- *
- * @exception IllegalStateException if getReader() has
already been called for this request
- * @exception IOException if an input/output error occurs
- */
@Override
public ServletInputStream getInputStream() throws IOException {
@@ -1028,11 +1007,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the preferred Locale that the client will accept content in,
based on the value for the first
- * Accept-Language header that was encountered.
If the request did not specify a preferred
- * language, the server's default Locale is returned.
- */
@Override
public Locale getLocale() {
@@ -1048,11 +1022,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the set of preferred Locales that the client will accept
content in, based on the values for any
- * Accept-Language headers that were encountered.
If the request did not specify a
- * preferred language, the server's default Locale is returned.
- */
@Override
public Enumeration getLocales() {
@@ -,24 +1080,12 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the protocol and version used to make this Request.
- */
@Override
public String getProtocol() {
return coyoteRequest.protocol().toStringType();
}
-/**
- * Read the Reader wrapping the input stream for this Request. The default
implementation wraps a
- * BufferedReader around the servlet input stream returned by
createInputStream().
- *
- * @return a buffered reader for the request
- *
- * @exception IllegalStateException if getInputStream() has
already been called for this request
- * @exception IOException if an input/output error occurs
- */
@Override
public BufferedReader getReader() throws IOException {
@@ -1164,9 +1121,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the remote IP address making this Request.
- */
@Override
public String getRemoteAddr() {
if (remoteAddr == null) {
@@ -1189,9 +1143,6 @@ public class Request implements HttpServletRequest {
}
-/**
- * @return the remote host name making this Request.
- */
@Override
public String getRemoteHost() {
if (remoteHost == null) {
@@ -1205,9 +1156,6 @@ public class Request implements HttpServ
(tomcat) branch main updated: Update CXF
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 7d19b0f92c Update CXF 7d19b0f92c is described below commit 7d19b0f92c2e582528ac1f922721f8e1c02d381e Author: remm AuthorDate: Wed Mar 27 23:12:25 2024 +0100 Update CXF Still EE 10 compatibility issues. --- modules/cxf/pom.xml | 4 ++-- modules/cxf/src/main/java/tomcat/cxf/JsonBean.java | 6 +++--- modules/cxf/src/main/resources/META-INF/beans.xml| 6 +++--- modules/cxf/src/main/resources/META-INF/web-fragment.xml | 8 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml index 2f3690c4ef..9aa15ecce1 100644 --- a/modules/cxf/pom.xml +++ b/modules/cxf/pom.xml @@ -29,7 +29,7 @@ Apache CXF for Apache Tomcat CDI Apache CXF packaged for Apache Tomcat CDI -4.0.3 +4.0.4 jar @@ -97,7 +97,7 @@ org.apache.maven.plugins maven-compiler-plugin -21 +17 diff --git a/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java b/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java index 88ce138543..019d48cf75 100644 --- a/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java +++ b/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java @@ -16,9 +16,9 @@ */ package tomcat.cxf; -import javax.enterprise.context.Dependent; -import javax.ws.rs.Produces; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.context.Dependent; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; import org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider; diff --git a/modules/cxf/src/main/resources/META-INF/beans.xml b/modules/cxf/src/main/resources/META-INF/beans.xml index d48340296f..e21852ff29 100644 --- a/modules/cxf/src/main/resources/META-INF/beans.xml +++ b/modules/cxf/src/main/resources/META-INF/beans.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://xmlns.jcp.org/xml/ns/javaee; +https://jakarta.ee/xml/ns/jakartaee; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd; + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd; bean-discovery-mode="annotated" - version="2.0"> + version="4.0"> diff --git a/modules/cxf/src/main/resources/META-INF/web-fragment.xml b/modules/cxf/src/main/resources/META-INF/web-fragment.xml index 75ec8dbca6..e55f6921bd 100644 --- a/modules/cxf/src/main/resources/META-INF/web-fragment.xml +++ b/modules/cxf/src/main/resources/META-INF/web-fragment.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://xmlns.jcp.org/xml/ns/javaee; +https://jakarta.ee/xml/ns/jakartaee; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee - http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd; - version="4.0"> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee + https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd; + version="6.0"> tomcat-cxf - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix Java release target
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 6fe3dbf547 Fix Java release target 6fe3dbf547 is described below commit 6fe3dbf547e2e07388f688b4266f7020017294e3 Author: remm AuthorDate: Wed Mar 27 14:08:15 2024 +0100 Fix Java release target EE 10 switched back to Java 17. --- modules/owb/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml index a372517918..912abeed69 100644 --- a/modules/owb/pom.xml +++ b/modules/owb/pom.xml @@ -37,7 +37,7 @@ 2.1.0 4.0.1 2.1.1 -11.0.0-M17 +11.0.0-M18 @@ -98,7 +98,7 @@ org.apache.maven.plugins maven-compiler-plugin -21 +17 - 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: Set context CL before calling XMLInputFactory.newFactory
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3b8f277a7f Set context CL before calling XMLInputFactory.newFactory
3b8f277a7f is described below
commit 3b8f277a7ffc1193ed6c6d4fff85db6dc7327e39
Author: remm
AuthorDate: Mon Mar 25 10:45:28 2024 +0100
Set context CL before calling XMLInputFactory.newFactory
Passing the CL to XMLInputFactory.newFactory does not work because it
needs an id (basically the concrete class to load).
Try the context CL instead.
The class is preloaded for previous Tomcat versions so it shouldn't be a
security manager issue.
---
java/org/apache/jasper/compiler/EncodingDetector.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/EncodingDetector.java
b/java/org/apache/jasper/compiler/EncodingDetector.java
index cf3b623104..fb7795ca16 100644
--- a/java/org/apache/jasper/compiler/EncodingDetector.java
+++ b/java/org/apache/jasper/compiler/EncodingDetector.java
@@ -35,8 +35,15 @@ class EncodingDetector {
private static final XMLInputFactory XML_INPUT_FACTORY;
static {
-XML_INPUT_FACTORY =
XMLInputFactory.newFactory(XMLInputFactory.class.getName(),
-EncodingDetector.class.getClassLoader());
+ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
+try {
+
Thread.currentThread().setContextClassLoader(EncodingDetector.class.getClassLoader());
+XML_INPUT_FACTORY = XMLInputFactory.newFactory();
+} finally {
+if (oldCl != null) {
+Thread.currentThread().setContextClassLoader(oldCl);
+}
+}
}
private final String encoding;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Set context CL before calling XMLInputFactory.newFactory
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 9f4a88697b Set context CL before calling XMLInputFactory.newFactory
9f4a88697b is described below
commit 9f4a88697b717fcf783596938da005df0899e2fe
Author: remm
AuthorDate: Mon Mar 25 10:45:28 2024 +0100
Set context CL before calling XMLInputFactory.newFactory
Passing the CL to XMLInputFactory.newFactory does not work because it
needs an id (basically the concrete class to load).
Try the context CL instead.
The class is preloaded for previous Tomcat versions so it shouldn't be a
security manager issue.
---
java/org/apache/jasper/compiler/EncodingDetector.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/EncodingDetector.java
b/java/org/apache/jasper/compiler/EncodingDetector.java
index cf3b623104..fb7795ca16 100644
--- a/java/org/apache/jasper/compiler/EncodingDetector.java
+++ b/java/org/apache/jasper/compiler/EncodingDetector.java
@@ -35,8 +35,15 @@ class EncodingDetector {
private static final XMLInputFactory XML_INPUT_FACTORY;
static {
-XML_INPUT_FACTORY =
XMLInputFactory.newFactory(XMLInputFactory.class.getName(),
-EncodingDetector.class.getClassLoader());
+ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
+try {
+
Thread.currentThread().setContextClassLoader(EncodingDetector.class.getClassLoader());
+XML_INPUT_FACTORY = XMLInputFactory.newFactory();
+} finally {
+if (oldCl != null) {
+Thread.currentThread().setContextClassLoader(oldCl);
+}
+}
}
private final String encoding;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Set context CL before calling XMLInputFactory.newFactory
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 510c71b009 Set context CL before calling XMLInputFactory.newFactory
510c71b009 is described below
commit 510c71b009085f94122bc18501d1981322846540
Author: remm
AuthorDate: Mon Mar 25 10:45:28 2024 +0100
Set context CL before calling XMLInputFactory.newFactory
Passing the CL to XMLInputFactory.newFactory does not work because it
needs an id (basically the concrete class to load).
Try the context CL instead.
The class is preloaded for previous Tomcat versions so it shouldn't be a
security manager issue.
---
java/org/apache/jasper/compiler/EncodingDetector.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/EncodingDetector.java
b/java/org/apache/jasper/compiler/EncodingDetector.java
index cf3b623104..fb7795ca16 100644
--- a/java/org/apache/jasper/compiler/EncodingDetector.java
+++ b/java/org/apache/jasper/compiler/EncodingDetector.java
@@ -35,8 +35,15 @@ class EncodingDetector {
private static final XMLInputFactory XML_INPUT_FACTORY;
static {
-XML_INPUT_FACTORY =
XMLInputFactory.newFactory(XMLInputFactory.class.getName(),
-EncodingDetector.class.getClassLoader());
+ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
+try {
+
Thread.currentThread().setContextClassLoader(EncodingDetector.class.getClassLoader());
+XML_INPUT_FACTORY = XMLInputFactory.newFactory();
+} finally {
+if (oldCl != null) {
+Thread.currentThread().setContextClassLoader(oldCl);
+}
+}
}
private final String encoding;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add native access to the scripts
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 6550e203a8 Add native access to the scripts 6550e203a8 is described below commit 6550e203a8119683f38c182cbfbb9b56587c54a0 Author: remm AuthorDate: Fri Mar 22 13:33:27 2024 +0100 Add native access to the scripts --- bin/catalina.bat | 1 + bin/catalina.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/bin/catalina.bat b/bin/catalina.bat index 9c55ae940e..9a30371013 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -223,6 +223,7 @@ set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.io=ALL-UNNAMED" set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.util=ALL-UNNAMED" set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +set "JAVA_OPTS=%JAVA_OPTS% --enable-native-access=ALL-UNNAMED" rem - Execute The Requested Command --- diff --git a/bin/catalina.sh b/bin/catalina.sh index 32f87ffb6f..ed647a2dea 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -296,6 +296,7 @@ JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --enable-native-access=ALL-UNNAMED" # - Execute The Requested Command - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add native access to the scripts
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 8d4ed643fe Add native access to the scripts 8d4ed643fe is described below commit 8d4ed643fe3cae1ba031b72b2f51bc0d0ccb16d6 Author: remm AuthorDate: Fri Mar 22 13:33:27 2024 +0100 Add native access to the scripts --- bin/catalina.bat | 1 + bin/catalina.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/bin/catalina.bat b/bin/catalina.bat index e2e1c4ac8d..78a7eb9d9f 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -219,6 +219,7 @@ set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.io=ALL-UNNAMED" set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.util=ALL-UNNAMED" set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" set "JAVA_OPTS=%JAVA_OPTS% --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +set "JAVA_OPTS=%JAVA_OPTS% --enable-native-access=ALL-UNNAMED" rem - Execute The Requested Command --- diff --git a/bin/catalina.sh b/bin/catalina.sh index 33649fac27..ee679ad0c6 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -292,6 +292,7 @@ JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --enable-native-access=ALL-UNNAMED" # - Execute The Requested Command - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add OpenSSL FFM listener to the config, commented out
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 8223f1a551 Add OpenSSL FFM listener to the config, commented out 8223f1a551 is described below commit 8223f1a5511f67b3120c0eb5a83a0e6b56966d94 Author: remm AuthorDate: Fri Mar 22 13:17:59 2024 +0100 Add OpenSSL FFM listener to the config, commented out --- conf/server.xml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/server.xml b/conf/server.xml index fc720ce70b..2beafa4a83 100644 --- a/conf/server.xml +++ b/conf/server.xml @@ -24,8 +24,10 @@ - - + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add OpenSSL FFM listener to the config, commented out
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 2bd79f033d Add OpenSSL FFM listener to the config, commented out 2bd79f033d is described below commit 2bd79f033d8014a9cd3d9d6b743b2f786353cd07 Author: remm AuthorDate: Fri Mar 22 13:17:59 2024 +0100 Add OpenSSL FFM listener to the config, commented out --- conf/server.xml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/server.xml b/conf/server.xml index 72bda52c93..a5331fd048 100644 --- a/conf/server.xml +++ b/conf/server.xml @@ -24,8 +24,10 @@ - - + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Checkstyle
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new d88395724c Checkstyle d88395724c is described below commit d88395724c9def7cb03005c1a5db2410e6d89930 Author: remm AuthorDate: Tue Mar 19 09:31:37 2024 +0100 Checkstyle --- webapps/docs/changelog.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 1766e6ede2..78bc1f2619 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -159,7 +159,6 @@ org.apache.catalina.security.TLSCertificateReloadListener. (markt) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Cleanup
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 0fa4407ded Cleanup
0fa4407ded is described below
commit 0fa4407ded5bdde2a1658814c89fb33d43933ca1
Author: remm
AuthorDate: Mon Mar 18 16:16:33 2024 +0100
Cleanup
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 31969af460..12d70bf007 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -523,7 +523,6 @@ public abstract class AbstractEndpoint {
// Only try to negotiate if both client and server have at least
// one protocol in common
// Note: Tomcat does not explicitly negotiate http/1.1
-// TODO: Is this correct? Should it change?
List commonProtocols = new
ArrayList<>(negotiableProtocols);
commonProtocols.retainAll(clientRequestedApplicationProtocols);
if (commonProtocols.size() > 0) {
@@ -1235,6 +1234,7 @@ public abstract class AbstractEndpoint {
this.executor = null;
if (executor instanceof ThreadPoolExecutor) {
//this is our internal one, so we need to shut it down
+@SuppressWarnings("resource")
ThreadPoolExecutor tpe = (ThreadPoolExecutor) executor;
tpe.shutdownNow();
long timeout = getExecutorTerminationTimeoutMillis();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1916321 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ annotationapi/ annotationapi/javax/annotation/ annotationapi/javax/annotation/security/ annotationapi/javax/annotation/sql/ api/ ap
Author: remm Date: Thu Mar 14 22:29:49 2024 New Revision: 1916321 URL: http://svn.apache.org/viewvc?rev=1916321=rev Log: Docs update for 9.0.87 [This commit notification would consist of 57 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1916320 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: remm
Date: Thu Mar 14 22:23:44 2024
New Revision: 1916320
URL: http://svn.apache.org/viewvc?rev=1916320=rev
Log:
Site update for 9.0.87
Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-90.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1916320=1916319=1916320=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Thu Mar 14 22:23:44 2024
@@ -37,9 +37,9 @@ tomcat.loc=https://downloads.apache.org/
# - Tomcat versions -
tomcat8.5=8.5.99
-tomcat9.0=9.0.86
+tomcat9.0=9.0.87
tomcat10.1=10.1.19
-tomcat11.0=11.0.0-M18
+tomcat11.0=11.0.0-M17
# - Download destination -
tomcat-site-docs.home=${base.path}/tomcat-site-docs/
Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1916320=1916319=1916320=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Mar 14 22:23:44 2024
@@ -74,8 +74,8 @@
Latest Stable 9.0.x Release
-2024-02-19
-9.0.86
+2024-03-14
+9.0.87
Modified: tomcat/site/trunk/docs/download-90.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1916320=1916319=1916320=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Thu Mar 14 22:23:44 2024
@@ -10,7 +10,7 @@
Quick Navigation
-[define v]9.0.86[end]
+[define v]9.0.87[end]
https://downloads.apache.org/tomcat/tomcat-9/KEYS;>KEYS |
[v] |
Browse |
Modified: tomcat/site/trunk/docs/index.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1916320=1916319=1916320=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Mar 14 22:23:44 2024
@@ -34,6 +34,32 @@ wiki page.
Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
project logo are trademarks of the Apache Software Foundation.
+2024-03-14 Tomcat 9.0.87 Released
+
+The Apache Tomcat Project is proud to announce the release of version 9.0.87
+of Apache Tomcat. This release implements specifications that are part of the
+Java EE 8 platform. The notable changes compared to 9.0.86 include:
+
+When restoring a saved POST request after a successful FORM
+authentication, ensure that neither the URI, the query string nor
+the protocol are corrupted when restoring the request body.
+Align error handling for Writer and OutputStream. Ensure use of either
+once the response has been recycled triggers a NullPointerException
+provided that discardFacades is configured with the default value of
+true.
+The standard thread pool implementations that are
+configured using the Executor element now implement
+ExecutorService for better support of NIO2 or others.
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
+
+
+https://tomcat.apache.org/download-90.cgi;>Download
+
2024-03-14 Tomcat 11.0.0-M18 Released
The Apache Tomcat Project is proud to announce the release of version
11.0.0-M18
@@ -132,29 +158,6 @@ changelog.
https://tomcat.apache.org/download-10.cgi;>Download
-2024-02-19 Tomcat 9.0.86 Released
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.86
-of Apache Tomcat. This release implements specifications that are part of the
-Java EE 8 platform. The notable changes compared to 9.0.85 include:
-
-Add improvements to the CSRF prevention filter including the ability to
skip
-adding nonces for resource name and subtree URL patterns.
-Add support for user provided SSLContext instances configured on
-SSLHostConfigCertificate instances. Based on pull request #673 provided by
-Hakan AltındaÄ.
-Review usage of debug logging and downgrade trace or data dumping
operations
-from debug level to trace.
-
-
-Full details of these changes, and all the other changes, are available in the
(tomcat) branch 9.0.x updated: Add release date
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 3f7bc2369b Add release date 3f7bc2369b is described below commit 3f7bc2369b888e8f2eb35e727356f0a5be6fa8f6 Author: remm AuthorDate: Thu Mar 14 22:13:21 2024 +0100 Add release date --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9d9709c21e..2fca56cc59 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -154,7 +154,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r67953 - /dev/tomcat/tomcat-9/v9.0.87/ /release/tomcat/tomcat-9/v9.0.87/
Author: remm Date: Thu Mar 14 21:09:26 2024 New Revision: 67953 Log: Release Apache Tomcat 9.0.87 Added: release/tomcat/tomcat-9/v9.0.87/ - copied from r67952, dev/tomcat/tomcat-9/v9.0.87/ Removed: dev/tomcat/tomcat-9/v9.0.87/ - 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 (6ed7e863f8 -> 087ef472ce)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 6ed7e863f8 Update to Checkstyle 10.14.1 new bc5425ef87 Add thread idle time configuration new 087ef472ce Update createExecutor with the new attribute 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: .../apache/tomcat/util/net/AbstractEndpoint.java | 29 -- webapps/docs/changelog.xml | 10 webapps/docs/config/http.xml | 13 ++ 3 files changed, 50 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Update createExecutor with the new attribute
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 087ef472cefa81c53649b423468708e3550c99c2
Author: remm
AuthorDate: Tue Mar 12 20:41:06 2024 +0100
Update createExecutor with the new attribute
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 7396154b53..53a0b807b3 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1125,8 +1125,9 @@ public abstract class AbstractEndpoint {
} else {
TaskQueue taskqueue = new TaskQueue();
TaskThreadFactory tf = new TaskThreadFactory(getName() + "-exec-",
daemon, getThreadPriority());
-executor = new ThreadPoolExecutor(getMinSpareThreads(),
getMaxThreads(), 60, TimeUnit.SECONDS,taskqueue, tf);
-taskqueue.setParent( (ThreadPoolExecutor) executor);
+executor = new ThreadPoolExecutor(getMinSpareThreads(),
getMaxThreads(), getThreadsMaxIdleTime(),
+TimeUnit.MILLISECONDS, taskqueue, tf);
+taskqueue.setParent((ThreadPoolExecutor) executor);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Add thread idle time configuration
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit bc5425ef8788cb52fe31ef040c07fb8efff12e7f
Author: remm
AuthorDate: Tue Mar 12 20:38:11 2024 +0100
Add thread idle time configuration
The default remains 60s.
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 24 ++
webapps/docs/changelog.xml | 10 +
webapps/docs/config/http.xml | 13
3 files changed, 47 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 05a1ede2ec..7396154b53 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -875,6 +875,30 @@ public abstract class AbstractEndpoint {
}
+/**
+ * Amount of time in milliseconds before the internal thread pool stops
any idle threads
+ * if the amount of thread is greater than the minimum amount of spare
threads.
+ */
+private int threadsMaxIdleTime = 6;
+public void setThreadsMaxIdleTime(int threadsMaxIdleTime) {
+this.threadsMaxIdleTime = threadsMaxIdleTime;
+Executor executor = this.executor;
+if (internalExecutor && executor instanceof ThreadPoolExecutor) {
+// The internal executor should always be an instance of
+// org.apache.tomcat.util.threads.ThreadPoolExecutor but it may be
+// null if the endpoint is not running.
+// This check also avoids various threading issues.
+((ThreadPoolExecutor)
executor).setKeepAliveTime(threadsMaxIdleTime, TimeUnit.MILLISECONDS);
+}
+}
+public int getThreadsMaxIdleTime() {
+if (internalExecutor) {
+return threadsMaxIdleTime;
+} else {
+return -1;
+}
+}
+
/**
* Priority of the worker threads.
*/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 825e6634b9..b49bdc64fe 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,16 @@
+
+
+
+Add threadsMaxIdleTime attribute to the endpoint,
+to allow configuring the amount of time before an internal executor
+will scale back to the configured minSpareThreads size.
+ (remm)
+
+
+
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 415aef54a3..253fed0314 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -726,6 +726,19 @@
-1 to make clear that it is not used.
+
+ The amount of time in milliseconds that threads will be kept alive by
+ the thread pool, if there are more than minSpareThreads
+ threads in the executor. If not specified, the default of
+ 6 milliseconds is used. If an executor is associated
+ with this connector, this attribute
+ is ignored as the connector will execute tasks using the executor rather
+ than an internal thread pool. Note that if an executor is configured any
+ value set for this attribute will be recorded correctly but it will be
+ reported (e.g. via JMX) as -1 to make clear that it is not
+ used.
+
+
If the Connector experiences an Exception during a Lifecycle
transition
should the Exception be rethrown or logged? If not specified, the default
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add thread idle time configuration
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 7f223b1eb3 Add thread idle time configuration
7f223b1eb3 is described below
commit 7f223b1eb38762fc72a5db35658a00c1aad8186e
Author: remm
AuthorDate: Tue Mar 12 20:38:11 2024 +0100
Add thread idle time configuration
The default remains 60s.
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 29 --
webapps/docs/changelog.xml | 6 +
webapps/docs/config/http.xml | 13 ++
3 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index bcc2b9ecb9..bfb90b0127 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -813,6 +813,30 @@ public abstract class AbstractEndpoint {
}
+/**
+ * Amount of time in milliseconds before the internal thread pool stops
any idle threads
+ * if the amount of thread is greater than the minimum amount of spare
threads.
+ */
+private int threadsMaxIdleTime = 6;
+public void setThreadsMaxIdleTime(int threadsMaxIdleTime) {
+this.threadsMaxIdleTime = threadsMaxIdleTime;
+Executor executor = this.executor;
+if (internalExecutor && executor instanceof ThreadPoolExecutor) {
+// The internal executor should always be an instance of
+// org.apache.tomcat.util.threads.ThreadPoolExecutor but it may be
+// null if the endpoint is not running.
+// This check also avoids various threading issues.
+((ThreadPoolExecutor)
executor).setKeepAliveTime(threadsMaxIdleTime, TimeUnit.MILLISECONDS);
+}
+}
+public int getThreadsMaxIdleTime() {
+if (internalExecutor) {
+return threadsMaxIdleTime;
+} else {
+return -1;
+}
+}
+
/**
* Priority of the worker threads.
*/
@@ -1049,8 +1073,9 @@ public abstract class AbstractEndpoint {
} else {
TaskQueue taskqueue = new TaskQueue();
TaskThreadFactory tf = new TaskThreadFactory(getName() + "-exec-",
daemon, getThreadPriority());
-executor = new ThreadPoolExecutor(getMinSpareThreads(),
getMaxThreads(), 60, TimeUnit.SECONDS,taskqueue, tf);
-taskqueue.setParent( (ThreadPoolExecutor) executor);
+executor = new ThreadPoolExecutor(getMinSpareThreads(),
getMaxThreads(), getThreadsMaxIdleTime(),
+TimeUnit.MILLISECONDS, taskqueue, tf);
+taskqueue.setParent((ThreadPoolExecutor) executor);
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 31fae9bdd2..a5290dd74c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -171,6 +171,12 @@
added to the backlog immediately rather than waiting until the write
attempt for the remaining content. (markt)
+
+Add threadsMaxIdleTime attribute to the endpoint,
+to allow configuring the amount of time before an internal executor
+will scale back to the configured minSpareThreads size.
+(remm)
+
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 2ddefad711..010f40372c 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -707,6 +707,19 @@
-1 to make clear that it is not used.
+
+ The amount of time in milliseconds that threads will be kept alive by
+ the thread pool, if there are more than minSpareThreads
+ threads in the executor. If not specified, the default of
+ 6 milliseconds is used. If an executor is associated
+ with this connector, this attribute
+ is ignored as the connector will execute tasks using the executor rather
+ than an internal thread pool. Note that if an executor is configured any
+ value set for this attribute will be recorded correctly but it will be
+ reported (e.g. via JMX) as -1 to make clear that it is not
+ used.
+
+
If the Connector experiences an Exception during a Lifecycle
transition
should the Exception be rethrown or logged? If not specified, the default
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update createExecutor with the new attribute
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 05543c8ae5 Update createExecutor with the new attribute
05543c8ae5 is described below
commit 05543c8ae5286ba0582c0374c8ebb6ea7f402d9f
Author: remm
AuthorDate: Tue Mar 12 20:41:06 2024 +0100
Update createExecutor with the new attribute
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 006e8925ef..31969af460 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1222,8 +1222,9 @@ public abstract class AbstractEndpoint {
} else {
TaskQueue taskqueue = new TaskQueue();
TaskThreadFactory tf = new TaskThreadFactory(getName() + "-exec-",
daemon, getThreadPriority());
-executor = new ThreadPoolExecutor(getMinSpareThreads(),
getMaxThreads(), 60, TimeUnit.SECONDS,taskqueue, tf);
-taskqueue.setParent( (ThreadPoolExecutor) executor);
+executor = new ThreadPoolExecutor(getMinSpareThreads(),
getMaxThreads(), getThreadsMaxIdleTime(),
+TimeUnit.MILLISECONDS, taskqueue, tf);
+taskqueue.setParent((ThreadPoolExecutor) executor);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add thread idle time configuration
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 5d8fb49d2d Add thread idle time configuration
5d8fb49d2d is described below
commit 5d8fb49d2db63f37e3bb322f1c08a98ae287a8e7
Author: remm
AuthorDate: Tue Mar 12 20:38:11 2024 +0100
Add thread idle time configuration
The default remains 60s.
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 24 ++
webapps/docs/changelog.xml | 10 +
webapps/docs/config/http.xml | 13
3 files changed, 47 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 4c9942a3b4..006e8925ef 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -975,6 +975,30 @@ public abstract class AbstractEndpoint {
}
+/**
+ * Amount of time in milliseconds before the internal thread pool stops
any idle threads
+ * if the amount of thread is greater than the minimum amount of spare
threads.
+ */
+private int threadsMaxIdleTime = 6;
+public void setThreadsMaxIdleTime(int threadsMaxIdleTime) {
+this.threadsMaxIdleTime = threadsMaxIdleTime;
+Executor executor = this.executor;
+if (internalExecutor && executor instanceof ThreadPoolExecutor) {
+// The internal executor should always be an instance of
+// org.apache.tomcat.util.threads.ThreadPoolExecutor but it may be
+// null if the endpoint is not running.
+// This check also avoids various threading issues.
+((ThreadPoolExecutor)
executor).setKeepAliveTime(threadsMaxIdleTime, TimeUnit.MILLISECONDS);
+}
+}
+public int getThreadsMaxIdleTime() {
+if (internalExecutor) {
+return threadsMaxIdleTime;
+} else {
+return -1;
+}
+}
+
/**
* Priority of the worker threads.
*/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 96cd91a95b..4f3e7a605d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,16 @@
+
+
+
+Add threadsMaxIdleTime attribute to the endpoint,
+to allow configuring the amount of time before an internal executor
+will scale back to the configured minSpareThreads size.
+ (remm)
+
+
+
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 1311af1eb5..c0636f5559 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -682,6 +682,19 @@
-1 to make clear that it is not used.
+
+ The amount of time in milliseconds that threads will be kept alive by
+ the thread pool, if there are more than minSpareThreads
+ threads in the executor. If not specified, the default of
+ 6 milliseconds is used. If an executor is associated
+ with this connector, this attribute
+ is ignored as the connector will execute tasks using the executor rather
+ than an internal thread pool. Note that if an executor is configured any
+ value set for this attribute will be recorded correctly but it will be
+ reported (e.g. via JMX) as -1 to make clear that it is not
+ used.
+
+
If the Connector experiences an Exception during a Lifecycle
transition
should the Exception be rethrown or logged? If not specified, the default
-
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: Add attribute for error status code
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 489288341c Add attribute for error status code
489288341c is described below
commit 489288341c106b0e498fa8ca2721528cb4e3b48a
Author: remm
AuthorDate: Mon Mar 11 15:24:41 2024 +0100
Add attribute for error status code
Part 1 of BZ 60997.
Although subclasses can do it (that is the design of the valve), it
seems very reasonable/simple to add it.
---
java/org/apache/catalina/valves/SemaphoreValve.java | 19 ++-
webapps/docs/changelog.xml | 10 ++
webapps/docs/config/valve.xml | 7 +++
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/valves/SemaphoreValve.java
b/java/org/apache/catalina/valves/SemaphoreValve.java
index 66b03d7868..4b2e2ce7de 100644
--- a/java/org/apache/catalina/valves/SemaphoreValve.java
+++ b/java/org/apache/catalina/valves/SemaphoreValve.java
@@ -113,6 +113,21 @@ public class SemaphoreValve extends ValveBase {
}
+/**
+ * High concurrency status. This status code is returned as an
+ * error if concurrency is too high.
+ */
+protected int highConcurrencyStatus = -1;
+
+public int getHighConcurrencyStatus() {
+return this.highConcurrencyStatus;
+}
+
+public void setHighConcurrencyStatus(int highConcurrencyStatus) {
+this.highConcurrencyStatus = highConcurrencyStatus;
+}
+
+
/**
* Start this component and implement the requirements of
* {@link org.apache.catalina.util.LifecycleBase#startInternal()}.
@@ -213,7 +228,9 @@ public class SemaphoreValve extends ValveBase {
* @throws ServletException Other error
*/
public void permitDenied(Request request, Response response) throws
IOException, ServletException {
-// NO-OP by default
+if (highConcurrencyStatus > 0) {
+response.sendError(highConcurrencyStatus);
+}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cf21f8c98f..d8842e1476 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,16 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Add highConcurrencyStatus attribute to the
+SemaphoreValve to optionally allow the valve to return an
+error status code to the client when a permit cannot be acquired from
+the semaphore. (remm)
+
+
+
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index d71997d32c..f4a862ba1a 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -2556,6 +2556,13 @@
false.
+
+The error status code which will be returned to the client, if the
+value is positive, when a permit cannot be acquired from the
+sepmaphore. The default value is -1, which will mean
+no error status will be sent back.
+
+
Flag to determine if a thread may be interrupted until a permit is
available. The default value is false.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add attribute for error status code
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 73b1d69768 Add attribute for error status code
73b1d69768 is described below
commit 73b1d69768ebc24e2d6d2d2f15b7c2e2670bc40d
Author: remm
AuthorDate: Mon Mar 11 15:24:41 2024 +0100
Add attribute for error status code
Part 1 of BZ 60997.
Although subclasses can do it (that is the design of the valve), it
seems very reasonable/simple to add it.
---
java/org/apache/catalina/valves/SemaphoreValve.java | 19 ++-
webapps/docs/changelog.xml | 6 ++
webapps/docs/config/valve.xml | 7 +++
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/valves/SemaphoreValve.java
b/java/org/apache/catalina/valves/SemaphoreValve.java
index 9a4edfd61e..6b4b5830ef 100644
--- a/java/org/apache/catalina/valves/SemaphoreValve.java
+++ b/java/org/apache/catalina/valves/SemaphoreValve.java
@@ -113,6 +113,21 @@ public class SemaphoreValve extends ValveBase {
}
+/**
+ * High concurrency status. This status code is returned as an
+ * error if concurrency is too high.
+ */
+protected int highConcurrencyStatus = -1;
+
+public int getHighConcurrencyStatus() {
+return this.highConcurrencyStatus;
+}
+
+public void setHighConcurrencyStatus(int highConcurrencyStatus) {
+this.highConcurrencyStatus = highConcurrencyStatus;
+}
+
+
/**
* Start this component and implement the requirements of
* {@link org.apache.catalina.util.LifecycleBase#startInternal()}.
@@ -213,7 +228,9 @@ public class SemaphoreValve extends ValveBase {
* @throws ServletException Other error
*/
public void permitDenied(Request request, Response response) throws
IOException, ServletException {
-// NO-OP by default
+if (highConcurrencyStatus > 0) {
+response.sendError(highConcurrencyStatus);
+}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index adf2b62598..7c29321e12 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -150,6 +150,12 @@
rewrite valve to allow skipping over the next valve in the Catalina
pipeline. (remm)
+
+Add highConcurrencyStatus attribute to the
+SemaphoreValve to optionally allow the valve to return an
+error status code to the client when a permit cannot be acquired from
+the semaphore. (remm)
+
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 18fa9cddd7..7f859cc2cd 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -2555,6 +2555,13 @@
false.
+
+The error status code which will be returned to the client, if the
+value is positive, when a permit cannot be acquired from the
+sepmaphore. The default value is -1, which will mean
+no error status will be sent back.
+
+
Flag to determine if a thread may be interrupted until a permit is
available. The default value is false.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add attribute for error status code
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new c939a4136a Add attribute for error status code
c939a4136a is described below
commit c939a4136ad2eb9c5928a084e9d1d8a26ee4f546
Author: remm
AuthorDate: Mon Mar 11 15:24:41 2024 +0100
Add attribute for error status code
Part 1 of BZ 60997.
Although subclasses can do it (that is the design of the valve), it
seems very reasonable/simple to add it.
---
java/org/apache/catalina/valves/SemaphoreValve.java | 19 ++-
webapps/docs/changelog.xml | 10 ++
webapps/docs/config/valve.xml | 7 +++
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/valves/SemaphoreValve.java
b/java/org/apache/catalina/valves/SemaphoreValve.java
index 9a4edfd61e..6b4b5830ef 100644
--- a/java/org/apache/catalina/valves/SemaphoreValve.java
+++ b/java/org/apache/catalina/valves/SemaphoreValve.java
@@ -113,6 +113,21 @@ public class SemaphoreValve extends ValveBase {
}
+/**
+ * High concurrency status. This status code is returned as an
+ * error if concurrency is too high.
+ */
+protected int highConcurrencyStatus = -1;
+
+public int getHighConcurrencyStatus() {
+return this.highConcurrencyStatus;
+}
+
+public void setHighConcurrencyStatus(int highConcurrencyStatus) {
+this.highConcurrencyStatus = highConcurrencyStatus;
+}
+
+
/**
* Start this component and implement the requirements of
* {@link org.apache.catalina.util.LifecycleBase#startInternal()}.
@@ -213,7 +228,9 @@ public class SemaphoreValve extends ValveBase {
* @throws ServletException Other error
*/
public void permitDenied(Request request, Response response) throws
IOException, ServletException {
-// NO-OP by default
+if (highConcurrencyStatus > 0) {
+response.sendError(highConcurrencyStatus);
+}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8b4bdbb4bf..1558eb7938 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,16 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Add highConcurrencyStatus attribute to the
+SemaphoreValve to optionally allow the valve to return an
+error status code to the client when a permit cannot be acquired from
+the semaphore. (remm)
+
+
+
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 82f7b70e26..0be8bef9b4 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -2555,6 +2555,13 @@
false.
+
+The error status code which will be returned to the client, if the
+value is positive, when a permit cannot be acquired from the
+sepmaphore. The default value is -1, which will mean
+no error status will be sent back.
+
+
Flag to determine if a thread may be interrupted until a permit is
available. The default value is false.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Next is M19
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9a99f681a1 Next is M19 9a99f681a1 is described below commit 9a99f681a1a9eb62a64472a7ce286d9911fa04b0 Author: remm AuthorDate: Mon Mar 11 15:12:10 2024 +0100 Next is M19 --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 608d420343..1d43db2afb 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=11 version.minor=0 version.build=0 version.patch=0 -version.suffix=-M18 +version.suffix=-M19 version.dev=-dev # - Build tools - diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 03b441851e..c6ec943726 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=11.0.0-M18 +maven.asf.release.deploy.version=11.0.0-M19 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 19aab1f4eb..8b4bdbb4bf 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
