[Bug 66359] Document default value for RemoteIpValue#protocolHeader and RemoteIpFilter#protocolHeader
https://bz.apache.org/bugzilla/show_bug.cgi?id=66359 Han Li changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Han Li --- Fixed in: - 11.0.x for 11.0.0-M1 onwards - 10.1.x for 10.1.3 onwards - 9.0.x for 9.0.70 onwards - 8.5.x for 8.5.85 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: BZ 66359 - Update javadoc for RemoteIpFilter and RemoteIpValve
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new bdbb26ecff BZ 66359 - Update javadoc for RemoteIpFilter and
RemoteIpValve
bdbb26ecff is described below
commit bdbb26ecff802cf1388856d35a689105f545b97a
Author: lihan
AuthorDate: Tue Nov 22 11:14:48 2022 +0800
BZ 66359 - Update javadoc for RemoteIpFilter and RemoteIpValve
https://bz.apache.org/bugzilla/show_bug.cgi?id=66359
---
java/org/apache/catalina/filters/RemoteIpFilter.java | 6 +++---
java/org/apache/catalina/valves/RemoteIpValve.java | 6 +++---
webapps/docs/changelog.xml | 5 +
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 6a4570800d..bff881e161 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -84,7 +84,7 @@ import org.apache.tomcat.util.res.StringManager;
* otherwise, the ip/host is declared to be the remote ip and looping is
stopped.
*
*
- * If the request http header named $protocolHeader (e.g.
x-forwarded-proto) consists only of forwards that match
+ * If the request http header named $protocolHeader (default
value X-Forwarded-Proto) consists only of forwards that match
* protocolHeaderHttpsValue configuration parameter (default
https) then request.isSecure = true,
* request.scheme = https and request.serverPort =
443. Note that 443 can be overwritten with the
* $httpsServerPort configuration parameter.
@@ -148,7 +148,7 @@ import org.apache.tomcat.util.res.StringManager;
* Name of the http header read by this servlet filter that holds the flag
that this request
* N/A
* Compliant http header name like X-Forwarded-Proto,
X-Forwarded-Ssl or Front-End-Https
- * null
+ * X-Forwarded-Proto
*
*
* protocolHeaderHttpsValue
@@ -1224,7 +1224,7 @@ public class RemoteIpFilter extends GenericFilter {
* request.secure will not be modified.
*
*
- * Default value : null
+ * Default value : X-Forwarded-Proto
*
* @param protocolHeader The header name
*/
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java
b/java/org/apache/catalina/valves/RemoteIpValve.java
index 4fdf62ef0c..eb6346eafc 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -63,7 +63,7 @@ import org.apache.tomcat.util.http.parser.Host;
* otherwise, the ip/host is declared to be the remote ip and looping is
stopped.
*
*
- * If the request http header named $protocolHeader (e.g.
x-forwarded-proto) consists only of forwards that match
+ * If the request http header named $protocolHeader (default
value X-Forwarded-Proto) consists only of forwards that match
* protocolHeaderHttpsValue configuration parameter (default
https) then request.isSecure = true,
* request.scheme = https and request.serverPort =
443. Note that 443 can be overwritten with the
* $httpsServerPort configuration parameter.
@@ -126,7 +126,7 @@ import org.apache.tomcat.util.http.parser.Host;
* Name of the http header read by this valve that holds the flag that
this request
* N/A
* Compliant http header name like X-Forwarded-Proto,
X-Forwarded-Ssl or Front-End-Https
- * null
+ * X-Forwarded-Proto
*
*
* protocolHeaderHttpsValue
@@ -859,7 +859,7 @@ public class RemoteIpValve extends ValveBase {
* request.secure will not be modified.
*
*
- * Default value : null
+ * Default value : X-Forwarded-Proto
*
* @param protocolHeader The header name
*/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 83a1958221..a140055a53 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,11 @@
the Servlet context so that it actually reflects what is used during
authentication. (remm)
+
+66359: Update javadoc for RemoteIpValve and RemoteIpFilter
with
+correct protocolHeader default value of
"X-Forwarded-Proto".
+(lihan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: BZ 66359 - Update javadoc for RemoteIpFilter and RemoteIpValve
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 26f9951373 BZ 66359 - Update javadoc for RemoteIpFilter and
RemoteIpValve
26f9951373 is described below
commit 26f99513735cfa2917eecbc818f46fc52da0a256
Author: lihan
AuthorDate: Tue Nov 22 11:14:48 2022 +0800
BZ 66359 - Update javadoc for RemoteIpFilter and RemoteIpValve
https://bz.apache.org/bugzilla/show_bug.cgi?id=66359
---
java/org/apache/catalina/filters/RemoteIpFilter.java | 6 +++---
java/org/apache/catalina/valves/RemoteIpValve.java | 6 +++---
webapps/docs/changelog.xml | 5 +
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index a264ef27e5..6f13a1795e 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -84,7 +84,7 @@ import org.apache.tomcat.util.res.StringManager;
* otherwise, the ip/host is declared to be the remote ip and looping is
stopped.
*
*
- * If the request http header named $protocolHeader (e.g.
x-forwarded-proto) consists only of forwards that match
+ * If the request http header named $protocolHeader (default
value X-Forwarded-Proto) consists only of forwards that match
* protocolHeaderHttpsValue configuration parameter (default
https) then request.isSecure = true,
* request.scheme = https and request.serverPort =
443. Note that 443 can be overwritten with the
* $httpsServerPort configuration parameter.
@@ -148,7 +148,7 @@ import org.apache.tomcat.util.res.StringManager;
* Name of the http header read by this servlet filter that holds the flag
that this request
* N/A
* Compliant http header name like X-Forwarded-Proto,
X-Forwarded-Ssl or Front-End-Https
- * null
+ * X-Forwarded-Proto
*
*
* protocolHeaderHttpsValue
@@ -1224,7 +1224,7 @@ public class RemoteIpFilter extends GenericFilter {
* request.secure will not be modified.
*
*
- * Default value : null
+ * Default value : X-Forwarded-Proto
*
* @param protocolHeader The header name
*/
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java
b/java/org/apache/catalina/valves/RemoteIpValve.java
index 3365bcc20c..688515de14 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -65,7 +65,7 @@ import org.apache.tomcat.util.http.parser.Host;
* otherwise, the ip/host is declared to be the remote ip and looping is
stopped.
*
*
- * If the request http header named $protocolHeader (e.g.
x-forwarded-proto) consists only of forwards that match
+ * If the request http header named $protocolHeader (default
value X-Forwarded-Proto) consists only of forwards that match
* protocolHeaderHttpsValue configuration parameter (default
https) then request.isSecure = true,
* request.scheme = https and request.serverPort =
443. Note that 443 can be overwritten with the
* $httpsServerPort configuration parameter.
@@ -128,7 +128,7 @@ import org.apache.tomcat.util.http.parser.Host;
* Name of the http header read by this valve that holds the flag that
this request
* N/A
* Compliant http header name like X-Forwarded-Proto,
X-Forwarded-Ssl or Front-End-Https
- * null
+ * X-Forwarded-Proto
*
*
* protocolHeaderHttpsValue
@@ -887,7 +887,7 @@ public class RemoteIpValve extends ValveBase {
* request.secure will not be modified.
*
*
- * Default value : null
+ * Default value : X-Forwarded-Proto
*
* @param protocolHeader The header name
*/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 547340eab0..084a84c529 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,11 @@
the Servlet context so that it actually reflects what is used during
authentication. (remm)
+
+66359: Update javadoc for RemoteIpValve and RemoteIpFilter
with
+correct protocolHeader default value of
"X-Forwarded-Proto".
+(lihan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: BZ 66359 - Update javadoc for RemoteIpFilter and RemoteIpValve
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 24a10f2900 BZ 66359 - Update javadoc for RemoteIpFilter and
RemoteIpValve
24a10f2900 is described below
commit 24a10f29001b753d4ab879c42c964eaa955bcfbd
Author: lihan
AuthorDate: Tue Nov 22 11:14:48 2022 +0800
BZ 66359 - Update javadoc for RemoteIpFilter and RemoteIpValve
https://bz.apache.org/bugzilla/show_bug.cgi?id=66359
---
java/org/apache/catalina/filters/RemoteIpFilter.java | 6 +++---
java/org/apache/catalina/valves/RemoteIpValve.java | 6 +++---
webapps/docs/changelog.xml | 5 +
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index c485ea3fdc..28c692202d 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -83,7 +83,7 @@ import org.apache.tomcat.util.res.StringManager;
* otherwise, the ip/host is declared to be the remote ip and looping is
stopped.
*
*
- * If the request http header named $protocolHeader (e.g.
x-forwarded-proto) consists only of forwards that match
+ * If the request http header named $protocolHeader (default
value X-Forwarded-Proto) consists only of forwards that match
* protocolHeaderHttpsValue configuration parameter (default
https) then request.isSecure = true,
* request.scheme = https and request.serverPort =
443. Note that 443 can be overwritten with the
* $httpsServerPort configuration parameter.
@@ -147,7 +147,7 @@ import org.apache.tomcat.util.res.StringManager;
* Name of the http header read by this servlet filter that holds the flag
that this request
* N/A
* Compliant http header name like X-Forwarded-Proto,
X-Forwarded-Ssl or Front-End-Https
- * null
+ * X-Forwarded-Proto
*
*
* protocolHeaderHttpsValue
@@ -1197,7 +1197,7 @@ public class RemoteIpFilter extends GenericFilter {
* request.secure will not be modified.
*
*
- * Default value : null
+ * Default value : X-Forwarded-Proto
*
* @param protocolHeader The header name
*/
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java
b/java/org/apache/catalina/valves/RemoteIpValve.java
index 4fdf62ef0c..eb6346eafc 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -63,7 +63,7 @@ import org.apache.tomcat.util.http.parser.Host;
* otherwise, the ip/host is declared to be the remote ip and looping is
stopped.
*
*
- * If the request http header named $protocolHeader (e.g.
x-forwarded-proto) consists only of forwards that match
+ * If the request http header named $protocolHeader (default
value X-Forwarded-Proto) consists only of forwards that match
* protocolHeaderHttpsValue configuration parameter (default
https) then request.isSecure = true,
* request.scheme = https and request.serverPort =
443. Note that 443 can be overwritten with the
* $httpsServerPort configuration parameter.
@@ -126,7 +126,7 @@ import org.apache.tomcat.util.http.parser.Host;
* Name of the http header read by this valve that holds the flag that
this request
* N/A
* Compliant http header name like X-Forwarded-Proto,
X-Forwarded-Ssl or Front-End-Https
- * null
+ * X-Forwarded-Proto
*
*
* protocolHeaderHttpsValue
@@ -859,7 +859,7 @@ public class RemoteIpValve extends ValveBase {
* request.secure will not be modified.
*
*
- * Default value : null
+ * Default value : X-Forwarded-Proto
*
* @param protocolHeader The header name
*/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 648984ef91..6cdd4ad845 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -166,6 +166,11 @@
the Servlet context so that it actually reflects what is used during
authentication. (remm)
+
+66359: Update javadoc for RemoteIpValve and RemoteIpFilter
with
+correct protocolHeader default value of
"X-Forwarded-Proto".
+(lihan)
+
Add support for the new attribute for error dispatches
jakarta.servlet.error.query_string. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: BZ 66359 - Update javadoc for RemoteIpFilter and RemoteIpValve
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new e5b367e827 BZ 66359 - Update javadoc for RemoteIpFilter and
RemoteIpValve
e5b367e827 is described below
commit e5b367e82764014c145503d082a531755ac349f6
Author: lihan
AuthorDate: Tue Nov 22 11:14:48 2022 +0800
BZ 66359 - Update javadoc for RemoteIpFilter and RemoteIpValve
https://bz.apache.org/bugzilla/show_bug.cgi?id=66359
---
java/org/apache/catalina/filters/RemoteIpFilter.java | 6 +++---
java/org/apache/catalina/valves/RemoteIpValve.java | 6 +++---
webapps/docs/changelog.xml | 5 +
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 54cf3ea604..6d68a97b42 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -80,7 +80,7 @@ import org.apache.tomcat.util.res.StringManager;
* otherwise, the ip/host is declared to be the remote ip and looping is
stopped.
*
*
- * If the request http header named $protocolHeader (e.g.
x-forwarded-proto) consists only of forwards that match
+ * If the request http header named $protocolHeader (default
value X-Forwarded-Proto) consists only of forwards that match
* protocolHeaderHttpsValue configuration parameter (default
https) then request.isSecure = true,
* request.scheme = https and request.serverPort =
443. Note that 443 can be overwritten with the
* $httpsServerPort configuration parameter.
@@ -144,7 +144,7 @@ import org.apache.tomcat.util.res.StringManager;
* Name of the http header read by this servlet filter that holds the flag
that this request
* N/A
* Compliant http header name like X-Forwarded-Proto,
X-Forwarded-Ssl or Front-End-Https
- * null
+ * X-Forwarded-Proto
*
*
* protocolHeaderHttpsValue
@@ -1226,7 +1226,7 @@ public class RemoteIpFilter implements Filter {
* request.secure will not be modified.
*
*
- * Default value : null
+ * Default value : X-Forwarded-Proto
*
* @param protocolHeader The header name
*/
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java
b/java/org/apache/catalina/valves/RemoteIpValve.java
index 3365bcc20c..688515de14 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -65,7 +65,7 @@ import org.apache.tomcat.util.http.parser.Host;
* otherwise, the ip/host is declared to be the remote ip and looping is
stopped.
*
*
- * If the request http header named $protocolHeader (e.g.
x-forwarded-proto) consists only of forwards that match
+ * If the request http header named $protocolHeader (default
value X-Forwarded-Proto) consists only of forwards that match
* protocolHeaderHttpsValue configuration parameter (default
https) then request.isSecure = true,
* request.scheme = https and request.serverPort =
443. Note that 443 can be overwritten with the
* $httpsServerPort configuration parameter.
@@ -128,7 +128,7 @@ import org.apache.tomcat.util.http.parser.Host;
* Name of the http header read by this valve that holds the flag that
this request
* N/A
* Compliant http header name like X-Forwarded-Proto,
X-Forwarded-Ssl or Front-End-Https
- * null
+ * X-Forwarded-Proto
*
*
* protocolHeaderHttpsValue
@@ -887,7 +887,7 @@ public class RemoteIpValve extends ValveBase {
* request.secure will not be modified.
*
*
- * Default value : null
+ * Default value : X-Forwarded-Proto
*
* @param protocolHeader The header name
*/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1c639c9772..218df3261b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,11 @@
the Servlet context so that it actually reflects what is used during
authentication. (remm)
+
+66359: Update javadoc for RemoteIpValve and RemoteIpFilter
with
+correct protocolHeader default value of
"X-Forwarded-Proto".
+(lihan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66348] new jars in lib
https://bz.apache.org/bugzilla/show_bug.cgi?id=66348 --- Comment #7 from elatl...@gmail.com --- Thanks Mark, Link to commit with fix: https://github.com/apache/tomcat/commit/afed131394261b4ac5bd324811bc6bdd9de4bd3f -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix BZ 66348 - Update list of JARs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 6beeaa2881 Fix BZ 66348 - Update list of JARs 6beeaa2881 is described below commit 6beeaa2881ae1d11a4159d000aefa6e29e932200 Author: Mark Thomas AuthorDate: Mon Nov 21 12:47:09 2022 + Fix BZ 66348 - Update list of JARs https://bz.apache.org/bugzilla/show_bug.cgi?id=66348 --- webapps/docs/changelog.xml | 8 + webapps/docs/class-loader-howto.xml | 65 +++-- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index df780921d5..2cda700947 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -124,6 +124,14 @@ + + + +66348: Update the JARs listed in the class loader +documentation and note which ones are optional. (markt) + + + diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index f443a11a1c..e4a0b7cde0 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -130,36 +130,51 @@ loaders as it is initialized: By default, this includes the following: -annotations-api.jar JavaEE annotations classes. +annotations-api.jar Common Annotations 1.2 classes. + catalina.jar Implementation of the Catalina servlet container portion of Tomcat. -catalina-ant.jar Tomcat Catalina Ant tasks. -catalina-ha.jar High availability package. -catalina-storeconfig.jar Generation of XML -configuration files from current state -catalina-tribes.jar Group communication package. -ecj-*.jar Eclipse JDT Java compiler. -el-api.jar EL 3.0 API. -jasper.jar Tomcat Jasper JSP Compiler and Runtime. -jasper-el.jar Tomcat Jasper EL implementation. -jsp-api.jar JSP 2.3 API. -servlet-api.jar Servlet 3.1 API. -tomcat-api.jar Several interfaces defined by Tomcat. -tomcat-coyote.jar Tomcat connectors and utility classes. -tomcat-dbcp.jar Database connection pool +catalina-ant.jar Optional. Tomcat Catalina Ant tasks +for working with the Manager web application. +catalina-ha.jar Optional. High availability package +that provides session clustering functionality built on Tribes. +catalina-storeconfig.jar Optional. Generation of XML +configuration files from current state. +catalina-tribes.jar Optional. Group communication +package used by the high availabaility package. +ecj-*.jar Optional. Eclipse JDT Java compiler used to +compile JSPs to Servlets. +el-api.jar Optional. EL 3.0 API. +jasper.jar Optional. Tomcat Jasper JSP Compiler and +Runtime. +jasper-el.jar Optional. Tomcat EL implementation. +jaspic-api.jar JASPIC 1.1 API. +jsp-api.jar Optional. JSP 2.3 API. +servlet-api.jar Java Servlet 3.1 API. +tomcat-api.jar Several interfaces defined by Tomcat. + +tomcat-coyote.jar Tomcat connectors and utility +classes. +tomcat-dbcp.jar Optional. Database connection pool implementation based on package-renamed copy of Apache Commons Pool 2 and Apache Commons DBCP 2. -tomcat-i18n-**.jar Optional JARs containing resource bundles -for other languages. As default bundles are also included in each -individual JAR, they can be safely removed if no internationalization -of messages is needed. -tomcat-jdbc.jar An alternative database connection pool -implementation, known as Tomcat JDBC pool. See +tomcat-i18n-**.jar Optional JARs containing resource +bundles for other languages. As default bundles are also included in +each individual JAR, they can be safely removed if no +internationalization of messages is needed. +tomcat-jdbc.jar Optional. An alternative database +connection pool implementation, known as Tomcat JDBC pool. See documentation for more details. -tomcat-util.jar Common classes used by various components of -Apache Tomcat. -tomcat-websocket.jar WebSocket 1.1 implementation -websocket-api.jar WebSocket 1.1 API +tomcat-jni.jar Provides the integration with the Tomcat +Native library. +tomcat-util.jar Common classes used by various +components of Apache Tomcat. +tomcat-util-scan.jar Provides the class scanning +functionality used by Tomcat. +tomcat-websocket.jar Optional. Java WebSocket 1.1 +implementation +websocket-api.jar Optional. Java WebSocket 1.1 API + WebappX A class loader is created for each web application that is deployed in a single
[Bug 66348] new jars in lib
https://bz.apache.org/bugzilla/show_bug.cgi?id=66348 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas --- Fixed in: - 10.1.x for 10.1.3 onwards - 9.0.x for 9.0.70 onwards - 8.5.x for 8.5.85 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66346] Allow reproducible builds of all JDBC JAR files
https://bz.apache.org/bugzilla/show_bug.cgi?id=66346 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Mark Thomas --- Fixed in: - 10.1.x for 10.1.3 onwards - 9.0.x for 9.0.70 onwards - 8.5.x for 8.5.85 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66178] Reduce garbage from strings in AbstractArchiveResourceSet.getResource
https://bz.apache.org/bugzilla/show_bug.cgi?id=66178 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME --- Comment #15 from Mark Thomas --- It has been more than 3 months since the request for more information. None has been provided so closing as per previous comment. If the requested information is available at some point in the future, feel free to re-open this issue and attach it. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66175] Consider changing BasicAuthenticator to default to charset="UTF"
https://bz.apache.org/bugzilla/show_bug.cgi?id=66175 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Fixed in 11.0.x for 11.0.0-M1 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Allow reproducible builds of all JDBC JAR files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 49258540a6 Allow reproducible builds of all JDBC JAR files 49258540a6 is described below commit 49258540a674495965fabf474c33e72f46d681fb Author: John Neffenger AuthorDate: Sat Nov 12 18:05:24 2022 -0800 Allow reproducible builds of all JDBC JAR files --- modules/jdbc-pool/build.xml | 12 +--- webapps/docs/changelog.xml | 8 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index b66a306dd6..54207a4bd1 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -185,7 +185,9 @@ - + @@ -207,7 +209,9 @@ - + @@ -216,7 +220,9 @@ - + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2cda700947..1c639c9772 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -206,6 +206,14 @@ + + + +66346: Ensure all JDBC pool JARs are reproducible. Pull +request 566 provided by John Neffenger. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Allow reproducible builds of all JDBC JAR files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 40f0f7d571 Allow reproducible builds of all JDBC JAR files 40f0f7d571 is described below commit 40f0f7d571b2dcdc815d3560f7138a11120e476a Author: John Neffenger AuthorDate: Sat Nov 12 18:05:24 2022 -0800 Allow reproducible builds of all JDBC JAR files --- modules/jdbc-pool/build.xml | 12 +--- webapps/docs/changelog.xml | 8 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index 8b387af62a..da4f801221 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -185,7 +185,9 @@ - + @@ -207,7 +209,9 @@ - + @@ -216,7 +220,9 @@ - + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a1fe66e758..83a1958221 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -231,6 +231,14 @@ + + + +66346: Ensure all JDBC pool JARs are reproducible. Pull +request 566 provided by John Neffenger. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Allow reproducible builds of all JDBC JAR files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 7b1b85b0ae Allow reproducible builds of all JDBC JAR files 7b1b85b0ae is described below commit 7b1b85b0ae8c2d5ac9991b0942780f352b041ff8 Author: John Neffenger AuthorDate: Sat Nov 12 18:05:24 2022 -0800 Allow reproducible builds of all JDBC JAR files --- modules/jdbc-pool/build.xml | 12 +--- webapps/docs/changelog.xml | 8 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index 8b387af62a..da4f801221 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -185,7 +185,9 @@ - + @@ -207,7 +209,9 @@ - + @@ -216,7 +220,9 @@ - + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6cd523b13c..547340eab0 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -222,6 +222,14 @@ + + + +66346: Ensure all JDBC pool JARs are reproducible. Pull +request 566 provided by John Neffenger. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf merged pull request #566: Allow reproducible builds of all JDBC JAR files
markt-asf merged PR #566: URL: https://github.com/apache/tomcat/pull/566 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Allow reproducible builds of all JDBC JAR files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 8ae3c81f09 Allow reproducible builds of all JDBC JAR files 8ae3c81f09 is described below commit 8ae3c81f091f8bc99b72d2b15ea5126ad6fb4988 Author: John Neffenger AuthorDate: Sat Nov 12 18:05:24 2022 -0800 Allow reproducible builds of all JDBC JAR files --- modules/jdbc-pool/build.xml | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index 8b387af62a..da4f801221 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -185,7 +185,9 @@ - + @@ -207,7 +209,9 @@ - + @@ -216,7 +220,9 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add change log entry
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9189a0d6c4 Add change log entry 9189a0d6c4 is described below commit 9189a0d6c44df923b369ed37c5f44a111d475a87 Author: Mark Thomas AuthorDate: Mon Nov 21 13:59:45 2022 + Add change log entry --- webapps/docs/changelog.xml | 8 1 file changed, 8 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 18235dba10..31ca1306d4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -235,6 +235,14 @@ + + + +66346: Ensure all JDBC pool JARs are reproducible. Pull +request 566 provided by John Neffenger. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: BZ 66175 - Use UTF-8 by default for BASIC auth
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 8004ce03ff BZ 66175 - Use UTF-8 by default for BASIC auth
8004ce03ff is described below
commit 8004ce03ffb84c80d8fb58d02042672457a0866f
Author: Mark Thomas
AuthorDate: Mon Nov 21 14:24:15 2022 +
BZ 66175 - Use UTF-8 by default for BASIC auth
---
java/org/apache/catalina/authenticator/BasicAuthenticator.java | 4 ++--
webapps/docs/changelog.xml | 4
webapps/docs/config/valve.xml | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/BasicAuthenticator.java
b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
index a1f9c86af4..730323cc46 100644
--- a/java/org/apache/catalina/authenticator/BasicAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
@@ -42,8 +42,8 @@ public class BasicAuthenticator extends AuthenticatorBase {
private final Log log = LogFactory.getLog(BasicAuthenticator.class); //
must not be static
-private Charset charset = StandardCharsets.ISO_8859_1;
-private String charsetString = null;
+private Charset charset = StandardCharsets.UTF_8;
+private String charsetString = "UTF-8";
private boolean trimCredentials = true;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 31ca1306d4..648984ef91 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -115,6 +115,10 @@
+
+66175: Change the default character set used by the
+BasicAuthenticator from ISO-8859-1 to UTF-8. (markt)
+
66209: Add a configuration option to allow bloom filters
used
to index JAR files to be retained for the lifetime of the web
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 4459000821..85272084c9 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -1382,7 +1382,7 @@
from bytes to characters using UTF-8. Otherwise, no
charset
authentication parameter will be sent and the provided user name and
optional password will be converted from bytes to characters using
-ISO-8859-1. The default value is null
+ISO-8859-1. The default value is UTF-8
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.84
On Mon, Nov 21, 2022 at 5:47 AM Konstantin Kolinko wrote: > > пт, 18 нояб. 2022 г. в 21:45, Christopher Schultz > : > > > > Han, > > > > On 11/17/22 05:28, Han Li wrote: > > > > > > > > >> 2022年11月17日 17:52，Mark Thomas 写道： > > >> > > >> On 17/11/2022 08:23, Han Li wrote: > > 2022年11月17日 16:08，Mark Thomas 写道： > > > > On 17/11/2022 04:04, Han Li wrote: > > > I think that I encounter a problem, shown below: > > > org.apache.jasper.JasperException: Unable to compile class for JSP: > > > An error occurred at line: [17] in the jsp file: > > > [/jsp/include/foo.jsp] > > > System cannot be resolved > > > 14: See the License for the specific language governing permissions > > > and > > > 15: limitations under the License. > > > 16: > > > 17: --%><%= System.currentTimeMillis() %> > > > Stacktrace: > > > > > > org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:102) > > > > > > org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:213) > > > > > > org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:589) > > > org.apache.jasper.compiler.Compiler.compile(Compiler.java:380) > > > org.apache.jasper.compiler.Compiler.compile(Compiler.java:350) > > > org.apache.jasper.compiler.Compiler.compile(Compiler.java:334) > > > > > > org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:597) > > > > > > org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:398) > > > > > > org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:383) > > > org.apache.jasper.servlet.JspServlet.service(JspServlet.java:331) > > > javax.servlet.http.HttpServlet.service(HttpServlet.java:765) > > > > > > org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52) > > > > > > org.apache.catalina.filters.HttpHeaderSecurityFilter.doFilter(HttpHeaderSecurityFilter.java:126) > > > > > > org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:109) > > > Ant test show passes, but there are problems. (I downloaded 8.5.83 > > > from the official website, then accessed example webapp > > > and also have this problem). I don’t know JDT, but I tested again by > > > upgrading ecj version to 4.25 and this > > > problem was solved. > > > > I can't repeat this. > > > > I downloaded the 8.5.84 RC and then tested with Oracle JDK 1.7.0_80. > > The JSP include example worked. > > > > I then cleared out the work directory, switched to Temurin JDK > > 11.0.17_08 and tested the JSP include example. That worked too. > > > > I made no changes to the Eclipse compiler JAR. > > > > Can you provide the exact steps to recreate the issue from a clean > > 8.5.84 download? > > >>> There are no exact steps, just need to simply access this url: > > >>> http://localhost:8080/examples/jsp/include/foo.jsp > > >> > > >> The Java version was the key. > > >> > > >> Eclispe JDT 4.6.3 can't compile JSPs under Java 17 as it can't read the > > >> Java 17 class files. > > >> > > >> We can't update JDT as that is the latest version that works with Java 7 > > >> and Tomcat 8.x has a (specification mandated) minimum Java version of 7. > > >> > > >> Updating the JDT locally, as you found, is the way to work around this > > >> problem. > > > > > > Got it. > > > > > > In that case, I think we need to mark the upper limit of JDK version on > > > documentation for 8.5.x. > > > > +1 > > > > I think we should update the web site to include a note that there is > > actually a "qualified upper limit" on the Java version supported by > > Tomcat 8.5.x out of the box, but you can manually-upgrade jdt to version > > N which is compatible with both Tomcat 8.5.x and Java 17. > > Previous discussions, a year ago: > https://bz.apache.org/bugzilla/show_bug.cgi?id=65599 > > https://lists.apache.org/thread/5489jyfry6zypr3x43qypqoxx02dqz08 Thanks for the reminder, that's pretty much why I remembered this issue then. I see you proposed a lot of options for this, and given what Mark said and the version numbers involved, your option e) looks like a good solution for Tomcat 8.5. Rémy > > I don't think this issue imperils this release, though. > > Not a stopper. > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - 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 BZ 66348 - Update list of JARs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new b3b0099178 Fix BZ 66348 - Update list of JARs b3b0099178 is described below commit b3b0099178e8598c8322a74e7b12aef7f04606f6 Author: Mark Thomas AuthorDate: Mon Nov 21 12:47:09 2022 + Fix BZ 66348 - Update list of JARs https://bz.apache.org/bugzilla/show_bug.cgi?id=66348 --- webapps/docs/changelog.xml | 8 webapps/docs/class-loader-howto.xml | 73 +++-- 2 files changed, 54 insertions(+), 27 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f5ff9db234..a1fe66e758 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -136,6 +136,14 @@ + + + +66348: Update the JARs listed in the class loader +documentation and note which ones are optional. (markt) + + + diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index 814c0f9bc1..92fcc6e9f2 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -130,38 +130,57 @@ loaders as it is initialized: By default, this includes the following: -annotations-api.jar Jakarta Annotations 2.0 classes. +annotations-api.jar Jakarta Annotations 2.1.1 classes. + catalina.jar Implementation of the Catalina servlet container portion of Tomcat. -catalina-ant.jar Tomcat Catalina Ant tasks. -catalina-ha.jar High availability package. -catalina-ssi.jar Server-side Includes module. -catalina-storeconfig.jar Generation of XML -configuration files from current state -catalina-tribes.jar Group communication package. -ecj-*.jar Eclipse JDT Java compiler. -el-api.jar EL 5.0 API. -jasper.jar Tomcat Jasper JSP Compiler and Runtime. -jasper-el.jar Tomcat Jasper EL implementation. -jsp-api.jar JSP 3.1 API. -servlet-api.jar Servlet 6.0 API. -tomcat-api.jar Several interfaces defined by Tomcat. -tomcat-coyote.jar Tomcat connectors and utility classes. -tomcat-dbcp.jar Database connection pool +catalina-ant.jar Optional. Tomcat Catalina Ant tasks +for working with the Manager web application. +catalina-ha.jar Optional. High availability package +that provides session clustering functionality built on Tribes. +catalina-ssi.jar Optional. Server-side Includes module. + +catalina-storeconfig.jar Optional. Generation of XML +configuration files from current state. +catalina-tribes.jar Optional. Group communication +package used by the high availabaility package. +ecj-*.jar Optional. Eclipse JDT Java compiler used to +compile JSPs to Servlets. +el-api.jar Optional. EL 5.0 API. +jakartaee-migration-*-shaded.jar Optional. Provides +conversion of web applications from Java EE 8 to Jakarta EE 9. +jasper.jar Optional. Tomcat Jasper JSP Compiler and +Runtime. +jasper-el.jar Optional. Tomcat EL implementation. +jaspic-api.jar Jakarta Authentication 3.0 API. +jsp-api.jar Optional. Jakarta Pages 3.1 API. +servlet-api.jar Jakarta Servlet 6.0 API. +tomcat-api.jar Several interfaces defined by Tomcat. + +tomcat-coyote.jar Tomcat connectors and utility +classes. +tomcat-dbcp.jar Optional. Database connection pool implementation based on package-renamed copy of Apache Commons Pool 2 and Apache Commons DBCP 2. -tomcat-i18n-**.jar Optional JARs containing resource bundles -for other languages. As default bundles are also included in each -individual JAR, they can be safely removed if no internationalization -of messages is needed. -tomcat-jdbc.jar An alternative database connection pool -implementation, known as Tomcat JDBC pool. See +tomcat-i18n-**.jar Optional JARs containing resource +bundles for other languages. As default bundles are also included in +each individual JAR, they can be safely removed if no +internationalization of messages is needed. +tomcat-jdbc.jar Optional. An alternative database +connection pool implementation, known as Tomcat JDBC pool. See documentation for more details. -tomcat-util.jar Common classes used by various components of -Apache Tomcat. -tomcat-websocket.jar WebSocket 2.1 implementation -websocket-api.jar WebSocket 2.1 API -websocket-client-api.jar WebSocket 2.1 Client API +tomcat-jni.jar Provides the integration with the Tomcat +Native library. +tomcat-util.jar Common classes used by various +components of Apache
[tomcat] branch main updated: Fix BZ 66348 - Update list of JARs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new afed131394 Fix BZ 66348 - Update list of JARs afed131394 is described below commit afed131394261b4ac5bd324811bc6bdd9de4bd3f Author: Mark Thomas AuthorDate: Mon Nov 21 12:47:09 2022 + Fix BZ 66348 - Update list of JARs https://bz.apache.org/bugzilla/show_bug.cgi?id=66348 --- webapps/docs/changelog.xml | 8 webapps/docs/class-loader-howto.xml | 73 +++-- 2 files changed, 54 insertions(+), 27 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index cf0c9c7f4d..18235dba10 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -227,6 +227,14 @@ + + + +66348: Update the JARs listed in the class loader +documentation and note which ones are optional. (markt) + + + diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index 2d26404aed..4babecfd9c 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -130,38 +130,57 @@ loaders as it is initialized: By default, this includes the following: -annotations-api.jar Jakarta Annotations 2.0 classes. +annotations-api.jar Jakarta Annotations 2.1.1 classes. + catalina.jar Implementation of the Catalina servlet container portion of Tomcat. -catalina-ant.jar Tomcat Catalina Ant tasks. -catalina-ha.jar High availability package. -catalina-ssi.jar Server-side Includes module. -catalina-storeconfig.jar Generation of XML -configuration files from current state -catalina-tribes.jar Group communication package. -ecj-*.jar Eclipse JDT Java compiler. -el-api.jar EL 6.0 API. -jasper.jar Tomcat Jasper JSP Compiler and Runtime. -jasper-el.jar Tomcat Jasper EL implementation. -jsp-api.jar JSP 4.0 API. -servlet-api.jar Servlet 6.0 API. -tomcat-api.jar Several interfaces defined by Tomcat. -tomcat-coyote.jar Tomcat connectors and utility classes. -tomcat-dbcp.jar Database connection pool +catalina-ant.jar Optional. Tomcat Catalina Ant tasks +for working with the Manager web application. +catalina-ha.jar Optional. High availability package +that provides session clustering functionality built on Tribes. +catalina-ssi.jar Optional. Server-side Includes module. + +catalina-storeconfig.jar Optional. Generation of XML +configuration files from current state. +catalina-tribes.jar Optional. Group communication +package used by the high availabaility package. +ecj-*.jar Optional. Eclipse JDT Java compiler used to +compile JSPs to Servlets. +el-api.jar Optional. EL 6.0 API. +jakartaee-migration-*-shaded.jar Optional. Provides +conversion of web applications from Java EE 8 to Jakarta EE 9. +jasper.jar Optional. Tomcat Jasper JSP Compiler and +Runtime. +jasper-el.jar Optional. Tomcat EL implementation. +jaspic-api.jar Jakarta Authentication 3.0 API. +jsp-api.jar Optional. Jakarta Pages 4.0 API. +servlet-api.jar Jakarta Servlet 6.0 API. +tomcat-api.jar Several interfaces defined by Tomcat. + +tomcat-coyote.jar Tomcat connectors and utility +classes. +tomcat-dbcp.jar Optional. Database connection pool implementation based on package-renamed copy of Apache Commons Pool 2 and Apache Commons DBCP 2. -tomcat-i18n-**.jar Optional JARs containing resource bundles -for other languages. As default bundles are also included in each -individual JAR, they can be safely removed if no internationalization -of messages is needed. -tomcat-jdbc.jar An alternative database connection pool -implementation, known as Tomcat JDBC pool. See +tomcat-i18n-**.jar Optional JARs containing resource +bundles for other languages. As default bundles are also included in +each individual JAR, they can be safely removed if no +internationalization of messages is needed. +tomcat-jdbc.jar Optional. An alternative database +connection pool implementation, known as Tomcat JDBC pool. See documentation for more details. -tomcat-util.jar Common classes used by various components of -Apache Tomcat. -tomcat-websocket.jar WebSocket 2.1 implementation -websocket-api.jar WebSocket 2.1 API -websocket-client-api.jar WebSocket 2.1 Client API +tomcat-jni.jar Provides the integration with the Tomcat +Native library. +tomcat-util.jar Common classes used by various +components of Apache
[tomcat] branch main updated: Tomcat 11.0.x implements Servlet 6.1
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new c99c1a999c Tomcat 11.0.x implements Servlet 6.1 c99c1a999c is described below commit c99c1a999c92f34cf4f4a5d09f7d1e9c1eed96b9 Author: Mark Thomas AuthorDate: Mon Nov 21 12:50:58 2022 + Tomcat 11.0.x implements Servlet 6.1 --- webapps/docs/class-loader-howto.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index 4babecfd9c..b4d55eb406 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -154,7 +154,7 @@ loaders as it is initialized: jasper-el.jar Optional. Tomcat EL implementation. jaspic-api.jar Jakarta Authentication 3.0 API. jsp-api.jar Optional. Jakarta Pages 4.0 API. -servlet-api.jar Jakarta Servlet 6.0 API. +servlet-api.jar Jakarta Servlet 6.1 API. tomcat-api.jar Several interfaces defined by Tomcat. tomcat-coyote.jar Tomcat connectors and utility - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix BZ 66348 - Update list of JARs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new bb900ed975 Fix BZ 66348 - Update list of JARs bb900ed975 is described below commit bb900ed975abdd6306b0406f37251145500b1a98 Author: Mark Thomas AuthorDate: Mon Nov 21 12:47:09 2022 + Fix BZ 66348 - Update list of JARs https://bz.apache.org/bugzilla/show_bug.cgi?id=66348 --- webapps/docs/changelog.xml | 8 + webapps/docs/class-loader-howto.xml | 68 +++-- 2 files changed, 50 insertions(+), 26 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 02790bdbc7..6cd523b13c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -131,6 +131,14 @@ + + + +66348: Update the JARs listed in the class loader +documentation and note which ones are optional. (markt) + + + diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index 9d78dbf3a3..a75e5adbb8 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -130,37 +130,53 @@ loaders as it is initialized: By default, this includes the following: -annotations-api.jar JavaEE annotations classes. +annotations-api.jar Common Annotations 1.3 classes. + catalina.jar Implementation of the Catalina servlet container portion of Tomcat. -catalina-ant.jar Tomcat Catalina Ant tasks. -catalina-ha.jar High availability package. -catalina-ssi.jar Server-side Includes module. -catalina-storeconfig.jar Generation of XML -configuration files from current state -catalina-tribes.jar Group communication package. -ecj-*.jar Eclipse JDT Java compiler. -el-api.jar EL 3.0 API. -jasper.jar Tomcat Jasper JSP Compiler and Runtime. -jasper-el.jar Tomcat Jasper EL implementation. -jsp-api.jar JSP 2.3 API. -servlet-api.jar Servlet 4.0 API. -tomcat-api.jar Several interfaces defined by Tomcat. -tomcat-coyote.jar Tomcat connectors and utility classes. -tomcat-dbcp.jar Database connection pool +catalina-ant.jar Optional. Tomcat Catalina Ant tasks +for working with the Manager web application. +catalina-ha.jar Optional. High availability package +that provides session clustering functionality built on Tribes. +catalina-ssi.jar Optional. Server-side Includes module. + +catalina-storeconfig.jar Optional. Generation of XML +configuration files from current state. +catalina-tribes.jar Optional. Group communication +package used by the high availabaility package. +ecj-*.jar Optional. Eclipse JDT Java compiler used to +compile JSPs to Servlets. +el-api.jar Optional. EL 3.0 API. +jasper.jar Optional. Tomcat Jasper JSP Compiler and +Runtime. +jasper-el.jar Optional. Tomcat EL implementation. +jaspic-api.jar JASPIC 1.1 API. +jsp-api.jar Optional. JSP 2.3 API. +servlet-api.jar Java Servlet 4.0 API. +tomcat-api.jar Several interfaces defined by Tomcat. + +tomcat-coyote.jar Tomcat connectors and utility +classes. +tomcat-dbcp.jar Optional. Database connection pool implementation based on package-renamed copy of Apache Commons Pool 2 and Apache Commons DBCP 2. -tomcat-i18n-**.jar Optional JARs containing resource bundles -for other languages. As default bundles are also included in each -individual JAR, they can be safely removed if no internationalization -of messages is needed. -tomcat-jdbc.jar An alternative database connection pool -implementation, known as Tomcat JDBC pool. See +tomcat-i18n-**.jar Optional JARs containing resource +bundles for other languages. As default bundles are also included in +each individual JAR, they can be safely removed if no +internationalization of messages is needed. +tomcat-jdbc.jar Optional. An alternative database +connection pool implementation, known as Tomcat JDBC pool. See documentation for more details. -tomcat-util.jar Common classes used by various components of -Apache Tomcat. -tomcat-websocket.jar WebSocket 1.1 implementation -websocket-api.jar WebSocket 1.1 API +tomcat-jni.jar Provides the integration with the Tomcat +Native library. +tomcat-util.jar Common classes used by various +components of Apache Tomcat. +tomcat-util-scan.jar Provides the class scanning +functionality used by Tomcat. +tomcat-websocket.jar Optional. Java WebSocket 1.1 +implementation +websocket-api.jar Optional. Java
[VOTE][RESULT] Release Apache Tomcat 8.5.84
All, The following votes were cast: Binding: +1: schultz, remm, markt Non-binding: +1: lihan The vote therefore passes. Thanks to everyone who contributed towards this release. I will begin the release process later today. Thanks, -chris On 11/16/22 11:03, Christopher Schultz wrote: The proposed Apache Tomcat 8.5.84 release is now available for voting. The notable changes compared to 8.5.83 are: - Fix concurrency issue in evaluation of expression language containing lambda expressions. - Correct the date format used with the expires attribute of HTTP cookies. A single space rather than a single dash should be used to separate the day, month and year components to be compliant with RFC 6265. - Update to Commons Daemon 1.3.2. Along with lots of other bug fixes and improvements. For full details, see the changelog: https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.84/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1407 The tag is: https://github.com/apache/tomcat/tree/8.5.84/ 079a46c1c1e56b1743e752a44450469690880a56 The proposed 8.5.84 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.5.84 (stable) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat doesn't gracefully close keep-alive connections
Hi Chris That is a good suggestion. But more importantly, maybe update the documentation of the bindOnInit parameter, since it's not very intuitive this has anything to do with graceful shutdown and I don't think any connection with keep-alive is mentioned. I'm also not sure why bindOnInit=false it's the default, since it is needed for graceful shutdowns. Finally, in which versions is this supported? The options are documented in Tomcat 9 but they don't lead to this good behavior with keep-alive connections (I've tried the latest 9.0.69) whereas it works fine in the 10-series (tried 10.1.0). This is a bit annoying for us because we use Spring Boot and the newest production version is 2.7.5 and this specifically doesn't work with Tomcat 10. Tomcat 10 requires Spring Boot 3.0 which is only in release-candidate status. So we are a bit torn on what to do and even thinking of implementing my custom fix for the 9-series. Br, M. Thiim Den fre. 18. nov. 2022 kl. 20.03 skrev Christopher Schultz < ch...@christopherschultz.net>: > Mark, > > On 11/18/22 10:38, Mark Thomas wrote: > > I've just found the comment I missed the first time. > > > > This has already been implemented. > > > > You need to set the following: > > > > Connector > >bindOnInit="false" > > > > Service > >gracefulStopAwaitMillis="2" > > > > This assumes you are using the default keep-alive timeout of 20s. If > > not, adjust gracefulStopAwaitMillis accordingly. It needs to be at least > > as long as the keep-alive timeout. > > Should we cross-check these two configuration items and issue WARNING at > startup if gracefulStopAwaitMillis < keepAliveTimeout? > > -chris > > > On 18/11/2022 14:59, Mark Thomas wrote: > >> PRs are always welcome. From the description provided, I think more > >> use of the existing graceful shutdown could be made. > >> > >> I am also looking at whether a slightly broader refactoring is called > >> for as there looks to be scope for better alignment between pause, > >> stop and graceful stop. > >> > >> Mark > >> > >> > >> On 18/11/2022 14:29, M. Thiim wrote: > >>> Hi Mark > >>> > >>> Great! I've actually made an experimental patch that fixes it, but it's > >>> perhaps not completely clean. To get the behavior the waiting needs to > >>> happen after the server has stopped accepting new connections, this > >>> seems > >>> to be the pause-phase. But the Http11Processoer rejects incoming > >>> requests > >>> during the pause phase (condition check in the while loop in the > >>> service() > >>> method and also further down in the method), so I had to change this > >>> behaviour as well (so it accepts requests but responds to them with > >>> Connection: Close). I don't know if this breaks some assumptions that > it > >>> now continues to process requests in the pause phase. I also had to > >>> add a > >>> .waitForConnectionDrain() to the Connector class and to the protocol > >>> handler. > >>> > >>> Also, in order to avoid waiting for the full duration of the > >>> keepAliveTimeout in the cases when there's either no kept alive > >>> connections > >>> to begin with or where the server is able to close them earlier (due > >>> to new > >>> requests coming in that can be responded with Connection: Close, as > >>> would > >>> typically be the case in a busy system) I had to have a count on > current > >>> number of connections. The getConnectionCount() in > AbstractEndpoint.java > >>> seemed useful but there's catch: Its counting is based on the value > >>> of the > >>> connectionLimitLatch and this is specifically nulled out during the > >>> pause > >>> phase (I suppose because it also has the function of limiting > >>> connections), > >>> so the getConnectionCount() method returns -1 even if there are open > >>> connections. So I added a separate AtomicInteger that tracks the > >>> number of > >>> connections independently of the state and then changed > >>> getConnectionCount() to use this in the situations where the > >>> connectionLimitLatch is null. > >>> > >>> I can clean up and share the patch, but let me know if you think it > >>> should > >>> be done differently than described above. :-) > >>> > >>> Br, M. Thiim > >>> > >>> Den fre. 18. nov. 2022 kl. 14.34 skrev Mark Thomas : > >>> > On 17/11/2022 19:39, M. Thiim wrote: > > Hi, > > > > We have observed that Tomcat doesn't gracefully close > > keep-alive connections. Tomcat waits for already started requests to > > complete, but once those are done, Tomcat will close all connections > > immediately, irrespective of any configured keepAliveTimeout. This > > causes > > problems for some HTTP clients, especially in Kubernetes-like > environments > > when scaling down pods. Here, it can only work gracefully if the HTTP > > client who falls victim to an unexpectedly closed connection > > retries on a > > fresh connection, and it is not all clients that do this. > > > > I would think that an entirely
[Bug 66358] New: Need a way to close socket of the async request after it was committed
https://bz.apache.org/bugzilla/show_bug.cgi?id=66358 Bug ID: 66358 Summary: Need a way to close socket of the async request after it was committed Product: Tomcat 9 Version: 9.0.65 Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: enhancement Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: a701...@gmail.com Target Milestone: - It's possible to terminate the regular servlet request after the http code 200, response headers and some data was sent to the client by throwing an exception. In that case the socket is closed asap and the client receives some form of failed response with truncated chunk encoding or too short for the content-length. It does not appear that there is a way to perform a similar "abort" for async requests. AsyncContext.complete() only allows normal completion. There is no API similar to AsyncContext.fail(cause). If the the async response is in progress and is committed and then some error happens on the server there is no way to abort the response and close the socket. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66358] Need a way to close socket of the async request after it was committed
https://bz.apache.org/bugzilla/show_bug.cgi?id=66358 --- Comment #1 from Alex --- What I am executing using internal APIs to achieve the desired effect is something like this: AsyncContextImpl asyncContextImpl = (AsyncContextImpl) asyncContext; Request req = (Request) requestField.get(asyncContextImpl); req.getCoyoteRequest().action(ActionCode.CLOSE_NOW, null); This is obviously a fairly bad idea, but I could not find any other options. I am also not sure if the above code would not leak some resources in Tomcat. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66359] New: Document default value for RemoteIpValue#protocolHeader and RemoteIpFilter#protocolHeader
https://bz.apache.org/bugzilla/show_bug.cgi?id=66359 Bug ID: 66359 Summary: Document default value for RemoteIpValue#protocolHeader and RemoteIpFilter#protocolHeader Product: Tomcat 9 Version: 9.0.19 Hardware: All OS: All Status: NEW Severity: trivial Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: eric.hamil...@ngc.com Depends on: 63196 Target Milestone: - Update the Java documentation for RemoteIpValve and RemoteIpFilter with the correct protocolHeader default value of "x-forwarded-proto". Documentation still shows default value as "null", although this value was changed with Bug 63196. JavaDoc updates are needed in both the class and setProtocolHeader method locations. Referenced Bugs: https://bz.apache.org/bugzilla/show_bug.cgi?id=63196 [Bug 63196] Add sane default value for RemoteIpValue#protocolHeader -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63196] Add sane default value for RemoteIpValue#protocolHeader
https://bz.apache.org/bugzilla/show_bug.cgi?id=63196 Eric Hamilton changed: What|Removed |Added Blocks||66359 Referenced Bugs: https://bz.apache.org/bugzilla/show_bug.cgi?id=66359 [Bug 66359] Document default value for RemoteIpValue#protocolHeader and RemoteIpFilter#protocolHeader -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r58180 - /dev/tomcat/tomcat-8/v8.5.84/ /release/tomcat/tomcat-8/v8.5.84/
Author: schultz Date: Mon Nov 21 22:03:37 2022 New Revision: 58180 Log: Promote Tomcat 8.5.84 release Added: release/tomcat/tomcat-8/v8.5.84/ - copied from r58179, dev/tomcat/tomcat-8/v8.5.84/ Removed: dev/tomcat/tomcat-8/v8.5.84/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
