[Bug 66329] New: The Tomcat connection processing thread may exit abnormally

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66329

Bug ID: 66329
   Summary: The Tomcat connection processing thread may exit
abnormally
   Product: Tomcat 8
   Version: 8.5.31
  Hardware: PC
OS: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: zhanyu...@sequoiadb.com
  Target Milestone: 

Created attachment 38427
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=38427&action=edit
A large number of connections enter close_wait

In tomcat org.apache.tomcat.util.net.NioEndpoint$Poller processKey method of
class, when in the process of selling Throwable handling, use ExpectionUtils.
The handleThrowable method handles the exception, and the ExpectionUtils after
capturing the Throwable process the logic as follows: When the Throwable
implementation class is ThreadDeath or VirtualMachineError, the clientPoller
thread exits by throwing an exception 
Our tomcat runs on linux and limits the maximum number of user threads. When
the number of threads reaches the upper limit, tomcat cannot create new
processing threads and throws OutOfMemoryError, which is a subclass of
VirtualMachineError. The clientPoller thread exits without closing connections
being processed. New requests come in and the Acceptor thread accepts requests.
In this case, a large number of connections are in the close_wait state without
clietPoller to process them

-- 
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 main updated: Refactor. Reduce duplicate code. No functional change.

[lihan]

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 523f9353cf Refactor. Reduce duplicate code. No functional change.
523f9353cf is described below

commit 523f9353cf849932dcba8f26cbfa9e886b87cad5
Author: lihan 
AuthorDate: Mon Oct 31 15:43:00 2022 +0800

Refactor. Reduce duplicate code. No functional change.
---
 .../apache/catalina/core/StandardWrapperValve.java | 52 +++---
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java 
b/java/org/apache/catalina/core/StandardWrapperValve.java
index f8061d6078..db565a033f 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -108,17 +108,7 @@ final class StandardWrapperValve extends ValveBase {
 if (!unavailable && wrapper.isUnavailable()) {
 
container.getLogger().info(sm.getString("standardWrapper.isUnavailable",
 wrapper.getName()));
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 unavailable = true;
 }
 
@@ -131,17 +121,7 @@ final class StandardWrapperValve extends ValveBase {
 container.getLogger().error(
 sm.getString("standardWrapper.allocateException",
 wrapper.getName()), e);
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-   sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-   sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 } catch (ServletException e) {
 
container.getLogger().error(sm.getString("standardWrapper.allocateException",
  wrapper.getName()), 
StandardWrapper.getRootCause(e));
@@ -217,20 +197,8 @@ final class StandardWrapperValve extends ValveBase {
 container.getLogger().error(sm.getString(
 "standardWrapper.serviceException", wrapper.getName(),
 context.getName()), e);
-//throwable = e;
-//exception(request, response, e);
 wrapper.unavailable(e);
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-   sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 // Do not save exception in 'throwable', because we
 // do not want to do exception(request, response, e) processing
 } catch (ServletException e) {
@@ -299,6 +267,20 @@ final class StandardWrapperValve extends ValveBase {
 }
 }
 
+private void checkWrapperAvailable(Response response, StandardWrapper 
wrapper) throws IOException {
+long available = wrapper.getAvailable();
+if ((available > 0L) && (available < Long.MAX_VALUE)) {
+response.setDateHeader("Retry-After", available);
+response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
+   sm.getString("standardWrapper.isUnavailable",
+ 

[tomcat] branch 9.0.x updated: Refactor. Reduce duplicate code. No functional change.

[lihan]

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 943ccbc114 Refactor. Reduce duplicate code. No functional change.
943ccbc114 is described below

commit 943ccbc114f598552629cf7035776da7f7f3f0ad
Author: lihan 
AuthorDate: Mon Oct 31 15:43:00 2022 +0800

Refactor. Reduce duplicate code. No functional change.
---
 .../apache/catalina/core/StandardWrapperValve.java | 52 +++---
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java 
b/java/org/apache/catalina/core/StandardWrapperValve.java
index 75e5f13894..6fadeb0cb8 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -108,17 +108,7 @@ final class StandardWrapperValve extends ValveBase {
 if (!unavailable && wrapper.isUnavailable()) {
 
container.getLogger().info(sm.getString("standardWrapper.isUnavailable",
 wrapper.getName()));
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 unavailable = true;
 }
 
@@ -131,17 +121,7 @@ final class StandardWrapperValve extends ValveBase {
 container.getLogger().error(
 sm.getString("standardWrapper.allocateException",
 wrapper.getName()), e);
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-   sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-   sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 } catch (ServletException e) {
 
container.getLogger().error(sm.getString("standardWrapper.allocateException",
  wrapper.getName()), 
StandardWrapper.getRootCause(e));
@@ -217,20 +197,8 @@ final class StandardWrapperValve extends ValveBase {
 container.getLogger().error(sm.getString(
 "standardWrapper.serviceException", wrapper.getName(),
 context.getName()), e);
-//throwable = e;
-//exception(request, response, e);
 wrapper.unavailable(e);
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-   sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 // Do not save exception in 'throwable', because we
 // do not want to do exception(request, response, e) processing
 } catch (ServletException e) {
@@ -299,6 +267,20 @@ final class StandardWrapperValve extends ValveBase {
 }
 }
 
+private void checkWrapperAvailable(Response response, StandardWrapper 
wrapper) throws IOException {
+long available = wrapper.getAvailable();
+if ((available > 0L) && (available < Long.MAX_VALUE)) {
+response.setDateHeader("Retry-After", available);
+response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
+   sm.getString("standardWrapper.isUnavailable",
+   

[tomcat] branch 10.1.x updated: Refactor. Reduce duplicate code. No functional change.

[lihan]

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 aa5375ed4a Refactor. Reduce duplicate code. No functional change.
aa5375ed4a is described below

commit aa5375ed4ad6a99aa4f534fa4d31245636439671
Author: lihan 
AuthorDate: Mon Oct 31 15:43:00 2022 +0800

Refactor. Reduce duplicate code. No functional change.
---
 .../apache/catalina/core/StandardWrapperValve.java | 52 +++---
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java 
b/java/org/apache/catalina/core/StandardWrapperValve.java
index f8061d6078..db565a033f 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -108,17 +108,7 @@ final class StandardWrapperValve extends ValveBase {
 if (!unavailable && wrapper.isUnavailable()) {
 
container.getLogger().info(sm.getString("standardWrapper.isUnavailable",
 wrapper.getName()));
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 unavailable = true;
 }
 
@@ -131,17 +121,7 @@ final class StandardWrapperValve extends ValveBase {
 container.getLogger().error(
 sm.getString("standardWrapper.allocateException",
 wrapper.getName()), e);
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-   sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-   sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 } catch (ServletException e) {
 
container.getLogger().error(sm.getString("standardWrapper.allocateException",
  wrapper.getName()), 
StandardWrapper.getRootCause(e));
@@ -217,20 +197,8 @@ final class StandardWrapperValve extends ValveBase {
 container.getLogger().error(sm.getString(
 "standardWrapper.serviceException", wrapper.getName(),
 context.getName()), e);
-//throwable = e;
-//exception(request, response, e);
 wrapper.unavailable(e);
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-   sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 // Do not save exception in 'throwable', because we
 // do not want to do exception(request, response, e) processing
 } catch (ServletException e) {
@@ -299,6 +267,20 @@ final class StandardWrapperValve extends ValveBase {
 }
 }
 
+private void checkWrapperAvailable(Response response, StandardWrapper 
wrapper) throws IOException {
+long available = wrapper.getAvailable();
+if ((available > 0L) && (available < Long.MAX_VALUE)) {
+response.setDateHeader("Retry-After", available);
+response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
+   sm.getString("standardWrapper.isUnavailable",
+ 

[tomcat] branch 8.5.x updated: Refactor. Reduce duplicate code. No functional change.

[lihan]

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 fb403afc5e Refactor. Reduce duplicate code. No functional change.
fb403afc5e is described below

commit fb403afc5e338501f92d9a3bea218d4dbcc641ee
Author: lihan 
AuthorDate: Mon Oct 31 15:43:00 2022 +0800

Refactor. Reduce duplicate code. No functional change.
---
 .../apache/catalina/core/StandardWrapperValve.java | 52 +++---
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java 
b/java/org/apache/catalina/core/StandardWrapperValve.java
index 75e5f13894..6fadeb0cb8 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -108,17 +108,7 @@ final class StandardWrapperValve extends ValveBase {
 if (!unavailable && wrapper.isUnavailable()) {
 
container.getLogger().info(sm.getString("standardWrapper.isUnavailable",
 wrapper.getName()));
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 unavailable = true;
 }
 
@@ -131,17 +121,7 @@ final class StandardWrapperValve extends ValveBase {
 container.getLogger().error(
 sm.getString("standardWrapper.allocateException",
 wrapper.getName()), e);
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-   sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-   sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 } catch (ServletException e) {
 
container.getLogger().error(sm.getString("standardWrapper.allocateException",
  wrapper.getName()), 
StandardWrapper.getRootCause(e));
@@ -217,20 +197,8 @@ final class StandardWrapperValve extends ValveBase {
 container.getLogger().error(sm.getString(
 "standardWrapper.serviceException", wrapper.getName(),
 context.getName()), e);
-//throwable = e;
-//exception(request, response, e);
 wrapper.unavailable(e);
-long available = wrapper.getAvailable();
-if ((available > 0L) && (available < Long.MAX_VALUE)) {
-response.setDateHeader("Retry-After", available);
-response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-   sm.getString("standardWrapper.isUnavailable",
-wrapper.getName()));
-} else if (available == Long.MAX_VALUE) {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
-sm.getString("standardWrapper.notFound",
-wrapper.getName()));
-}
+checkWrapperAvailable(response, wrapper);
 // Do not save exception in 'throwable', because we
 // do not want to do exception(request, response, e) processing
 } catch (ServletException e) {
@@ -299,6 +267,20 @@ final class StandardWrapperValve extends ValveBase {
 }
 }
 
+private void checkWrapperAvailable(Response response, StandardWrapper 
wrapper) throws IOException {
+long available = wrapper.getAvailable();
+if ((available > 0L) && (available < Long.MAX_VALUE)) {
+response.setDateHeader("Retry-After", available);
+response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
+   sm.getString("standardWrapper.isUnavailable",
+   

[Bug 66329] The Tomcat connection processing thread may exit abnormally

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66329

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #1 from Mark Thomas  ---
ThreadDeath should never happen since Thread.stop() is never called.

StackOverflowError should never happen as the code used by the Poller should
have significantly smaller stacks than web application code.

If VirtualMachineError happens then the Tomcat process needs to be stopped and
restarted anyway.

That the Tomcat process has been configured to operate with lower limits than
it requires to operate correctly is a configuration issue, not a Tomcat bug.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated: Fix BZ 66209 - Add option to retain bloom filters for JAR indexing

[markt]

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 58ea14aa28 Fix BZ 66209 - Add option to retain bloom filters for JAR 
indexing
58ea14aa28 is described below

commit 58ea14aa28c24877ffb54083040a1833d4094d99
Author: Mark Thomas 
AuthorDate: Mon Oct 31 08:47:52 2022 +

Fix BZ 66209 - Add option to retain bloom filters for JAR indexing

https://bz.apache.org/bugzilla/show_bug.cgi?id=66209
Based on a patch by Rahul Jaisimha
This also moves configuration for archive indexing from Context to
WebResourceRoot
---
 java/org/apache/catalina/Context.java  |  9 ++-
 java/org/apache/catalina/WebResourceRoot.java  | 43 ++
 java/org/apache/catalina/core/StandardContext.java |  4 +-
 .../apache/catalina/core/mbeans-descriptors.xml|  2 +-
 .../webresources/AbstractArchiveResourceSet.java   | 10 +++-
 .../apache/catalina/webresources/StandardRoot.java | 17 ++
 .../catalina/webresources/mbeans-descriptors.xml   |  5 ++
 .../TestAbstractArchiveResourceSet.java| 68 +-
 .../catalina/webresources/TestStandardRoot.java| 14 +
 webapps/docs/changelog.xml | 13 +
 webapps/docs/config/context.xml|  6 +-
 webapps/docs/config/resources.xml  | 14 +
 12 files changed, 196 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index 83a9a02674..1ac36ee92e 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1948,14 +1948,21 @@ public interface Context extends Container, ContextBind 
{
 /**
  * @return true if the resources archive lookup will
  * use a bloom filter.
+ *
+ * @deprecated This method will be removed in Tomcat 11 onwards.
+ * Use {@link WebResourceRoot#getArchiveIndexStrategy()}
  */
+@Deprecated
 public boolean getUseBloomFilterForArchives();
 
 /**
  * Set bloom filter flag value.
  *
  * @param useBloomFilterForArchives The new fast class path scan flag
+ *
+ * @deprecated This method will be removed in Tomcat 11 onwards
+ * Use {@link WebResourceRoot#setArchiveIndexStrategy(String)}
  */
+@Deprecated
 public void setUseBloomFilterForArchives(boolean 
useBloomFilterForArchives);
-
 }
diff --git a/java/org/apache/catalina/WebResourceRoot.java 
b/java/org/apache/catalina/WebResourceRoot.java
index ae37893e1f..36bad52945 100644
--- a/java/org/apache/catalina/WebResourceRoot.java
+++ b/java/org/apache/catalina/WebResourceRoot.java
@@ -399,6 +399,27 @@ public interface WebResourceRoot extends Lifecycle {
  */
 boolean getTrackLockedFiles();
 
+/**
+ * Set the strategy to use for the resources archive lookup.
+ *
+ * @param archiveIndexStrategy The strategy to use for the resources 
archive lookup
+ */
+void setArchiveIndexStrategy(String archiveIndexStrategy);
+
+/**
+ * Get the strategy to use for the resources archive lookup.
+ *
+ * @return The strategy to use for the resources archive lookup
+ */
+String getArchiveIndexStrategy();
+
+/**
+ * Get the strategy to use for the resources archive lookup.
+ *
+ * @return The strategy to use for the resources archive lookup
+ */
+ArchiveIndexStrategy getArchiveIndexStrategyEnum();
+
 /**
  * This method will be invoked by the context on a periodic basis and 
allows
  * the implementation a method that executes periodic tasks, such as 
purging
@@ -464,6 +485,28 @@ public interface WebResourceRoot extends Lifecycle {
 CLASSES_JAR
 }
 
+enum ArchiveIndexStrategy {
+SIMPLE(false, false),
+BLOOM(true, true),
+PURGED(true, false);
+
+private final boolean usesBloom;
+private final boolean retain;
+
+ArchiveIndexStrategy(boolean usesBloom, boolean retain) {
+this.usesBloom = usesBloom;
+this.retain = retain;
+}
+
+public boolean getUsesBloom() {
+return usesBloom;
+}
+
+public boolean getRetain() {
+return retain;
+}
+}
+
 /**
  * Provides a mechanism to modify the caching behaviour.
  */
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 888973b0f9..caeb3b2514 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -1453,19 +1453,19 @@ public class StandardContext extends ContainerBase
 
 
 @Override
+@Deprecated
 public boolean getUseBloomFilterForArchives() {
 return this.useBloomFilterForArchives;
   

[tomcat] branch 10.1.x updated: Fix BZ 66209 - Add option to retain bloom filters for JAR indexing

[markt]

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 863e28301b Fix BZ 66209 - Add option to retain bloom filters for JAR 
indexing
863e28301b is described below

commit 863e28301bdb7c938d88040d4897771c0390115f
Author: Mark Thomas 
AuthorDate: Mon Oct 31 08:47:52 2022 +

Fix BZ 66209 - Add option to retain bloom filters for JAR indexing

https://bz.apache.org/bugzilla/show_bug.cgi?id=66209
Based on a patch by Rahul Jaisimha
This also moves configuration for archive indexing from Context to
WebResourceRoot
---
 java/org/apache/catalina/Context.java  |  9 ++-
 java/org/apache/catalina/WebResourceRoot.java  | 43 ++
 java/org/apache/catalina/core/StandardContext.java |  4 +-
 .../apache/catalina/core/mbeans-descriptors.xml|  2 +-
 .../webresources/AbstractArchiveResourceSet.java   | 10 +++-
 .../apache/catalina/webresources/StandardRoot.java | 17 ++
 .../catalina/webresources/mbeans-descriptors.xml   |  5 ++
 .../TestAbstractArchiveResourceSet.java| 68 +-
 .../catalina/webresources/TestStandardRoot.java| 14 +
 webapps/docs/changelog.xml | 13 +
 webapps/docs/config/context.xml|  6 +-
 webapps/docs/config/resources.xml  | 14 +
 12 files changed, 196 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index a24e215773..a521fdca35 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1958,14 +1958,21 @@ public interface Context extends Container, ContextBind 
{
 /**
  * @return true if the resources archive lookup will
  * use a bloom filter.
+ *
+ * @deprecated This method will be removed in Tomcat 11 onwards.
+ * Use {@link WebResourceRoot#getArchiveIndexStrategy()}
  */
+@Deprecated
 public boolean getUseBloomFilterForArchives();
 
 /**
  * Set bloom filter flag value.
  *
  * @param useBloomFilterForArchives The new fast class path scan flag
+ *
+ * @deprecated This method will be removed in Tomcat 11 onwards
+ * Use {@link WebResourceRoot#setArchiveIndexStrategy(String)}
  */
+@Deprecated
 public void setUseBloomFilterForArchives(boolean 
useBloomFilterForArchives);
-
 }
diff --git a/java/org/apache/catalina/WebResourceRoot.java 
b/java/org/apache/catalina/WebResourceRoot.java
index ae37893e1f..36bad52945 100644
--- a/java/org/apache/catalina/WebResourceRoot.java
+++ b/java/org/apache/catalina/WebResourceRoot.java
@@ -399,6 +399,27 @@ public interface WebResourceRoot extends Lifecycle {
  */
 boolean getTrackLockedFiles();
 
+/**
+ * Set the strategy to use for the resources archive lookup.
+ *
+ * @param archiveIndexStrategy The strategy to use for the resources 
archive lookup
+ */
+void setArchiveIndexStrategy(String archiveIndexStrategy);
+
+/**
+ * Get the strategy to use for the resources archive lookup.
+ *
+ * @return The strategy to use for the resources archive lookup
+ */
+String getArchiveIndexStrategy();
+
+/**
+ * Get the strategy to use for the resources archive lookup.
+ *
+ * @return The strategy to use for the resources archive lookup
+ */
+ArchiveIndexStrategy getArchiveIndexStrategyEnum();
+
 /**
  * This method will be invoked by the context on a periodic basis and 
allows
  * the implementation a method that executes periodic tasks, such as 
purging
@@ -464,6 +485,28 @@ public interface WebResourceRoot extends Lifecycle {
 CLASSES_JAR
 }
 
+enum ArchiveIndexStrategy {
+SIMPLE(false, false),
+BLOOM(true, true),
+PURGED(true, false);
+
+private final boolean usesBloom;
+private final boolean retain;
+
+ArchiveIndexStrategy(boolean usesBloom, boolean retain) {
+this.usesBloom = usesBloom;
+this.retain = retain;
+}
+
+public boolean getUsesBloom() {
+return usesBloom;
+}
+
+public boolean getRetain() {
+return retain;
+}
+}
+
 /**
  * Provides a mechanism to modify the caching behaviour.
  */
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 888973b0f9..caeb3b2514 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -1453,19 +1453,19 @@ public class StandardContext extends ContainerBase
 
 
 @Override
+@Deprecated
 public boolean getUseBloomFilterForArchives() {
 return this.useBloomFilterForArchives;

[tomcat] branch 9.0.x updated: Fix BZ 66209 - Add option to retain bloom filters for JAR indexing

[markt]

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 7453771191 Fix BZ 66209 - Add option to retain bloom filters for JAR 
indexing
7453771191 is described below

commit 74537711911e7c7509d7b01ca7ce3c1e1c339fef
Author: Mark Thomas 
AuthorDate: Mon Oct 31 08:47:52 2022 +

Fix BZ 66209 - Add option to retain bloom filters for JAR indexing

https://bz.apache.org/bugzilla/show_bug.cgi?id=66209
Based on a patch by Rahul Jaisimha
This also moves configuration for archive indexing from Context to
WebResourceRoot
---
 java/org/apache/catalina/Context.java  |  9 ++-
 java/org/apache/catalina/WebResourceRoot.java  | 43 ++
 java/org/apache/catalina/core/StandardContext.java |  4 +-
 .../apache/catalina/core/mbeans-descriptors.xml|  2 +-
 .../webresources/AbstractArchiveResourceSet.java   | 10 +++-
 .../apache/catalina/webresources/StandardRoot.java | 17 ++
 .../catalina/webresources/mbeans-descriptors.xml   |  5 ++
 .../TestAbstractArchiveResourceSet.java| 68 +-
 .../catalina/webresources/TestStandardRoot.java| 14 +
 webapps/docs/changelog.xml | 13 +
 webapps/docs/config/context.xml|  6 +-
 webapps/docs/config/resources.xml  | 14 +
 12 files changed, 196 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index 562a6e9230..0b874c7b85 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1934,14 +1934,21 @@ public interface Context extends Container, ContextBind 
{
 /**
  * @return true if the resources archive lookup will
  * use a bloom filter.
+ *
+ * @deprecated This method will be removed in Tomcat 11 onwards.
+ * Use {@link WebResourceRoot#getArchiveIndexStrategy()}
  */
+@Deprecated
 public boolean getUseBloomFilterForArchives();
 
 /**
  * Set bloom filter flag value.
  *
  * @param useBloomFilterForArchives The new fast class path scan flag
+ *
+ * @deprecated This method will be removed in Tomcat 11 onwards
+ * Use {@link WebResourceRoot#setArchiveIndexStrategy(String)}
  */
+@Deprecated
 public void setUseBloomFilterForArchives(boolean 
useBloomFilterForArchives);
-
 }
diff --git a/java/org/apache/catalina/WebResourceRoot.java 
b/java/org/apache/catalina/WebResourceRoot.java
index ae37893e1f..36bad52945 100644
--- a/java/org/apache/catalina/WebResourceRoot.java
+++ b/java/org/apache/catalina/WebResourceRoot.java
@@ -399,6 +399,27 @@ public interface WebResourceRoot extends Lifecycle {
  */
 boolean getTrackLockedFiles();
 
+/**
+ * Set the strategy to use for the resources archive lookup.
+ *
+ * @param archiveIndexStrategy The strategy to use for the resources 
archive lookup
+ */
+void setArchiveIndexStrategy(String archiveIndexStrategy);
+
+/**
+ * Get the strategy to use for the resources archive lookup.
+ *
+ * @return The strategy to use for the resources archive lookup
+ */
+String getArchiveIndexStrategy();
+
+/**
+ * Get the strategy to use for the resources archive lookup.
+ *
+ * @return The strategy to use for the resources archive lookup
+ */
+ArchiveIndexStrategy getArchiveIndexStrategyEnum();
+
 /**
  * This method will be invoked by the context on a periodic basis and 
allows
  * the implementation a method that executes periodic tasks, such as 
purging
@@ -464,6 +485,28 @@ public interface WebResourceRoot extends Lifecycle {
 CLASSES_JAR
 }
 
+enum ArchiveIndexStrategy {
+SIMPLE(false, false),
+BLOOM(true, true),
+PURGED(true, false);
+
+private final boolean usesBloom;
+private final boolean retain;
+
+ArchiveIndexStrategy(boolean usesBloom, boolean retain) {
+this.usesBloom = usesBloom;
+this.retain = retain;
+}
+
+public boolean getUsesBloom() {
+return usesBloom;
+}
+
+public boolean getRetain() {
+return retain;
+}
+}
+
 /**
  * Provides a mechanism to modify the caching behaviour.
  */
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 0515e4e80d..26639ef22c 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -1411,19 +1411,19 @@ public class StandardContext extends ContainerBase
 
 
 @Override
+@Deprecated
 public boolean getUseBloomFilterForArchives() {
 return this.useBloomFilterForArchives;
 

[Bug 66209] CPU regression when classpath Bloom filters are active

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66209

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #27 from Mark Thomas  ---
Thanks for the patches. I applied a slightly modified version.

Fixed in:
- 10.1.x for 10.1.2 onwards
-  9.0.x for  9.0.69 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 main updated: Remove deprecated code

[markt]

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 7c329c409b Remove deprecated code
7c329c409b is described below

commit 7c329c409b3bc0c51c2493e38678d46d4ec4f728
Author: Mark Thomas 
AuthorDate: Mon Oct 31 09:02:45 2022 +

Remove deprecated code
---
 java/org/apache/catalina/Context.java  | 22 --
 java/org/apache/catalina/core/StandardContext.java | 18 ---
 .../apache/catalina/core/mbeans-descriptors.xml|  4 
 .../org/apache/catalina/startup/FailedContext.java |  7 --
 .../webresources/AbstractArchiveResourceSet.java   |  4 +---
 .../TestAbstractArchiveResourceSet.java| 26 --
 test/org/apache/tomcat/unittest/TesterContext.java | 12 --
 webapps/docs/config/context.xml| 10 -
 8 files changed, 1 insertion(+), 102 deletions(-)

diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index 1ac36ee92e..cf940fad3f 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1943,26 +1943,4 @@ public interface Context extends Container, ContextBind {
  * @param dispatcherWrapsSameObject the new flag value
  */
 public void setDispatcherWrapsSameObject(boolean 
dispatcherWrapsSameObject);
-
-
-/**
- * @return true if the resources archive lookup will
- * use a bloom filter.
- *
- * @deprecated This method will be removed in Tomcat 11 onwards.
- * Use {@link WebResourceRoot#getArchiveIndexStrategy()}
- */
-@Deprecated
-public boolean getUseBloomFilterForArchives();
-
-/**
- * Set bloom filter flag value.
- *
- * @param useBloomFilterForArchives The new fast class path scan flag
- *
- * @deprecated This method will be removed in Tomcat 11 onwards
- * Use {@link WebResourceRoot#setArchiveIndexStrategy(String)}
- */
-@Deprecated
-public void setUseBloomFilterForArchives(boolean 
useBloomFilterForArchives);
 }
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index caeb3b2514..d21ea4fed5 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -835,7 +835,6 @@ public class StandardContext extends ContainerBase
 
 private boolean parallelAnnotationScanning = false;
 
-private boolean useBloomFilterForArchives = false;
 
 // - Context Properties
 
@@ -1452,23 +1451,6 @@ public class StandardContext extends ContainerBase
 }
 
 
-@Override
-@Deprecated
-public boolean getUseBloomFilterForArchives() {
-return this.useBloomFilterForArchives;
-}
-
-
-@Override
-@Deprecated
-public void setUseBloomFilterForArchives(boolean 
useBloomFilterForArchives) {
-boolean oldUseBloomFilterForArchives = this.useBloomFilterForArchives;
-this.useBloomFilterForArchives = useBloomFilterForArchives;
-support.firePropertyChange("useBloomFilterForArchives", 
oldUseBloomFilterForArchives,
-this.useBloomFilterForArchives);
-}
-
-
 @Override
 public void setParallelAnnotationScanning(boolean 
parallelAnnotationScanning) {
 
diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml 
b/java/org/apache/catalina/core/mbeans-descriptors.xml
index 92f9f9d434..ba1d0facb7 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -321,10 +321,6 @@
description="Unpack WAR property"
type="boolean"/>
 
-
-
 
diff --git a/java/org/apache/catalina/startup/FailedContext.java 
b/java/org/apache/catalina/startup/FailedContext.java
index e352ce28c7..3234eed0cd 100644
--- a/java/org/apache/catalina/startup/FailedContext.java
+++ b/java/org/apache/catalina/startup/FailedContext.java
@@ -835,11 +835,4 @@ public class FailedContext extends LifecycleMBeanBase 
implements Context {
 public boolean getParallelAnnotationScanning() { return false; }
 @Override
 public void setParallelAnnotationScanning(boolean 
parallelAnnotationScanning) {}
-
-@Override
-public boolean getUseBloomFilterForArchives() { return false; }
-
-@Override
-public void setUseBloomFilterForArchives(boolean 
useBloomFilterForArchives) {}
-
 }
\ No newline at end of file
diff --git 
a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
index 3933cb3ab1..9d22a7d1b0 100644
--- a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
+++ b/java/org/apache/catalina/webresour

[tomcat] branch main updated: Remove MBean references to deleted methods

[markt]

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 184997e2bd Remove MBean references to deleted methods
184997e2bd is described below

commit 184997e2bd41a304260430a140315944c6a63def
Author: Mark Thomas 
AuthorDate: Mon Oct 31 09:07:12 2022 +

Remove MBean references to deleted methods
---
 .../org/apache/catalina/startup/mbeans-descriptors.xml | 18 --
 1 file changed, 18 deletions(-)

diff --git a/java/org/apache/catalina/startup/mbeans-descriptors.xml 
b/java/org/apache/catalina/startup/mbeans-descriptors.xml
index 9cdc1bb438..66dd4ccb2d 100644
--- a/java/org/apache/catalina/startup/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/startup/mbeans-descriptors.xml
@@ -99,15 +99,6 @@
  type="java.lang.String"/>
 
 
-
-  
-
-
 
 
 
-
-  
-
-
 

[tomcat] branch 10.1.x updated: Remove MBean references to deleted methods

[markt]

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 e92faa26cb Remove MBean references to deleted methods
e92faa26cb is described below

commit e92faa26cb216a64e38bbab106acf3186e8b1716
Author: Mark Thomas 
AuthorDate: Mon Oct 31 09:07:12 2022 +

Remove MBean references to deleted methods
---
 .../org/apache/catalina/startup/mbeans-descriptors.xml | 18 --
 1 file changed, 18 deletions(-)

diff --git a/java/org/apache/catalina/startup/mbeans-descriptors.xml 
b/java/org/apache/catalina/startup/mbeans-descriptors.xml
index 9cdc1bb438..66dd4ccb2d 100644
--- a/java/org/apache/catalina/startup/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/startup/mbeans-descriptors.xml
@@ -99,15 +99,6 @@
  type="java.lang.String"/>
 
 
-
-  
-
-
 
 
 
-
-  
-
-
 

[tomcat] branch main updated: Remove out-dated text. The "previous version" was 5.5

[markt]

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 fdb70d5036 Remove out-dated text. The "previous version" was 5.5
fdb70d5036 is described below

commit fdb70d5036318f478dc1d7f909dcb2d1dc3bfffc
Author: Mark Thomas 
AuthorDate: Mon Oct 31 09:15:02 2022 +

Remove out-dated text. The "previous version" was 5.5
---
 webapps/docs/config/cluster.xml | 10 --
 1 file changed, 10 deletions(-)

diff --git a/webapps/docs/config/cluster.xml b/webapps/docs/config/cluster.xml
index 03dbf4b693..409aac4fd8 100644
--- a/webapps/docs/config/cluster.xml
+++ b/webapps/docs/config/cluster.xml
@@ -113,16 +113,6 @@ network, particularly DoS attacks.
   
 
 
-
-  
-Deprecated settings: In the previous version of Tomcat you were 
able to control session
-   manager settings using manager.=value.
-   This has been discontinued, as the way it was written interferes with
-   the ability to support multiple different manager classes under one 
cluster implementation,
-   as the same properties might have the different effect on different 
managers.
-  
-
-
 
   
   


-
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: Remove out-dated text. The "previous version" was 5.5

[markt]

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 671dcf8cf8 Remove out-dated text. The "previous version" was 5.5
671dcf8cf8 is described below

commit 671dcf8cf8c9fde5505781ef72de81cb511eb09a
Author: Mark Thomas 
AuthorDate: Mon Oct 31 09:15:02 2022 +

Remove out-dated text. The "previous version" was 5.5
---
 webapps/docs/config/cluster.xml | 10 --
 1 file changed, 10 deletions(-)

diff --git a/webapps/docs/config/cluster.xml b/webapps/docs/config/cluster.xml
index 03dbf4b693..409aac4fd8 100644
--- a/webapps/docs/config/cluster.xml
+++ b/webapps/docs/config/cluster.xml
@@ -113,16 +113,6 @@ network, particularly DoS attacks.
   
 
 
-
-  
-Deprecated settings: In the previous version of Tomcat you were 
able to control session
-   manager settings using manager.=value.
-   This has been discontinued, as the way it was written interferes with
-   the ability to support multiple different manager classes under one 
cluster implementation,
-   as the same properties might have the different effect on different 
managers.
-  
-
-
 
   
   


-
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 out-dated text. The "previous version" was 5.5

[markt]

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 1696911b47 Remove out-dated text. The "previous version" was 5.5
1696911b47 is described below

commit 1696911b47ad888da08399a7fc2f9f9a3370548d
Author: Mark Thomas 
AuthorDate: Mon Oct 31 09:15:02 2022 +

Remove out-dated text. The "previous version" was 5.5
---
 webapps/docs/config/cluster.xml | 10 --
 1 file changed, 10 deletions(-)

diff --git a/webapps/docs/config/cluster.xml b/webapps/docs/config/cluster.xml
index 03dbf4b693..409aac4fd8 100644
--- a/webapps/docs/config/cluster.xml
+++ b/webapps/docs/config/cluster.xml
@@ -113,16 +113,6 @@ network, particularly DoS attacks.
   
 
 
-
-  
-Deprecated settings: In the previous version of Tomcat you were 
able to control session
-   manager settings using manager.=value.
-   This has been discontinued, as the way it was written interferes with
-   the ability to support multiple different manager classes under one 
cluster implementation,
-   as the same properties might have the different effect on different 
managers.
-  
-
-
 
   
   


-
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: Remove out-dated text. The "previous version" was 5.5

[markt]

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 11d3bb652d Remove out-dated text. The "previous version" was 5.5
11d3bb652d is described below

commit 11d3bb652d776d50d9806e0c1120a7b5e3cb3356
Author: Mark Thomas 
AuthorDate: Mon Oct 31 09:15:02 2022 +

Remove out-dated text. The "previous version" was 5.5
---
 webapps/docs/config/cluster.xml | 10 --
 1 file changed, 10 deletions(-)

diff --git a/webapps/docs/config/cluster.xml b/webapps/docs/config/cluster.xml
index 21d0fe5f47..8413040acd 100644
--- a/webapps/docs/config/cluster.xml
+++ b/webapps/docs/config/cluster.xml
@@ -113,16 +113,6 @@ network, particularly DoS attacks.
   
 
 
-
-  
-Deprecated settings: In the previous version of Tomcat you were 
able to control session
-   manager settings using manager.=value.
-   This has been discontinued, as the way it was written interferes with
-   the ability to support multiple different manager classes under one 
cluster implementation,
-   as the same properties might have the different effect on different 
managers.
-  
-
-
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 66329] The Tomcat connection processing thread may exit abnormally

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66329

Remy Maucherat  changed:

   What|Removed |Added

 Resolution|INVALID |FIXED

--- Comment #2 from Remy Maucherat  ---
I was looking to see if we could do better, but it is likely to go into an
infinite loop. Ideally it would be good to keep the poller thread alive (only
this one) though ... Maybe hack in a Thread.sleep if
ExceptionUtils.handleThrowable throws an error ?

-- 
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: r1904954 - in /tomcat/site/trunk: docs/security-10.html docs/tomcat-10.0-eol.html docs/whichversion.html xdocs/security-10.xml xdocs/tomcat-10.0-eol.xml xdocs/whichversion.xml

[markt]

Author: markt
Date: Mon Oct 31 15:08:15 2022
New Revision: 1904954

URL: http://svn.apache.org/viewvc?rev=1904954&view=rev
Log:
Realised we needed a formal EOL notice for 10.0.x

Added:
tomcat/site/trunk/docs/tomcat-10.0-eol.html
tomcat/site/trunk/xdocs/tomcat-10.0-eol.xml
Modified:
tomcat/site/trunk/docs/security-10.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/security-10.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/security-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-10.html?rev=1904954&r1=1904953&r2=1904954&view=diff
==
--- tomcat/site/trunk/docs/security-10.html (original)
+++ tomcat/site/trunk/docs/security-10.html Mon Oct 31 15:08:15 2022
@@ -12,6 +12,12 @@
but have either been incorrectly reported against Tomcat or where Tomcat
provides a workaround are listed at the end of this page.
 
+Please note that Tomcat 10.0.x has reached
+   end of life and is no longer 
supported.
+   Vulnerabilities reported after 31 October 2022 were not checked against 
the
+   10.0.x branch and will not be fixed. Users should upgrade to 10.1.x or
+   later to obtain security fixes.
+
 Please note that binary patches are never provided. If you need to
apply a source code patch, use the building instructions for the
Apache Tomcat version that you are using. For Tomcat 10.0.x those are

Added: tomcat/site/trunk/docs/tomcat-10.0-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-eol.html?rev=1904954&view=auto
==
--- tomcat/site/trunk/docs/tomcat-10.0-eol.html (added)
+++ tomcat/site/trunk/docs/tomcat-10.0-eol.html Mon Oct 31 15:08:15 2022
@@ -0,0 +1,32 @@
+
+Apache Tomcat® - End of life for Apache Tomcat 
10.0.xhttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left">src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software 
 >Foundation">id="mainLeft">action="https://www.google.com/search"; method="get">class="searchbox">type="hidden">required="required" name="q" id="query" 
 >type="search">GOApache 
 >TomcatHomehref="./taglibs.html">TaglibsMaven 
 >PluginDownloadhref="./whichversion.html">Which version?href="https://tomcat.apache.org/download-10.cgi";>Tomcat 10href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9href="https://tomcat.apache.org/do
 wnload-80.cgi">Tomcat 8https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 10.1Tomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat ConnectorsTomcat Native 2Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki<
 li>Migration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/Apac
 heTomcatOfficial">YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html";>Privacyhttps://www.apache.org/foundation/contributing.html";>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContent2022-10-31 End of life for Apache Tomcat 
10.0.x
+The Apache Tomcat team announces that support for Apache Tomcat 10.0.x
+ended on 31 October 2022.
+
+This means that after 31 October 2022:
+
+  releases from the 10.0.x branch are highly unlikely
+  bugs affecting only the 10.0.x branch will not be addressed
+  security vulnerability reports will not be checked against the 10.0.x
+branch
+
+
+Three months later (i.e. after 31 January 2023)
+
+  the 10.0.x download links will be removed
+  the latest 10.0.x release will be removed from the mirror system
+  the links to the 10.0.x documentation will be removed from
+tomcat.apache.org
+
+
+Note that all 10.0.x releases will always be available from the archive.
+
+The final 10.0.x release was 10.0.27, released on 10 October 

Re: svn commit: r1904954 - in /tomcat/site/trunk: docs/security-10.html docs/tomcat-10.0-eol.html docs/whichversion.html xdocs/security-10.xml xdocs/tomcat-10.0-eol.xml xdocs/whichversion.xml

[Mark Thomas]

On 31/10/2022 15:08, ma...@apache.org wrote:

Author: markt
Date: Mon Oct 31 15:08:15 2022
New Revision: 1904954

URL: http://svn.apache.org/viewvc?rev=1904954&view=rev
Log:
Realised we needed a formal EOL notice for 10.0.x


If folks have been following the various 10.0.x / 10.1.x / 11.0.x 
discussions on the users@ list this shouldn't be a surprise but I was 
wondering whether we wanted to send out a formal announcement as well.


If we do, we can reference back to the various threads where the release 
plan was described.


Thoughts?

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1904955 - in /tomcat/site/trunk: docs/security-10.html docs/security-8.html docs/security-9.html xdocs/security-10.xml xdocs/security-8.xml xdocs/security-9.xml

[markt]

Author: markt
Date: Mon Oct 31 16:46:14 2022
New Revision: 1904955

URL: http://svn.apache.org/viewvc?rev=1904955&view=rev
Log:
Publish CVE-2022-42252

Modified:
tomcat/site/trunk/docs/security-10.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/xdocs/security-10.xml
tomcat/site/trunk/xdocs/security-8.xml
tomcat/site/trunk/xdocs/security-9.xml

Modified: tomcat/site/trunk/docs/security-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-10.html?rev=1904955&r1=1904954&r2=1904955&view=diff
==
--- tomcat/site/trunk/docs/security-10.html (original)
+++ tomcat/site/trunk/docs/security-10.html Mon Oct 31 16:46:14 2022
@@ -42,7 +42,47 @@
 
 
   Table of Contents
-Fixed in Apache Tomcat 
10.0.23Fixed in 
Apache Tomcat 10.1.0-M17Fixed in Apache Tomcat 
10.0.21Fixed in 
Apache Tomcat 10.1.0-M15Fixed in Apache Tomcat 
10.0.20Fixed in 
Apache Tomcat 10.1.0-M14Fixed in Apache Tomcat 
10.0.16Fixed in 
Apache Tomcat 10.1.0-M10Fixed in Apache Tomcat 
10.0.12Fixed in Apache 
Tomcat 10.1.0-M6Fixed in 
Apache Tomcat 10.0.7Fixed in Apache Tomcat 10.0.6Fixed in Apache Tomcat 
10.0.5Fixed in Apache 
Tomcat 10.0.4Fixed in 
Apache Tomcat 10.0.2Fixed in Apache Tomcat 
10.0.0-M10Fixed in 
Apache Tomcat 10.0.0-M8Fixed in Apache Tomcat 
10.0.0-M7Fixed in 
Apache Tomcat 10.0.0-M6Fixed in Apache Tomcat 
10.0.0-M5Not a 
vulnerability in Tomcat
+Fixed in Apache Tomcat 
10.0.27Fixed in Apache 
Tomcat 10.1.1Fixed in 
Apache Tomcat 10.0.23Fixed in Apache Tomcat 
10.1.0-M17Fixed in 
Apache Tomcat 10.0.21Fixed in Apache Tomcat 
10.1.0-M15Fixed in 
Apache Tomcat 10.0.20Fixed in Apache Tomcat 
10.1.0-M14Fixed in 
Apache Tomcat 10.0.16Fixed in Apache Tomcat 
10.1.0-M10Fixed in 
Apache Tomcat 10.0.12Fixed in Apache Tomcat 10.1.0-M6Fixed in Apache Tomcat 
10.0.7Fixed in Apache 
Tomcat 10.0.6Fixed in 
Apache Tomcat 10.0.5Fixed 
in Apache Tomcat 10.0.4Fixed in Apache Tomcat 
10.0.2Fixed in Apache 
Tomcat 10.0.0-M10Fixed 
in Apache Tomcat 10.0.0-M8Fixed in Apache Tomcat 
10.0.0-M7Fixed in 
Apache Tomcat 10.0.0-M6Fixed in Apache Tomcat 
10.0.0-M5Not a 
vulnerability in Tomcat
 
+  2022-10-10 Fixed in Apache Tomcat 10.0.27
+  
+Low: Apache Tomcat request smuggling
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-42252"; 
rel="nofollow">CVE-2022-42252
+
+If Tomcat was configured to ignore invalid HTTP headers via setting
+   rejectIllegalHeader to false (not the 
default),
+   Tomcat did not reject a request containing an invalid
+   Content-Length header making a request smuggling attack
+   possible if Tomcat was located behind a reverse proxy that also failed 
to
+   reject the request with the invalid header.
+   
+This was fixed with commit
+   https://github.com/apache/tomcat/commit/0d089a15047faf9cb3c82f80f4d28febd4798920";>0d089a15.
+
+This issue was reported to the Apache Tomcat Security team on 29
+   September 2022. The issue was made public on 31 October 2022.
+
+Affects: 10.0.0-M1 to 10.0.26
+
+  2022-10-11 Fixed in Apache Tomcat 10.1.1
+  
+Low: Apache Tomcat request smuggling
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-42252"; 
rel="nofollow">CVE-2022-42252
+
+If Tomcat was configured to ignore invalid HTTP headers via setting
+   rejectIllegalHeader to false (not the 
default),
+   Tomcat did not reject a request containing an invalid
+   Content-Length header making a request smuggling attack
+   possible if Tomcat was located behind a reverse proxy that also failed 
to
+   reject the request with the invalid header.
+   
+This was fixed with commit
+   https://github.com/apache/tomcat/commit/c9fe754e5d17e262dfbd3eab2a03ca96ff372dc3";>c9fe754e.
+
+This issue was reported to the Apache Tomcat Security team on 29
+   September 2022. The issue was made public on 31 October 2022.
+
+Affects: 10.1.0-M1 to 10.1.0
+
   2022-07-26 Fixed in Apache Tomcat 10.0.23
   
 Low: Apache Tomcat XSS in examples web application

Modified: tomcat/site/trunk/docs/security-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1904955&r1=1904954&r2=1904955&view=diff
==
--- tomcat/site/trunk/docs/security-8.html (original)
+++ tomcat/site/trunk/docs/security-8.html Mon Oct 31 16:46:14 2022
@@ -42,7 +42,27 @@
 
 
   Table of Contents
-Fixed in Apache Tomcat 
8.5.82Fixed in Apache 
Tomcat 8.5.79Fixed in 
Apache Tomcat 8.5.78Fixed 
in Apache Tomcat 8.5.76Fixed in Apache Tomcat 
8.5.75Fixed in Apache 
Tomcat 8.5.72Fixed in 
Apache Tomcat 8.5.68Fixed 
in Apache Tomcat 8.5.66Fixed in Apache Tomcat 
8.5.65Fixed in Apache 
Tomcat 8.5.64Fixed in 
Apache Tomcat 8.5.63Fixed 
in Apache Tomcat 8.5.60Fixed in Apache Tomcat 
8.5.58Fixed in A

[SECURITY] CVE-2022-42252 Apache Tomcat - Request Smuggling

[Mark Thomas]

CVE-2022-42252 Apache Tomcat - Request Smuggling

Severity: Low

Vendor: The Apache Software Foundation

Versions Affected:
Apache Tomcat 10.1.0-M1 to 10.1.0
Apache Tomcat 10.0.0-M1 to 10.0.26
Apache Tomcat 9.0.0-M1 to 9.0.67
Apache Tomcat 8.5.0 to 8.5.52

Description:
If Tomcat was configured to ignore invalid HTTP headers via setting
rejectIllegalHeader to false (the default for 8.5.x only), Tomcat did 
not reject a request containing an invalid Content-Length header making 
a request smuggling attack  possible if Tomcat was located behind a 
reverse proxy that also failed to reject the request with the invalid 
header.



Mitigation:
Users of the affected versions should apply one of the following
mitigations:
- Ensure rejectIllegalHeader is set to true
- Upgrade to Apache Tomcat 10.1.1 or later
- Upgrade to Apache Tomcat 10.0.27 or later
- Upgrade to Apache Tomcat 9.0.68 or later
- Upgrade to Apache Tomcat 8.5.83 or later

Credit:
Thanks to Sam Shahsavar who discovered this issue and reported it to the 
Apache Tomcat security team.


History:
2022-10-31 Original advisory

References:
[1] https://tomcat.apache.org/security-10.html
[2] https://tomcat.apache.org/security-9.html
[3] https://tomcat.apache.org/security-8.html


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat-native] markt-asf merged pull request #13: native: Update for libressl 3.5

[GitBox]

markt-asf merged PR #13:
URL: https://github.com/apache/tomcat-native/pull/13


-- 
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-native] branch main updated (eff76a472 -> bcdc9a28e)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


from eff76a472 Remove 1.2.x news from 2.0.x branch
 new 723f0726f native: Update for libressl 3.5
 new c950da2f7 native: Remove code for outdated libressl versions
 new bcdc9a28e Merge pull request #13 from orbea/libressl

The 1250 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:
 native/build/tcnative.m4 |   2 +-
 native/include/ssl_private.h |  28 +
 native/src/ssl.c | 284 +--
 native/src/sslcontext.c  | 121 +-
 native/src/sslutils.c|   4 +
 5 files changed, 15 insertions(+), 424 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat-native] markt-asf commented on a diff in pull request #13: native: Update for libressl 3.5

[GitBox]

markt-asf commented on code in PR #13:
URL: https://github.com/apache/tomcat-native/pull/13#discussion_r1009712365


##
native/build/tcnative.m4:
##
@@ -233,7 +233,7 @@ AC_DEFUN([TCN_FIND_SSL_TOOLKIT],[
 #include 
 #include 
 int main() {
-if (OPENSSL_VERSION_NUMBER >= 0x300fL)
+if (OPENSSL_VERSION_NUMBER >= 0x300fL || LIBRESSL_VERSION_NUMBER 
>= 0x3050200fL)
 return (0);

Review Comment:
   This breaks the build when LibreSSL is not present. I'll get that fixed.



-- 
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-native] branch main updated: Follow up to LibreSSL 3.5.2 changes

[markt]

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-native.git


The following commit(s) were added to refs/heads/main by this push:
 new 881c19b75 Follow up to LibreSSL 3.5.2 changes
881c19b75 is described below

commit 881c19b7500574297f7533a3753596a25447a1f4
Author: Mark Thomas 
AuthorDate: Mon Oct 31 19:58:31 2022 +

Follow up to LibreSSL 3.5.2 changes

Add a change log entry.
Fix a couple of compilation issues introduced when building with
OpenSSL.
---
 native/build/tcnative.m4  |  8 ++--
 native/include/ssl_private.h  |  5 -
 native/src/ssl.c  | 11 ---
 xdocs/miscellaneous/changelog.xml |  4 
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4
index 7a8dfe281..3b80fb2c5 100644
--- a/native/build/tcnative.m4
+++ b/native/build/tcnative.m4
@@ -233,8 +233,12 @@ AC_DEFUN([TCN_FIND_SSL_TOOLKIT],[
 #include 
 #include 
 int main() {
-if (OPENSSL_VERSION_NUMBER >= 0x300fL || LIBRESSL_VERSION_NUMBER 
>= 0x3050200fL)
-return (0);
+#ifdef LIBRESSL_VERSION_NUMBER
+if (OPENSSL_VERSION_NUMBER >= 0x300fL || LIBRESSL_VERSION_NUMBER >= 
0x3050200fL)
+#else
+if (OPENSSL_VERSION_NUMBER >= 0x300fL)
+#endif
+return (0);
 printf("\n\nFound   OPENSSL_VERSION_NUMBER %#010x (" OPENSSL_VERSION_TEXT 
")\n",
 OPENSSL_VERSION_NUMBER);
 printf("Require OPENSSL_VERSION_NUMBER 0x300f or greater (3.0.0)\n\n");
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index 0e1dc6704..091634df2 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -365,12 +365,7 @@ int SSL_rand_seed(const char *file);
 int SSL_callback_alpn_select_proto(SSL *, const unsigned char **, 
unsigned char *, const unsigned char *, unsigned int, void *);
 voidSSL_callback_add_keylog(SSL_CTX *);
 
-#if ! (defined(WIN32) || defined(WIN64))
-unsigned long SSL_ERR_get(void);
-void SSL_ERR_clear(void);
-#else
 #define SSL_ERR_get() ERR_get_error()
 #define SSL_ERR_clear() ERR_clear_error()
-#endif
 
 #endif /* SSL_PRIVATE_H */
diff --git a/native/src/ssl.c b/native/src/ssl.c
index c6838f8e5..a008ec44d 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -43,11 +43,6 @@ static void ssl_keylog_callback(const SSL *ssl, const char 
*line)
 static jclass byteArrayClass;
 static jclass stringClass;
 
-#if defined(LIBRESSL_VERSION_NUMBER) && ! (defined(WIN32) || defined(WIN64))
-apr_threadkey_t *thread_exit_key;
-static int threadkey_initialized = 0;
-#endif
-
 /*
  * supported_ssl_opts is a bitmask that contains all supported SSL_OP_*
  * options at compile-time. This is used in hasOp to determine which
@@ -306,12 +301,6 @@ static apr_status_t ssl_init_cleanup(void *data)
 return APR_SUCCESS;
 ssl_initialized = 0;
 
-#if ! (defined(WIN32) || defined(WIN64))
-if (threadkey_initialized) {
-threadkey_initialized = 0;
-apr_threadkey_private_delete(thread_exit_key);
-}
-#endif
 if (tcn_password_callback.cb.obj) {
 JNIEnv *env;
 tcn_get_java_env(&env);
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index fb3dd3f8f..33a6b7f69 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -33,6 +33,10 @@
 
 
   
+
+  Update the minimum supported version of LibreSSL to 3.5.2. Based on pull
+  request 13 provided by orbea. (markt)
+
   
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat-native] markt-asf merged pull request #14: native: Fix the build with rlibtool

[GitBox]

markt-asf merged PR #14:
URL: https://github.com/apache/tomcat-native/pull/14


-- 
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-native] branch main updated: native: Fix the build with rlibtool

[markt]

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-native.git


The following commit(s) were added to refs/heads/main by this push:
 new 54dccd3a4 native: Fix the build with rlibtool
 new 4f7fb7f44 Merge pull request #14 from orbea/slibtool
54dccd3a4 is described below

commit 54dccd3a4dc01801d9311b3160808305ec9fc2cf
Author: orbea 
AuthorDate: Thu Jul 21 17:59:14 2022 -0700

native: Fix the build with rlibtool

When building tomcat-native with slibtool using the rlibtool symlink the
build will fail. This is because rlibtool requires the generated libtool
script to determine if the build is shared, static or both.

Gentoo bug: https://bugs.gentoo.org/778914
---
 native/configure.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/native/configure.in b/native/configure.in
index 567894b10..e082ae6d2 100644
--- a/native/configure.in
+++ b/native/configure.in
@@ -50,6 +50,9 @@ AC_SUBST(TCN_CONFIG_LOCATION)
 AC_CANONICAL_TARGET
 AC_PROG_INSTALL
 
+dnl Generate the libtool script which is needed for rlibtool
+LT_INIT
+
 dnl
 dnl compute the top directory of the build
 dnl note: this is needed for LIBTOOL and exporting the bundled Expat


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-native] branch main updated: Add change log entry

[markt]

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-native.git


The following commit(s) were added to refs/heads/main by this push:
 new 11e68075e Add change log entry
11e68075e is described below

commit 11e68075e815b53d45ce858fd8731e4aa4c22873
Author: Mark Thomas 
AuthorDate: Mon Oct 31 20:03:47 2022 +

Add change log entry
---
 xdocs/miscellaneous/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 33a6b7f69..dde5935f3 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -37,6 +37,10 @@
   Update the minimum supported version of LibreSSL to 3.5.2. Based on pull
   request 13 provided by orbea. (markt)
 
+
+  Fix build when building with rlibtool. Pull request 14 provided
+  by orbea. (markt)
+
   
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/05: Improvements to French translations

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 82d041f41658d3cbc4845d0591ab881ef44cf2a9
Author: Mark Thomas 
AuthorDate: Mon Oct 31 20:30:08 2022 +

Improvements to French translations
---
 java/org/apache/catalina/valves/LocalStrings_fr.properties  | 6 +++---
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 3 ++-
 java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 4 
 webapps/docs/changelog.xml  | 4 
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties 
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 01eb33497e..18d4266282 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -51,7 +51,7 @@ extendedAccessLogValve.patternParseError=Erreur lors de 
l''analyse du modèle [{
 http.400.desc=La requête envoyée par le client était syntaxiquement incorrecte.
 http.400.reason=Requête invalide
 http.401.desc=La requête nécessite une authentification HTTP.
-http.401.reason=Non authorisé
+http.401.reason=Non autorisé
 http.402.desc=Un paiement est demandé pour accéder à cette ressource.
 http.402.reason=Paiement requis
 http.403.desc=L'accès à la ressource demandée a été interdit.
@@ -70,7 +70,7 @@ http.409.desc=La requête ne peut être finalisée suite à un 
conflit lié à l
 http.409.reason=Conflit
 http.410.desc=La ressource demandée n'est pas disponible, et aucune adresse de 
rebond (forwarding) n'est connue.
 http.410.reason=Disparu
-http.411.desc=La requête ne peut être traitée sans définition d'une taille de 
contenu (content length).
+http.411.desc=La requête ne peut être traitée sans définition d'une taille de 
contenu (Content-Length).
 http.411.reason=Une longueur est requise
 http.412.desc=Une condition préalable demandée n'est pas satisfaite pour cette 
requête.
 http.412.reason=Erreur dans la pré-condition
@@ -90,7 +90,7 @@ http.422.desc=Le serveur a compris le type de contenu 
(content type) ainsi que l
 http.422.reason=Impossible de traiter cette entité
 http.423.desc=La ressource source ou destination de la méthode est verrouillée.
 http.423.reason=Verrouillé
-http.424.desc=La méthode n'a pas pu être exécutée sur la ressource parce 
qu'elle dépendait d'une autre action qui a échouée
+http.424.desc=La méthode n'a pas pu être exécutée sur la ressource parce 
qu'elle dépendait d'une autre action qui a échoué.
 http.424.reason=Echec de dépendence
 http.426.desc=Le serveur a refusé de traiter cette requête en utilisant le 
protocole actuel mais pourrait le faire si le client en utilise un autre
 http.426.reason=Mise à jour du protocole requise
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index f65e6a6bf3..070414d5cd 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -106,7 +106,7 @@ jsp.error.jspoutput.doctypenamesystem= : 
les attributs "doctyp
 jsp.error.jspoutput.doctypepublicsystem=L'attribut  : 
'doctype-system' doit être présent lorsque l'attribut 'doctype-public' l'est
 jsp.error.jspoutput.invalidUse= ne doit pas être utilisé en 
syntaxe standard
 jsp.error.jspoutput.nonemptybody= ne doit pas avoir de corps
-jsp.error.jsproot.version.invalid=Le numéro de version [{0}] est invalide, il 
devrait être "1.2", "2.0", "2.1", "2.2", "2.3", "3.0" ou "3.1"
+jsp.error.jsproot.version.invalid=Le numéro de version [{0}] est invalide, il 
devrait être "1.2", "2.0", "2.1", "2.2", "2.3", "3.0", "3.1" ou "4.0"
 jsp.error.jsptext.badcontent=Quand '<' apparaît dans le corps d'un 
, il doit être encapsulé dans un CDATA\n
 jsp.error.lastModified=Impossible de déterminer la date de dernière 
modification pour le fichier [{0}]
 jsp.error.library.invalid=La page JSP page est incorrecte d''après la 
bibliothèque [{0}] : [{1}]
@@ -138,6 +138,7 @@ jsp.error.non_null_tei_and_var_subelems=Le tag [{0}] 
possède une ou plusieurs v
 jsp.error.not.in.template=[{0}] n''est pas autorisé dans le corps de texte de 
template.
 jsp.error.nullArgument=Argument null
 jsp.error.outputfolder=Pas de répertoire de sortie
+jsp.error.outputfolder.detail=Impossible de créer le répertoire de sortie 
[{0}] nécessaire pour la compilation des JSPs
 jsp.error.overflow=Erreur : Dépassement de capacité du tampon JSP
 jsp.error.page.conflict.autoflush=Directive de page : il est illégal d''avoir 
plusieurs occurrences de "autoFlush" avec des valeurs différentes (ancienne : 
[{0}], nouvelle [{1}])
 jsp.error.page.conflict.buffer=Directive de page : il est illégal d''avoir 
plusieurs occurrences de "buffer" avec des valeurs différentes (ancienne : 
[{0}]

[tomcat] 01/05: Update Chinese translations

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit dcd820a180b7ec38cb95faebf9d49356b4226527
Author: Mark Thomas 
AuthorDate: Mon Oct 31 20:26:40 2022 +

Update Chinese translations
---
 .../authenticator/LocalStrings_zh_CN.properties|  1 +
 .../apache/catalina/core/LocalStrings_zh_CN.properties |  6 +++---
 .../ha/authenticator/LocalStrings_zh_CN.properties |  2 +-
 .../catalina/ha/deploy/LocalStrings_zh_CN.properties   | 18 +-
 .../catalina/ha/session/LocalStrings_zh_CN.properties  | 12 ++--
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  | 14 +++---
 .../catalina/startup/LocalStrings_zh_CN.properties |  2 +-
 .../apache/coyote/http11/LocalStrings_zh_CN.properties |  1 +
 .../apache/coyote/http2/LocalStrings_zh_CN.properties  |  2 ++
 .../jasper/resources/LocalStrings_zh_CN.properties |  3 ++-
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  3 +++
 webapps/docs/changelog.xml |  7 ++-
 12 files changed, 42 insertions(+), 29 deletions(-)

diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index 17a8983c1e..1cef284b8d 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -41,6 +41,7 @@ formAuthenticator.forwardLogin=使用请求方法GET将使用方法[{1}]发出
 formAuthenticator.forwardLoginFail=转发到登录页时出现意外错误。
 formAuthenticator.noErrorPage=没有为上下文[{0}]中的表单身份验证定义错误页
 formAuthenticator.noLoginPage=在环境[{0}]中，未为FORM认证定义登录页面
+formAuthenticator.sessionIdMismatch=当前会话ID是[{0}]，但是FORM认证器期望的是[{1}]。
 
 singleSignOn.debug.associate=SSO将应用程序会话[{1}]与SSO会话[{0}]关联
 singleSignOn.debug.associateFail=SSO无法关联应用程序会话[{0}]，因为SSO会话[{1}]不存在。
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 0558b35169..469d3696dd 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -117,8 +117,8 @@ containerBase.child.destroy=销毁子级时出错
 containerBase.child.notUnique=子名称[{0}]不唯一
 containerBase.child.start=启动子级时出错
 containerBase.child.stop=停止子级时出错
-containerBase.cluster.start=启动新群集时出错
-containerBase.cluster.stop=停止旧群集时出错
+containerBase.cluster.start=启动新集群时出错
+containerBase.cluster.stop=停止旧集群时出错
 containerBase.nullName=容器名称不能为null
 containerBase.realm.start=启动新领域时出错
 containerBase.realm.stop=停止旧域时出错
@@ -168,7 +168,7 @@ 
standardContext.backgroundProcess.instanceManager=异常处理实例管理器[{0
 standardContext.backgroundProcess.loader=异常处理加载程序[{0}]后台进程
 standardContext.backgroundProcess.manager=异常处理管理器[{0}]后台进程。
 standardContext.backgroundProcess.resources=异常处理资源[{0}] 后台进程
-standardContext.cluster.managerError=创建新群集会话管理器时出错
+standardContext.cluster.managerError=创建新集群会话管理器时出错
 standardContext.cluster.noManager=未发现管理器。检查是否需要集群管理器。集群配置：[{0}]，应用程序分配：[{1}]
 standardContext.configurationFail=一个或多个组件将上下文标记为未正确配置
 standardContext.cookieProcessor.null=不允许将上下文的CookieProcessor 设置为null
diff --git 
a/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
index 9a0d4b6664..9090f9149d 100644
--- a/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 clusterSingleSignOn.clusterLoad.fail=在集群加载时， 集群单点登录异常
-clusterSingleSignOn.nocluster=没有群集SingleSignon的群集。
+clusterSingleSignOn.nocluster=没有ClusterSingleSignOn的集群。
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index 6a229f8484..c5f34cf597 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -25,25 +25,25 @@ farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
 farmWarDeployer.modInstallFail=无法安装 WAR 文件
 farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
 farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，war[{1}]
-farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
+farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署集群
 farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
 farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
 farmWarDeployer.removeLocal=正在删除webapp[{0}]
 farmWarDeployer.removeLocalFail=无法移除WAR文件
-farmWarDeployer.removeStart=群集范围内删除web应用程序[{0}]
-farmWarDeployer.removeTxMsg=从[{0}]发送群集范围的取消部署
+farmWarDeployer.removeStart=集群范围内删除web应用程序[{0}]
+farmWarDeployer.removeTxMsg=从[{0}]发送集群范围的取消部署
 farmWarDeployer.renameFail=将 [{0}] 重命名为 [{1}] 失败
-farmWarDeployer.sendEnd=发送群集war部署路径[{0}]，war[{1}]已完成。
-farmWarDeployer.sendFragment=将群集war片段路径[{0}]，wa

[tomcat] 04/05: Improvements to Korean translations

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit c707f8da2b108ccc13dbbd56f1179c27db8a3539
Author: Mark Thomas 
AuthorDate: Mon Oct 31 20:35:00 2022 +

Improvements to Korean translations
---
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 2 +-
 webapps/docs/changelog.xml  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 3d0f184699..f4a3f69505 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -107,7 +107,7 @@ jsp.error.jspoutput.doctypenamesystem=: 
'doctype-root-element'
 jsp.error.jspoutput.doctypepublicsystem=: 'doctype-public' 
속성이 나타나는 경우에는, 'doctype-system' 속성이 반드시 존재해야 합니다.
 jsp.error.jspoutput.invalidUse=은 표준 문법에서 사용되서는 안됩니다.
 jsp.error.jspoutput.nonemptybody=은 body를 포함해서는 안됩니다.
-jsp.error.jsproot.version.invalid=유효하지 않은 버전: [{0}]. 반드시 다음 중 하나여야 합니다: "1.2", 
"2.0", "2.1", "2.2", "2.3", "3.0", "3.1"
+jsp.error.jsproot.version.invalid=유효하지 않은 버전: [{0}]. 반드시 다음 중 하나여야 합니다: "1.2", 
"2.0", "2.1", "2.2", "2.3", "3.0", "3.1", "4.0"
 jsp.error.jsptext.badcontent='<'가 의 body 내에 존재할 때에는 반드시 
CDATA 내에 포함되어야 합니다.
 jsp.error.lastModified=파일 [{0}]을(를) 위한 최종 변경 시간을 결정할 수 없습니다.
 jsp.error.library.invalid=라이브러리 [{0}]에 의하면, JSP 페이지가 유효하지 않습니다: [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7eb0e74ec2..f52e49ff1f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -170,6 +170,9 @@
 Improvements to Japanese translations. Contributed by Shirayuking.
 (markt)
   
+  
+Improvements to Korean translations. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated (fdb70d5036 -> 3177143f34)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


from fdb70d5036 Remove out-dated text. The "previous version" was 5.5
 new dcd820a180 Update Chinese translations
 new 82d041f416 Improvements to French translations
 new 29ba4541ae Improvements to Japanese translations
 new c707f8da2b Improvements to Korean translations
 new 3177143f34 Improvements to Spanish translations

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../authenticator/LocalStrings_zh_CN.properties|  1 +
 .../catalina/core/LocalStrings_zh_CN.properties|  6 ++---
 .../ha/authenticator/LocalStrings_zh_CN.properties |  2 +-
 .../ha/deploy/LocalStrings_zh_CN.properties| 18 ++---
 .../catalina/ha/session/LocalStrings_ja.properties | 30 +++---
 .../ha/session/LocalStrings_zh_CN.properties   | 12 -
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  | 14 +-
 .../catalina/startup/LocalStrings_zh_CN.properties |  2 +-
 .../catalina/valves/LocalStrings_fr.properties |  6 ++---
 .../coyote/http11/LocalStrings_zh_CN.properties|  1 +
 .../coyote/http2/LocalStrings_zh_CN.properties |  2 ++
 .../jasper/resources/LocalStrings_es.properties|  2 +-
 .../jasper/resources/LocalStrings_fr.properties|  3 ++-
 .../jasper/resources/LocalStrings_ja.properties|  2 +-
 .../jasper/resources/LocalStrings_ko.properties|  2 +-
 .../jasper/resources/LocalStrings_zh_CN.properties |  3 ++-
 .../tomcat/websocket/LocalStrings_fr.properties|  4 +++
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  3 +++
 webapps/docs/changelog.xml | 21 ++-
 19 files changed, 83 insertions(+), 51 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 03/05: Improvements to Japanese translations

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 29ba4541ae55190e06f0c5886b298806e9e97930
Author: Mark Thomas 
AuthorDate: Mon Oct 31 20:32:33 2022 +

Improvements to Japanese translations
---
 .../catalina/ha/session/LocalStrings_ja.properties | 30 +++---
 .../jasper/resources/LocalStrings_ja.properties|  2 +-
 webapps/docs/changelog.xml |  4 +++
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
index abbff28bf4..0a928bc876 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
@@ -20,16 +20,16 @@ backupManager.stopped=マネージャ [{0}] を停止します
 
 clusterSessionListener.noManager=Context Managerが存在しません。
 
-deltaManager.createMessage.access=マネージャ [{0}]: セッション [{1}] へのアクセスメッセージを作成します。
-deltaManager.createMessage.accessChangePrimary=マネージャ [{0}]: セッション [{1}] 
でプライマリノード変更メッセージを作成しました。
+deltaManager.createMessage.access=マネージャ [{0}]: セッション [{1}] へのアクセスメッセージを作成します
+deltaManager.createMessage.accessChangePrimary=マネージャ [{0}]: セッション [{1}] 
でプライマリノード変更メッセージを作成しました
 deltaManager.createMessage.allSessionData=マネージャ [{0}] はすべてのセッションデータを送信しました。
-deltaManager.createMessage.allSessionTransferred=マネージャ [{0}] 
はすべてのセッションデータ転送を送信しました。
+deltaManager.createMessage.allSessionTransferred=マネージャ [{0}] 
はすべてのセッションデータ転送を送信しました
 deltaManager.createMessage.delta=マネージャ [{0}]: セッション [{1}] のデルタリクエストメッセージを作成します
 deltaManager.createMessage.expire=マネージャ [{0}]: セッション [{1}] 
のセッションの期限切れメッセージを作成します
 deltaManager.createMessage.unableCreateDeltaRequest=セッションID 
[{0}]のDeltaRequestシリアライズできません。
 deltaManager.createSession.newSession=DeltaSession (ID は [{0}]) を作成しました。総数は 
[{1}] です。
 deltaManager.dropMessage=マネージャ [{0}]: GET_ALL_SESSIONS同期フェーズの開始日 [{2}] 
メッセージの日付 [{3}] 内のメッセージ [{1}] をドロップします
-deltaManager.expireSessions=シャットダウン時にマネージャ [{0}] はセッションを満了します。
+deltaManager.expireSessions=シャットダウン時にマネージャ [{0}] はセッションを満了します
 deltaManager.foundMasterMember=コンテキスト [{0}] のレプリケーションマスターメンバー [{1}] を発見しました
 deltaManager.loading.cnfe=永続セッションのロード中にClassNotFoundExceptionが発生しました：[{0}]
 deltaManager.loading.existing.session=既存セッション[{0}]のオーバーロード
@@ -40,20 +40,20 @@ deltaManager.noContextManager=マネージャ [{0}]: [{1}] で送信された ''
 deltaManager.noMasterMember=ドメイン [{1}] のコンテキスト [{0}] に他のメンバーがいない状態で開始しています
 deltaManager.noMembers=マネージャ [{0}]: 状態転送をスキップします。 クラスタグループ内でアクティブなメンバーはいません。
 deltaManager.noSessionState=マネージャ [{0}]: [{1}] で送信されたセッション状態はありませんでした。[{2}] 
ミリ秒後にタイムアウトしました。
-deltaManager.receiveMessage.accessed=マネージャ [{0}]: 
セッション[{1}]のセッションアクセスメッセージを受信しました。
-deltaManager.receiveMessage.allSessionDataAfter=マネージャ [{0}]: 
すべてのセッション状態をデシリアライズしました。
-deltaManager.receiveMessage.allSessionDataBegin=マネージャ [{0}]: 
すべてのセッション状態データを受信しました。
-deltaManager.receiveMessage.createNewSession=マネージャ [{0}]: セッション [{1}] 
のセッション作成メッセージを受信しました。
-deltaManager.receiveMessage.delta=マネージャ [{0}]: セッション [{1}] 
のセッションデルタメッセージを受信しました。
-deltaManager.receiveMessage.delta.unknown=マネージャ [{0}]: 未知のセッション [{1}] 
デルタを受信しました。
-deltaManager.receiveMessage.error=マネージャ [{0}]: TCP チャンネルからメッセージを受信できません。
-deltaManager.receiveMessage.eventType=マネージャ [{0}]: [{2}] からセッションメッセージ [{1}] 
を受信しました。
-deltaManager.receiveMessage.expired=マネージャ [{0}]: セッション [{1}] 
のセッションの期限切れメッセージを受信しました。
+deltaManager.receiveMessage.accessed=マネージャ [{0}]: 
セッション[{1}]のセッションアクセスメッセージを受信しました
+deltaManager.receiveMessage.allSessionDataAfter=マネージャ [{0}]: 
すべてのセッション状態をデシリアライズしました
+deltaManager.receiveMessage.allSessionDataBegin=マネージャ [{0}]: 
すべてのセッション状態データを受信しました
+deltaManager.receiveMessage.createNewSession=マネージャ [{0}]: セッション [{1}] 
のセッション作成メッセージを受信しました
+deltaManager.receiveMessage.delta=マネージャ [{0}]: セッション [{1}] 
のセッションデルタメッセージを受信しました
+deltaManager.receiveMessage.delta.unknown=マネージャ [{0}]: 未知のセッション [{1}] 
デルタを受信しました
+deltaManager.receiveMessage.error=マネージャ [{0}]: TCP チャンネルからメッセージを受信できません
+deltaManager.receiveMessage.eventType=マネージャ [{0}]: [{2}] からセッションメッセージ [{1}] 
を受信しました
+deltaManager.receiveMessage.expired=マネージャ [{0}]: セッション [{1}] 
のセッションの期限切れメッセージを受信しました
 deltaManager.receiveMessage.noContextManager=マネージャ [{0}] はノード [{1}: {2}] 
からコンテキストマネージャ無しメッセージを受信しました。
 deltaManager.receiveMessage.transfercomplete=マネージャ [{0}] はノード [{1}: {2}] 
からセッション状態が転送を受信しました。
-deltaManager.receiveMessage.unloadingAfter=マネージャ [{0}]: セッションのアンロードが完了しました。
+deltaManager.receiveMessage.unloadingAfter=マネージャ [{0}]: セッションのアンロードが完了しました
 deltaManager.receiveMessage.unloadingBegin=マネージャ [{0}]: セッションのアンロードを開始します
-deltaManager.registerCluster=マネージャ [{0}] をクラスターの構成要素 [{1}] に名前 [{2}] で登録しました。
+deltaManager.registerCluster=マネージャ [{0}] をクラスターの構成要素 [{1}] に名前 [{2}] で登録しました
 deltaManager.sendMessage.newSession=マネージャ [{0}] が新しいセッションを送信します [{1}]
 deltaManager.sessionReceived=マネージャ [{0}]; [{2}] ミリ秒で受信した [{1}

[tomcat] 05/05: Improvements to Spanish translations

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 3177143f34e1e37234868a3649dac419401a6c85
Author: Mark Thomas 
AuthorDate: Mon Oct 31 20:37:34 2022 +

Improvements to Spanish translations
---
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 webapps/docs/changelog.xml  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 6e038f06f0..1fac658ba9 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -98,7 +98,7 @@ jsp.error.jspoutput.doctypenamesystem=: 
atributos 'doctype-roo
 jsp.error.jspoutput.doctypepublicsystem=: atributo 
'doctype-system' debe de aparecer si aparece atributo 'doctype-public'
 jsp.error.jspoutput.invalidUse= no se debe de usar en 
sintáxis estándar
 jsp.error.jspoutput.nonemptybody= no debe de tener un cuerpo
-jsp.error.jsproot.version.invalid=Número incorrecto de versión: [{0}], debe de 
ser "1.2" o "2.0" o "2.1" o "2.2" o "2.3" o "3.0" o "3.1"
+jsp.error.jsproot.version.invalid=Número incorrecto de versión: [{0}], debe de 
ser "1.2" o "2.0" o "2.1" o "2.2" o "2.3" o "3.0" o "3.1"o "4.0"
 jsp.error.jsptext.badcontent='<', cuando aparece en el cuerpo de 
, debe de estar encapsulado dentro de un CDATA
 jsp.error.lastModified=No puedo determinar la última fecha de modificación 
para el fichero [{0}]
 jsp.error.library.invalid=La página JSP es incorrecta de acuerdo a la 
biblioteca [{0}]: [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f52e49ff1f..39722f37c1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -173,6 +173,9 @@
   
 Improvements to Korean translations. (markt)
   
+  
+Improvements to Spanish translations. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 10.1.x updated: Backport translation improvements

[markt]

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 2b9e11d6fc Backport translation improvements
2b9e11d6fc is described below

commit 2b9e11d6fc13bfc80088bc95a36be9e25397dc8b
Author: Mark Thomas 
AuthorDate: Mon Oct 31 20:45:31 2022 +

Backport translation improvements
---
 .../authenticator/LocalStrings_zh_CN.properties|  1 +
 .../catalina/core/LocalStrings_zh_CN.properties|  6 ++---
 .../ha/authenticator/LocalStrings_zh_CN.properties |  2 +-
 .../ha/deploy/LocalStrings_zh_CN.properties| 18 ++---
 .../catalina/ha/session/LocalStrings_ja.properties | 30 +++---
 .../ha/session/LocalStrings_zh_CN.properties   | 12 -
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  | 14 +-
 .../catalina/startup/LocalStrings_zh_CN.properties |  2 +-
 .../catalina/valves/LocalStrings_fr.properties |  6 ++---
 .../coyote/http11/LocalStrings_zh_CN.properties|  1 +
 .../coyote/http2/LocalStrings_zh_CN.properties |  2 ++
 .../jasper/resources/LocalStrings_fr.properties|  1 +
 .../jasper/resources/LocalStrings_zh_CN.properties |  1 +
 .../tomcat/websocket/LocalStrings_fr.properties|  4 +++
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  3 +++
 webapps/docs/changelog.xml | 12 +
 16 files changed, 70 insertions(+), 45 deletions(-)

diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index 17a8983c1e..1cef284b8d 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -41,6 +41,7 @@ formAuthenticator.forwardLogin=使用请求方法GET将使用方法[{1}]发出
 formAuthenticator.forwardLoginFail=转发到登录页时出现意外错误。
 formAuthenticator.noErrorPage=没有为上下文[{0}]中的表单身份验证定义错误页
 formAuthenticator.noLoginPage=在环境[{0}]中，未为FORM认证定义登录页面
+formAuthenticator.sessionIdMismatch=当前会话ID是[{0}]，但是FORM认证器期望的是[{1}]。
 
 singleSignOn.debug.associate=SSO将应用程序会话[{1}]与SSO会话[{0}]关联
 singleSignOn.debug.associateFail=SSO无法关联应用程序会话[{0}]，因为SSO会话[{1}]不存在。
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 0558b35169..469d3696dd 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -117,8 +117,8 @@ containerBase.child.destroy=销毁子级时出错
 containerBase.child.notUnique=子名称[{0}]不唯一
 containerBase.child.start=启动子级时出错
 containerBase.child.stop=停止子级时出错
-containerBase.cluster.start=启动新群集时出错
-containerBase.cluster.stop=停止旧群集时出错
+containerBase.cluster.start=启动新集群时出错
+containerBase.cluster.stop=停止旧集群时出错
 containerBase.nullName=容器名称不能为null
 containerBase.realm.start=启动新领域时出错
 containerBase.realm.stop=停止旧域时出错
@@ -168,7 +168,7 @@ 
standardContext.backgroundProcess.instanceManager=异常处理实例管理器[{0
 standardContext.backgroundProcess.loader=异常处理加载程序[{0}]后台进程
 standardContext.backgroundProcess.manager=异常处理管理器[{0}]后台进程。
 standardContext.backgroundProcess.resources=异常处理资源[{0}] 后台进程
-standardContext.cluster.managerError=创建新群集会话管理器时出错
+standardContext.cluster.managerError=创建新集群会话管理器时出错
 standardContext.cluster.noManager=未发现管理器。检查是否需要集群管理器。集群配置：[{0}]，应用程序分配：[{1}]
 standardContext.configurationFail=一个或多个组件将上下文标记为未正确配置
 standardContext.cookieProcessor.null=不允许将上下文的CookieProcessor 设置为null
diff --git 
a/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
index 9a0d4b6664..9090f9149d 100644
--- a/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 clusterSingleSignOn.clusterLoad.fail=在集群加载时， 集群单点登录异常
-clusterSingleSignOn.nocluster=没有群集SingleSignon的群集。
+clusterSingleSignOn.nocluster=没有ClusterSingleSignOn的集群。
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index 6a229f8484..c5f34cf597 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -25,25 +25,25 @@ farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
 farmWarDeployer.modInstallFail=无法安装 WAR 文件
 farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
 farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，war[{1}]
-farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
+farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署集群
 farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
 farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
 farmWarDeployer.removeLocal=正在删除webapp[{0}]
 farmWarDeployer.remov

[tomcat] branch 9.0.x updated: Backport improvements to translations

[markt]

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 f8faf5ecd7 Backport improvements to translations
f8faf5ecd7 is described below

commit f8faf5ecd7c1cb039ad018d2b370b1323f6834cc
Author: Mark Thomas 
AuthorDate: Mon Oct 31 20:49:07 2022 +

Backport improvements to translations
---
 .../authenticator/LocalStrings_zh_CN.properties|  1 +
 .../catalina/core/LocalStrings_zh_CN.properties|  6 ++---
 .../ha/authenticator/LocalStrings_zh_CN.properties |  2 +-
 .../ha/deploy/LocalStrings_zh_CN.properties| 18 ++---
 .../catalina/ha/session/LocalStrings_ja.properties | 30 +++---
 .../ha/session/LocalStrings_zh_CN.properties   | 12 -
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  | 14 +-
 .../catalina/startup/LocalStrings_zh_CN.properties |  2 +-
 .../catalina/valves/LocalStrings_fr.properties |  6 ++---
 .../coyote/http2/LocalStrings_zh_CN.properties |  2 ++
 .../jasper/resources/LocalStrings_fr.properties|  1 +
 .../jasper/resources/LocalStrings_zh_CN.properties |  1 +
 .../tomcat/websocket/LocalStrings_fr.properties|  4 +++
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  3 +++
 webapps/docs/changelog.xml | 12 +
 15 files changed, 69 insertions(+), 45 deletions(-)

diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index 17a8983c1e..1cef284b8d 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -41,6 +41,7 @@ formAuthenticator.forwardLogin=使用请求方法GET将使用方法[{1}]发出
 formAuthenticator.forwardLoginFail=转发到登录页时出现意外错误。
 formAuthenticator.noErrorPage=没有为上下文[{0}]中的表单身份验证定义错误页
 formAuthenticator.noLoginPage=在环境[{0}]中，未为FORM认证定义登录页面
+formAuthenticator.sessionIdMismatch=当前会话ID是[{0}]，但是FORM认证器期望的是[{1}]。
 
 singleSignOn.debug.associate=SSO将应用程序会话[{1}]与SSO会话[{0}]关联
 singleSignOn.debug.associateFail=SSO无法关联应用程序会话[{0}]，因为SSO会话[{1}]不存在。
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 39e3ab40a1..c9088aeb9f 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -119,8 +119,8 @@ containerBase.child.destroy=销毁子级时出错
 containerBase.child.notUnique=子名称[{0}]不唯一
 containerBase.child.start=启动子级时出错
 containerBase.child.stop=停止子级时出错
-containerBase.cluster.start=启动新群集时出错
-containerBase.cluster.stop=停止旧群集时出错
+containerBase.cluster.start=启动新集群时出错
+containerBase.cluster.stop=停止旧集群时出错
 containerBase.nullName=容器名称不能为null
 containerBase.realm.start=启动新领域时出错
 containerBase.realm.stop=停止旧域时出错
@@ -174,7 +174,7 @@ 
standardContext.backgroundProcess.instanceManager=异常处理实例管理器[{0
 standardContext.backgroundProcess.loader=异常处理加载程序[{0}]后台进程
 standardContext.backgroundProcess.manager=异常处理管理器[{0}]后台进程。
 standardContext.backgroundProcess.resources=异常处理资源[{0}] 后台进程
-standardContext.cluster.managerError=创建新群集会话管理器时出错
+standardContext.cluster.managerError=创建新集群会话管理器时出错
 standardContext.cluster.noManager=未发现管理器。检查是否需要集群管理器。集群配置：[{0}]，应用程序分配：[{1}]
 standardContext.configurationFail=一个或多个组件将上下文标记为未正确配置
 standardContext.cookieProcessor.null=不允许将上下文的CookieProcessor 设置为null
diff --git 
a/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
index 9a0d4b6664..9090f9149d 100644
--- a/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 clusterSingleSignOn.clusterLoad.fail=在集群加载时， 集群单点登录异常
-clusterSingleSignOn.nocluster=没有群集SingleSignon的群集。
+clusterSingleSignOn.nocluster=没有ClusterSingleSignOn的集群。
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index 6a229f8484..c5f34cf597 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -25,25 +25,25 @@ farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
 farmWarDeployer.modInstallFail=无法安装 WAR 文件
 farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
 farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，war[{1}]
-farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
+farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署集群
 farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
 farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
 farmWarDeployer.removeLocal=正在删除webapp[{0}]
 farmWarDeployer.removeLocalFail=无法移除WAR文件
-farmWarDeployer.removeStart=群集范

[tomcat] branch 8.5.x updated: Backport updates to translations

[markt]

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 1767e1779d Backport updates to translations
1767e1779d is described below

commit 1767e1779d846c43c4d8d39daf4bf0feedebdb14
Author: Mark Thomas 
AuthorDate: Mon Oct 31 20:51:36 2022 +

Backport updates to translations
---
 .../authenticator/LocalStrings_zh_CN.properties|  1 +
 .../catalina/core/LocalStrings_zh_CN.properties|  4 +--
 .../ha/authenticator/LocalStrings_zh_CN.properties |  2 +-
 .../ha/deploy/LocalStrings_zh_CN.properties| 18 ++---
 .../catalina/ha/session/LocalStrings_ja.properties | 30 +++---
 .../ha/session/LocalStrings_zh_CN.properties   | 12 -
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  | 14 +-
 .../catalina/startup/LocalStrings_zh_CN.properties |  2 +-
 .../catalina/valves/LocalStrings_fr.properties |  6 ++---
 .../coyote/http2/LocalStrings_zh_CN.properties |  2 ++
 .../jasper/resources/LocalStrings_fr.properties|  1 +
 .../jasper/resources/LocalStrings_zh_CN.properties |  1 +
 .../tomcat/websocket/LocalStrings_fr.properties|  4 +++
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  3 +++
 webapps/docs/changelog.xml | 12 +
 15 files changed, 68 insertions(+), 44 deletions(-)

diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index 17a8983c1e..1cef284b8d 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -41,6 +41,7 @@ formAuthenticator.forwardLogin=使用请求方法GET将使用方法[{1}]发出
 formAuthenticator.forwardLoginFail=转发到登录页时出现意外错误。
 formAuthenticator.noErrorPage=没有为上下文[{0}]中的表单身份验证定义错误页
 formAuthenticator.noLoginPage=在环境[{0}]中，未为FORM认证定义登录页面
+formAuthenticator.sessionIdMismatch=当前会话ID是[{0}]，但是FORM认证器期望的是[{1}]。
 
 singleSignOn.debug.associate=SSO将应用程序会话[{1}]与SSO会话[{0}]关联
 singleSignOn.debug.associateFail=SSO无法关联应用程序会话[{0}]，因为SSO会话[{1}]不存在。
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 264e1ac271..a944b29567 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -120,8 +120,8 @@ containerBase.child.destroy=销毁子级时出错
 containerBase.child.notUnique=子名称[{0}]不唯一
 containerBase.child.start=启动子级时出错
 containerBase.child.stop=停止子级时出错
-containerBase.cluster.start=启动新群集时出错
-containerBase.cluster.stop=停止旧群集时出错
+containerBase.cluster.start=启动新集群时出错
+containerBase.cluster.stop=停止旧集群时出错
 containerBase.nullName=容器名称不能为null
 containerBase.realm.start=启动新领域时出错
 containerBase.realm.stop=停止旧域时出错
diff --git 
a/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
index 9a0d4b6664..9090f9149d 100644
--- a/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/authenticator/LocalStrings_zh_CN.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 clusterSingleSignOn.clusterLoad.fail=在集群加载时， 集群单点登录异常
-clusterSingleSignOn.nocluster=没有群集SingleSignon的群集。
+clusterSingleSignOn.nocluster=没有ClusterSingleSignOn的集群。
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index 359d52cbe4..9cfb6491bd 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -24,24 +24,24 @@ farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
 farmWarDeployer.modInstallFail=无法安装 WAR 文件
 farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
 farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，war[{1}]
-farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
+farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署集群
 farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
 farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
 farmWarDeployer.removeLocal=正在删除webapp[{0}]
 farmWarDeployer.removeLocalFail=无法移除WAR文件
-farmWarDeployer.removeStart=群集范围内删除web应用程序[{0}]
-farmWarDeployer.removeTxMsg=从[{0}]发送群集范围的取消部署
+farmWarDeployer.removeStart=集群范围内删除web应用程序[{0}]
+farmWarDeployer.removeTxMsg=从[{0}]发送集群范围的取消部署
 farmWarDeployer.renameFail=将 [{0}] 重命名为 [{1}] 失败
-farmWarDeployer.sendEnd=发送群集war部署路径[{0}]，war[{1}]已完成。
-farmWarDeployer.sendFragment=将群集war片段路径[{0}]，war[{1}]发送到[{2}]
+farmWarDeployer.sendEnd=发送集群war部署路径[{0}]，war[{1}]已完成。
+farmWarDeployer.sendFragment=将集群war片段路径[{0}]，war[{1}]发送到[{2}]
 farmWarDeployer.sendStart=发送集群war部署路径[{0}]，war[{1}]已启动
 farmWarDeployer.servicingDeploy=应用程序[{0}]正在服务。再次触摸WAR文件[{1}]！
-farmWarDeployer.serv

[tomcat] branch main updated: Refactor. Simplify 'Map' operations. No functional change.

[lihan]

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 3e62a4f13b Refactor. Simplify 'Map' operations. No functional change.
3e62a4f13b is described below

commit 3e62a4f13bd1fc04b3e6d89988135c5c90fe2c1c
Author: lihan 
AuthorDate: Tue Nov 1 11:42:47 2022 +0800

Refactor. Simplify 'Map' operations. No functional change.
---
 java/org/apache/catalina/authenticator/SavedRequest.java  |  7 +--
 .../apache/catalina/session/PersistentManagerBase.java|  6 +-
 java/org/apache/catalina/startup/ContextConfig.java   | 14 ++
 java/org/apache/catalina/startup/Tomcat.java  |  7 +--
 java/org/apache/coyote/http2/HpackEncoder.java|  6 +-
 java/org/apache/jasper/compiler/Generator.java|  7 ++-
 java/org/apache/jasper/compiler/PageInfo.java |  9 ++---
 java/org/apache/naming/factory/ResourceLinkFactory.java   | 11 +++
 java/org/apache/tomcat/util/buf/StringCache.java  | 15 ++-
 java/org/apache/tomcat/util/digester/RulesBase.java   |  7 +--
 java/org/apache/tomcat/util/modeler/Registry.java | 12 ++--
 .../org/apache/tomcat/websocket/WsWebSocketContainer.java | 13 ++---
 java/org/apache/tomcat/websocket/server/UpgradeUtil.java  | 11 ++-
 test/org/apache/catalina/startup/TesterMapRealm.java  |  7 +--
 test/org/apache/tomcat/unittest/TesterRequest.java|  7 +--
 15 files changed, 24 insertions(+), 115 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/SavedRequest.java 
b/java/org/apache/catalina/authenticator/SavedRequest.java
index faaf8ec9a6..38d1db2716 100644
--- a/java/org/apache/catalina/authenticator/SavedRequest.java
+++ b/java/org/apache/catalina/authenticator/SavedRequest.java
@@ -67,12 +67,7 @@ public final class SavedRequest implements Serializable {
 private final Map> headers = new HashMap<>();
 
 public void addHeader(String name, String value) {
-List values = headers.get(name);
-if (values == null) {
-values = new ArrayList<>();
-headers.put(name, values);
-}
-values.add(value);
+headers.computeIfAbsent(name, k -> new ArrayList<>()).add(value);
 }
 
 public Iterator getHeaderNames() {
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index a7698ee2fa..2c5b01deb9 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -706,11 +706,7 @@ public abstract class PersistentManagerBase extends 
ManagerBase
  * carry on.
  */
 synchronized (this) {
-swapInLock = sessionSwapInLocks.get(id);
-if (swapInLock == null) {
-swapInLock = new Object();
-sessionSwapInLocks.put(id, swapInLock);
-}
+swapInLock = sessionSwapInLocks.computeIfAbsent(id, k -> new 
Object());
 }
 
 Session session = null;
diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index dc3bf7822b..b06c7e4294 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1869,13 +1869,7 @@ public class ContextConfig implements LifecycleListener {
 } else {
 handlesTypesNonAnnotations = true;
 }
-Set scis =
-typeInitializerMap.get(type);
-if (scis == null) {
-scis = new HashSet<>();
-typeInitializerMap.put(type, scis);
-}
-scis.add(sci);
+typeInitializerMap.computeIfAbsent(type, k -> new 
HashSet<>()).add(sci);
 }
 }
 }
@@ -2407,11 +2401,7 @@ public class ContextConfig implements LifecycleListener {
 }
 
 for (ServletContainerInitializer sci : entry.getSciSet()) {
-Set> classes = initializerClassMap.get(sci);
-if (classes == null) {
-classes = new HashSet<>();
-initializerClassMap.put(sci, classes);
-}
+Set> classes = 
initializerClassMap.computeIfAbsent(sci, k -> new HashSet<>());
 classes.add(clazz);
 }
 }
diff --git a/java/org/apache/catalina/startup/Tomcat.java 
b/java/org/apache/catalina/startup/Tomcat.java
index ac18e65aa6..39142b6b06 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -525,12 +525,7 @

[tomcat] branch 10.1.x updated: Refactor. Simplify 'Map' operations. No functional change.

[lihan]

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 e1aa7083ee Refactor. Simplify 'Map' operations. No functional change.
e1aa7083ee is described below

commit e1aa7083ee1639d852d6deefdd74e1a317b4fbb0
Author: lihan 
AuthorDate: Tue Nov 1 11:42:47 2022 +0800

Refactor. Simplify 'Map' operations. No functional change.
---
 java/org/apache/catalina/authenticator/SavedRequest.java  |  7 +--
 .../apache/catalina/session/PersistentManagerBase.java|  6 +-
 java/org/apache/catalina/startup/ContextConfig.java   | 14 ++
 java/org/apache/catalina/startup/Tomcat.java  |  7 +--
 java/org/apache/coyote/http2/HpackEncoder.java|  6 +-
 java/org/apache/jasper/compiler/Generator.java|  7 ++-
 java/org/apache/jasper/compiler/PageInfo.java |  9 ++---
 java/org/apache/naming/factory/ResourceLinkFactory.java   | 11 +++
 java/org/apache/tomcat/util/buf/StringCache.java  | 15 ++-
 java/org/apache/tomcat/util/digester/RulesBase.java   |  7 +--
 java/org/apache/tomcat/util/modeler/Registry.java | 12 ++--
 .../org/apache/tomcat/websocket/WsWebSocketContainer.java | 13 ++---
 java/org/apache/tomcat/websocket/server/UpgradeUtil.java  | 11 ++-
 test/org/apache/catalina/startup/TesterMapRealm.java  |  7 +--
 test/org/apache/tomcat/unittest/TesterRequest.java|  7 +--
 15 files changed, 24 insertions(+), 115 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/SavedRequest.java 
b/java/org/apache/catalina/authenticator/SavedRequest.java
index faaf8ec9a6..38d1db2716 100644
--- a/java/org/apache/catalina/authenticator/SavedRequest.java
+++ b/java/org/apache/catalina/authenticator/SavedRequest.java
@@ -67,12 +67,7 @@ public final class SavedRequest implements Serializable {
 private final Map> headers = new HashMap<>();
 
 public void addHeader(String name, String value) {
-List values = headers.get(name);
-if (values == null) {
-values = new ArrayList<>();
-headers.put(name, values);
-}
-values.add(value);
+headers.computeIfAbsent(name, k -> new ArrayList<>()).add(value);
 }
 
 public Iterator getHeaderNames() {
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index a7698ee2fa..2c5b01deb9 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -706,11 +706,7 @@ public abstract class PersistentManagerBase extends 
ManagerBase
  * carry on.
  */
 synchronized (this) {
-swapInLock = sessionSwapInLocks.get(id);
-if (swapInLock == null) {
-swapInLock = new Object();
-sessionSwapInLocks.put(id, swapInLock);
-}
+swapInLock = sessionSwapInLocks.computeIfAbsent(id, k -> new 
Object());
 }
 
 Session session = null;
diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index dc3bf7822b..b06c7e4294 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1869,13 +1869,7 @@ public class ContextConfig implements LifecycleListener {
 } else {
 handlesTypesNonAnnotations = true;
 }
-Set scis =
-typeInitializerMap.get(type);
-if (scis == null) {
-scis = new HashSet<>();
-typeInitializerMap.put(type, scis);
-}
-scis.add(sci);
+typeInitializerMap.computeIfAbsent(type, k -> new 
HashSet<>()).add(sci);
 }
 }
 }
@@ -2407,11 +2401,7 @@ public class ContextConfig implements LifecycleListener {
 }
 
 for (ServletContainerInitializer sci : entry.getSciSet()) {
-Set> classes = initializerClassMap.get(sci);
-if (classes == null) {
-classes = new HashSet<>();
-initializerClassMap.put(sci, classes);
-}
+Set> classes = 
initializerClassMap.computeIfAbsent(sci, k -> new HashSet<>());
 classes.add(clazz);
 }
 }
diff --git a/java/org/apache/catalina/startup/Tomcat.java 
b/java/org/apache/catalina/startup/Tomcat.java
index ac18e65aa6..39142b6b06 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -525,12 +525

[tomcat] branch 9.0.x updated: Refactor. Simplify 'Map' operations. No functional change.

[lihan]

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 2a89eddb91 Refactor. Simplify 'Map' operations. No functional change.
2a89eddb91 is described below

commit 2a89eddb9101bee602f03851cef8f9314d64fd77
Author: lihan 
AuthorDate: Tue Nov 1 11:42:47 2022 +0800

Refactor. Simplify 'Map' operations. No functional change.
---
 java/org/apache/catalina/authenticator/SavedRequest.java  |  7 +--
 .../apache/catalina/session/PersistentManagerBase.java|  6 +-
 java/org/apache/catalina/startup/ContextConfig.java   | 14 ++
 java/org/apache/catalina/startup/Tomcat.java  |  7 +--
 java/org/apache/coyote/http2/HpackEncoder.java|  6 +-
 java/org/apache/jasper/compiler/Generator.java|  7 ++-
 java/org/apache/jasper/compiler/PageInfo.java |  9 ++---
 java/org/apache/naming/factory/ResourceLinkFactory.java   | 11 +++
 java/org/apache/tomcat/util/buf/StringCache.java  | 15 ++-
 java/org/apache/tomcat/util/digester/RulesBase.java   |  7 +--
 java/org/apache/tomcat/util/modeler/Registry.java | 12 ++--
 .../org/apache/tomcat/websocket/WsWebSocketContainer.java | 13 ++---
 java/org/apache/tomcat/websocket/server/UpgradeUtil.java  | 11 ++-
 test/org/apache/catalina/startup/TesterMapRealm.java  |  7 +--
 test/org/apache/tomcat/unittest/TesterRequest.java|  7 +--
 15 files changed, 24 insertions(+), 115 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/SavedRequest.java 
b/java/org/apache/catalina/authenticator/SavedRequest.java
index c8ea2fadf2..d1ca241ec3 100644
--- a/java/org/apache/catalina/authenticator/SavedRequest.java
+++ b/java/org/apache/catalina/authenticator/SavedRequest.java
@@ -67,12 +67,7 @@ public final class SavedRequest implements Serializable {
 private final Map> headers = new HashMap<>();
 
 public void addHeader(String name, String value) {
-List values = headers.get(name);
-if (values == null) {
-values = new ArrayList<>();
-headers.put(name, values);
-}
-values.add(value);
+headers.computeIfAbsent(name, k -> new ArrayList<>()).add(value);
 }
 
 public Iterator getHeaderNames() {
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index a7698ee2fa..2c5b01deb9 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -706,11 +706,7 @@ public abstract class PersistentManagerBase extends 
ManagerBase
  * carry on.
  */
 synchronized (this) {
-swapInLock = sessionSwapInLocks.get(id);
-if (swapInLock == null) {
-swapInLock = new Object();
-sessionSwapInLocks.put(id, swapInLock);
-}
+swapInLock = sessionSwapInLocks.computeIfAbsent(id, k -> new 
Object());
 }
 
 Session session = null;
diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index 0738148d6e..0b4891b6b0 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1878,13 +1878,7 @@ public class ContextConfig implements LifecycleListener {
 } else {
 handlesTypesNonAnnotations = true;
 }
-Set scis =
-typeInitializerMap.get(type);
-if (scis == null) {
-scis = new HashSet<>();
-typeInitializerMap.put(type, scis);
-}
-scis.add(sci);
+typeInitializerMap.computeIfAbsent(type, k -> new 
HashSet<>()).add(sci);
 }
 }
 }
@@ -2416,11 +2410,7 @@ public class ContextConfig implements LifecycleListener {
 }
 
 for (ServletContainerInitializer sci : entry.getSciSet()) {
-Set> classes = initializerClassMap.get(sci);
-if (classes == null) {
-classes = new HashSet<>();
-initializerClassMap.put(sci, classes);
-}
+Set> classes = 
initializerClassMap.computeIfAbsent(sci, k -> new HashSet<>());
 classes.add(clazz);
 }
 }
diff --git a/java/org/apache/catalina/startup/Tomcat.java 
b/java/org/apache/catalina/startup/Tomcat.java
index 12080d5281..275558c34d 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -526,12 +526,7