Re: Tagging next release

2021-07-23 Thread Rémy Maucherat 
On Fri, Jul 23, 2021 at 3:41 PM Mark Thomas  wrote:
>
> Hi all,
>
> Partly due to the couple of regressions that have emerged this month,
> I'd like to aim to get the next set of releases out closer to the start
> of August than the middle.
>
> With that in mind I'll be starting release prep shortly with a view to
> tagging around the middle of next week and starting the release vote
> towards the end of next week.

No problem ! I'm mostly away right now, but I planned ahead and have
the necessary things on hand to do a new build.

Rémy

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

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

buildbot success in on tomcat-10.0.x

2021-07-23 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-10.0.x while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-10.0.x/builds/103

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-10.0-commit' 
triggered this build
Build Source Stamp: [branch 10.0.x] 67967e43cdae9806e2ee046334a040747e08f333
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

buildbot failure in on tomcat-10.0.x

2021-07-23 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-10.0.x while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-10.0.x/builds/102

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-10.0-commit' 
triggered this build
Build Source Stamp: [branch 10.0.x] 2e6856204b09863b954cf5030fd79b7deb293328
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

[tomcat] 02/02: Remove use of string constant for package name

2021-07-23 Thread 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

commit d7f6dbaaea21bc5d7884ca0848a90162657e3bd0
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:19:05 2021 +0100

Remove use of string constant for package name
---
 java/org/apache/catalina/core/ApplicationContext.java   |  2 +-
 .../org/apache/catalina/core/ApplicationDispatcher.java |  2 +-
 .../apache/catalina/core/ApplicationFilterChain.java|  3 +--
 .../apache/catalina/core/ApplicationFilterConfig.java   |  3 +--
 .../catalina/core/ApplicationFilterRegistration.java|  6 ++
 .../catalina/core/ApplicationServletRegistration.java   |  6 ++
 .../catalina/core/ApplicationSessionCookieConfig.java   |  3 +--
 java/org/apache/catalina/core/AprLifecycleListener.java |  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java |  3 +--
 java/org/apache/catalina/core/Constants.java|  4 
 java/org/apache/catalina/core/ContainerBase.java|  6 ++
 .../apache/catalina/core/DefaultInstanceManager.java|  3 +--
 java/org/apache/catalina/core/JniLifecycleListener.java |  2 +-
 .../catalina/core/JreMemoryLeakPreventionListener.java  |  6 ++
 java/org/apache/catalina/core/StandardHostValve.java| 14 +++---
 java/org/apache/catalina/core/StandardPipeline.java |  2 +-
 java/org/apache/catalina/core/StandardServer.java   |  9 +
 java/org/apache/catalina/core/StandardService.java  |  7 +--
 .../apache/catalina/core/StandardThreadExecutor.java|  3 +--
 java/org/apache/catalina/core/StandardWrapperValve.java | 17 ++---
 .../core/ThreadLocalLeakPreventionListener.java |  3 +--
 21 files changed, 36 insertions(+), 74 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 91d7ffe..b3dbbbd 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -180,7 +180,7 @@ public class ApplicationContext implements ServletContext {
 /**
  * The string manager for this package.
  */
-private static final StringManager sm = 
StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationContext.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java 
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 6492993..a60848a 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -273,7 +273,7 @@ final class ApplicationDispatcher implements 
AsyncDispatcher, RequestDispatcher
 /**
  * The StringManager for this package.
  */
-private static final StringManager sm = 
StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationDispatcher.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java 
b/java/org/apache/catalina/core/ApplicationFilterChain.java
index 4b01d67..9342ed0 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -101,8 +101,7 @@ public final class ApplicationFilterChain implements 
FilterChain {
 /**
  * The string manager for our package.
  */
-private static final StringManager sm =
-  StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationFilterChain.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java 
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index c33ec30..b29ca30 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -57,8 +57,7 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 
 private static final long serialVersionUID = 1L;
 
-static final StringManager sm =
-StringManager.getManager(Constants.Package);
+static final StringManager sm = 
StringManager.getManager(ApplicationFilterConfig.class);
 
 private transient Log log = 
LogFactory.getLog(ApplicationFilterConfig.class); // must not be static
 
diff --git a/java/org/apache/catalina/core/ApplicationFilterRegistration.java 
b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
index 8153d62..ef8fe60 100644
--- a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
@@ -32,14 +32,12 @@ import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.descriptor.web.FilterMap;
 import org.apache.tomcat.util.res.StringManager;

[tomcat] 01/02: Look in correct package for i18n strings

2021-07-23 Thread 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

commit 0ffbeee415bd3b722ec7f1bb9813a90365dcb636
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:18:26 2021 +0100

Look in correct package for i18n strings
---
 java/org/apache/catalina/core/NamingContextListener.java | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/core/NamingContextListener.java 
b/java/org/apache/catalina/core/NamingContextListener.java
index 0845193..fe1be3b 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -58,7 +58,6 @@ import org.apache.naming.ResourceLinkRef;
 import org.apache.naming.ResourceRef;
 import org.apache.naming.ServiceRef;
 import org.apache.naming.TransactionRef;
-import org.apache.naming.factory.Constants;
 import org.apache.naming.factory.ResourceLinkFactory;
 import org.apache.tomcat.util.descriptor.web.ContextEjb;
 import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
@@ -85,6 +84,7 @@ public class NamingContextListener
 implements LifecycleListener, ContainerListener, PropertyChangeListener {
 
 private static final Log log = 
LogFactory.getLog(NamingContextListener.class);
+protected static final StringManager sm = 
StringManager.getManager(NamingContextListener.class);
 
 
 // - Instance Variables
@@ -148,13 +148,6 @@ public class NamingContextListener
 private boolean exceptionOnFailedWrite = true;
 
 
-/**
- * The string manager for this package.
- */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
-
-
 // - Properties
 
 /**

-
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 (588043e -> d7f6dba)

2021-07-23 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from 588043e  Move resource files to same package as code for consistency
 new 0ffbeee  Look in correct package for i18n strings
 new d7f6dba  Remove use of string constant for package name

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


Summary of changes:
 java/org/apache/catalina/core/ApplicationContext.java   |  2 +-
 .../org/apache/catalina/core/ApplicationDispatcher.java |  2 +-
 .../apache/catalina/core/ApplicationFilterChain.java|  3 +--
 .../apache/catalina/core/ApplicationFilterConfig.java   |  3 +--
 .../catalina/core/ApplicationFilterRegistration.java|  6 ++
 .../catalina/core/ApplicationServletRegistration.java   |  6 ++
 .../catalina/core/ApplicationSessionCookieConfig.java   |  3 +--
 java/org/apache/catalina/core/AprLifecycleListener.java |  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java |  3 +--
 java/org/apache/catalina/core/Constants.java|  4 
 java/org/apache/catalina/core/ContainerBase.java|  6 ++
 .../apache/catalina/core/DefaultInstanceManager.java|  3 +--
 java/org/apache/catalina/core/JniLifecycleListener.java |  2 +-
 .../catalina/core/JreMemoryLeakPreventionListener.java  |  6 ++
 .../org/apache/catalina/core/NamingContextListener.java |  9 +
 java/org/apache/catalina/core/StandardHostValve.java| 14 +++---
 java/org/apache/catalina/core/StandardPipeline.java |  2 +-
 java/org/apache/catalina/core/StandardServer.java   |  9 +
 java/org/apache/catalina/core/StandardService.java  |  7 +--
 .../apache/catalina/core/StandardThreadExecutor.java|  3 +--
 java/org/apache/catalina/core/StandardWrapperValve.java | 17 ++---
 .../core/ThreadLocalLeakPreventionListener.java |  3 +--
 22 files changed, 37 insertions(+), 82 deletions(-)

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

[tomcat] 02/02: Remove use of string constant for package name

2021-07-23 Thread 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

commit 94b268b3b87a64ad57d9d05bc16ab95625600228
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:19:05 2021 +0100

Remove use of string constant for package name
---
 java/org/apache/catalina/core/ApplicationContext.java   |  2 +-
 .../org/apache/catalina/core/ApplicationDispatcher.java |  2 +-
 .../apache/catalina/core/ApplicationFilterChain.java|  3 +--
 .../apache/catalina/core/ApplicationFilterConfig.java   |  3 +--
 .../catalina/core/ApplicationFilterRegistration.java|  6 ++
 .../catalina/core/ApplicationServletRegistration.java   |  6 ++
 .../catalina/core/ApplicationSessionCookieConfig.java   |  3 +--
 java/org/apache/catalina/core/AprLifecycleListener.java |  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java |  3 +--
 java/org/apache/catalina/core/Constants.java|  4 
 java/org/apache/catalina/core/ContainerBase.java|  6 ++
 .../apache/catalina/core/DefaultInstanceManager.java|  3 +--
 java/org/apache/catalina/core/JniLifecycleListener.java |  2 +-
 .../catalina/core/JreMemoryLeakPreventionListener.java  |  6 ++
 java/org/apache/catalina/core/StandardHostValve.java| 14 +++---
 java/org/apache/catalina/core/StandardPipeline.java |  2 +-
 java/org/apache/catalina/core/StandardServer.java   |  9 +
 java/org/apache/catalina/core/StandardService.java  |  7 +--
 .../apache/catalina/core/StandardThreadExecutor.java|  3 +--
 java/org/apache/catalina/core/StandardWrapperValve.java | 17 ++---
 .../core/ThreadLocalLeakPreventionListener.java |  3 +--
 21 files changed, 36 insertions(+), 74 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 9ec829a..1380913 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -180,7 +180,7 @@ public class ApplicationContext implements ServletContext {
 /**
  * The string manager for this package.
  */
-private static final StringManager sm = 
StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationContext.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java 
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 16647df..47f191f 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -270,7 +270,7 @@ final class ApplicationDispatcher implements 
AsyncDispatcher, RequestDispatcher
 /**
  * The StringManager for this package.
  */
-private static final StringManager sm = 
StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationDispatcher.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java 
b/java/org/apache/catalina/core/ApplicationFilterChain.java
index 9b7d4f5..642f69e 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -101,8 +101,7 @@ public final class ApplicationFilterChain implements 
FilterChain {
 /**
  * The string manager for our package.
  */
-private static final StringManager sm =
-  StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationFilterChain.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java 
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index 86713a9..8ae9852 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -56,8 +56,7 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 
 private static final long serialVersionUID = 1L;
 
-static final StringManager sm =
-StringManager.getManager(Constants.Package);
+static final StringManager sm = 
StringManager.getManager(ApplicationFilterConfig.class);
 
 private transient Log log = 
LogFactory.getLog(ApplicationFilterConfig.class); // must not be static
 
diff --git a/java/org/apache/catalina/core/ApplicationFilterRegistration.java 
b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
index 8153d62..ef8fe60 100644
--- a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
@@ -32,14 +32,12 @@ import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.descriptor.web.FilterMap;
 import org.apache.tomcat.util.res.StringManager;

[tomcat] 01/02: Look in correct package for i18n strings

2021-07-23 Thread 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

commit c9383704f7cdf2796969e80cfc540d15ebab0e73
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:18:26 2021 +0100

Look in correct package for i18n strings
---
 java/org/apache/catalina/core/NamingContextListener.java | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/core/NamingContextListener.java 
b/java/org/apache/catalina/core/NamingContextListener.java
index 122bc7d..0623763 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -58,7 +58,6 @@ import org.apache.naming.ResourceLinkRef;
 import org.apache.naming.ResourceRef;
 import org.apache.naming.ServiceRef;
 import org.apache.naming.TransactionRef;
-import org.apache.naming.factory.Constants;
 import org.apache.naming.factory.ResourceLinkFactory;
 import org.apache.tomcat.util.descriptor.web.ContextEjb;
 import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
@@ -85,6 +84,7 @@ public class NamingContextListener
 implements LifecycleListener, ContainerListener, 
PropertyChangeListener {
 
 private static final Log log = 
LogFactory.getLog(NamingContextListener.class);
+protected static final StringManager sm = 
StringManager.getManager(NamingContextListener.class);
 
 
 // - Instance Variables
@@ -148,13 +148,6 @@ public class NamingContextListener
 private boolean exceptionOnFailedWrite = true;
 
 
-/**
- * The string manager for this package.
- */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
-
-
 // - Properties
 
 /**

-
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 (1f3d06b -> 94b268b)

2021-07-23 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from 1f3d06b  Move resource files to same package as code for consistency
 new c938370  Look in correct package for i18n strings
 new 94b268b  Remove use of string constant for package name

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


Summary of changes:
 java/org/apache/catalina/core/ApplicationContext.java   |  2 +-
 .../org/apache/catalina/core/ApplicationDispatcher.java |  2 +-
 .../apache/catalina/core/ApplicationFilterChain.java|  3 +--
 .../apache/catalina/core/ApplicationFilterConfig.java   |  3 +--
 .../catalina/core/ApplicationFilterRegistration.java|  6 ++
 .../catalina/core/ApplicationServletRegistration.java   |  6 ++
 .../catalina/core/ApplicationSessionCookieConfig.java   |  3 +--
 java/org/apache/catalina/core/AprLifecycleListener.java |  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java |  3 +--
 java/org/apache/catalina/core/Constants.java|  4 
 java/org/apache/catalina/core/ContainerBase.java|  6 ++
 .../apache/catalina/core/DefaultInstanceManager.java|  3 +--
 java/org/apache/catalina/core/JniLifecycleListener.java |  2 +-
 .../catalina/core/JreMemoryLeakPreventionListener.java  |  6 ++
 .../org/apache/catalina/core/NamingContextListener.java |  9 +
 java/org/apache/catalina/core/StandardHostValve.java| 14 +++---
 java/org/apache/catalina/core/StandardPipeline.java |  2 +-
 java/org/apache/catalina/core/StandardServer.java   |  9 +
 java/org/apache/catalina/core/StandardService.java  |  7 +--
 .../apache/catalina/core/StandardThreadExecutor.java|  3 +--
 java/org/apache/catalina/core/StandardWrapperValve.java | 17 ++---
 .../core/ThreadLocalLeakPreventionListener.java |  3 +--
 22 files changed, 37 insertions(+), 82 deletions(-)

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

[tomcat] 01/02: Look in correct package for i18n strings

2021-07-23 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit 93a534a5b96af058efb44177a599e9b84adbb803
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:18:26 2021 +0100

Look in correct package for i18n strings
---
 java/org/apache/catalina/core/NamingContextListener.java | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/core/NamingContextListener.java 
b/java/org/apache/catalina/core/NamingContextListener.java
index ea66312..684041d 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -56,7 +56,6 @@ import org.apache.naming.ResourceLinkRef;
 import org.apache.naming.ResourceRef;
 import org.apache.naming.ServiceRef;
 import org.apache.naming.TransactionRef;
-import org.apache.naming.factory.Constants;
 import org.apache.naming.factory.ResourceLinkFactory;
 import org.apache.tomcat.util.descriptor.web.ContextEjb;
 import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
@@ -82,6 +81,7 @@ import org.apache.tomcat.util.res.StringManager;
 public class NamingContextListener implements LifecycleListener, 
PropertyChangeListener {
 
 private static final Log log = 
LogFactory.getLog(NamingContextListener.class);
+protected static final StringManager sm = 
StringManager.getManager(NamingContextListener.class);
 
 
 // - Instance Variables
@@ -145,13 +145,6 @@ public class NamingContextListener implements 
LifecycleListener, PropertyChangeL
 private boolean exceptionOnFailedWrite = true;
 
 
-/**
- * The string manager for this package.
- */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
-
-
 // - Properties
 
 /**

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

[tomcat] 02/02: Remove use of string constant for package name

2021-07-23 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit 67967e43cdae9806e2ee046334a040747e08f333
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:19:05 2021 +0100

Remove use of string constant for package name
---
 java/org/apache/catalina/core/ApplicationContext.java   |  2 +-
 .../org/apache/catalina/core/ApplicationDispatcher.java |  2 +-
 .../apache/catalina/core/ApplicationFilterChain.java|  3 +--
 .../apache/catalina/core/ApplicationFilterConfig.java   |  3 +--
 .../catalina/core/ApplicationFilterRegistration.java|  6 ++
 .../catalina/core/ApplicationServletRegistration.java   |  6 ++
 .../catalina/core/ApplicationSessionCookieConfig.java   |  3 +--
 java/org/apache/catalina/core/AprLifecycleListener.java |  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java |  3 +--
 java/org/apache/catalina/core/Constants.java|  4 
 java/org/apache/catalina/core/ContainerBase.java|  6 ++
 .../apache/catalina/core/DefaultInstanceManager.java|  3 +--
 java/org/apache/catalina/core/JniLifecycleListener.java |  2 +-
 .../catalina/core/JreMemoryLeakPreventionListener.java  |  6 ++
 java/org/apache/catalina/core/StandardHostValve.java| 14 +++---
 java/org/apache/catalina/core/StandardPipeline.java |  2 +-
 java/org/apache/catalina/core/StandardServer.java   |  9 +
 java/org/apache/catalina/core/StandardService.java  |  7 +--
 .../apache/catalina/core/StandardThreadExecutor.java|  3 +--
 java/org/apache/catalina/core/StandardWrapperValve.java | 17 ++---
 .../core/ThreadLocalLeakPreventionListener.java |  3 +--
 21 files changed, 36 insertions(+), 74 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 3eebb1e..c91f540 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -165,7 +165,7 @@ public class ApplicationContext implements ServletContext {
 /**
  * The string manager for this package.
  */
-private static final StringManager sm = 
StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationContext.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java 
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index a87d8ad..4a4e97c 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -252,7 +252,7 @@ final class ApplicationDispatcher implements 
AsyncDispatcher, RequestDispatcher
 /**
  * The StringManager for this package.
  */
-private static final StringManager sm = 
StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationDispatcher.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java 
b/java/org/apache/catalina/core/ApplicationFilterChain.java
index c323064..9d4265c 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -97,8 +97,7 @@ public final class ApplicationFilterChain implements 
FilterChain {
 /**
  * The string manager for our package.
  */
-private static final StringManager sm =
-  StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationFilterChain.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java 
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index 33ec91d..aede350 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -57,8 +57,7 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 
 private static final long serialVersionUID = 1L;
 
-static final StringManager sm =
-StringManager.getManager(Constants.Package);
+static final StringManager sm = 
StringManager.getManager(ApplicationFilterConfig.class);
 
 private transient Log log = 
LogFactory.getLog(ApplicationFilterConfig.class); // must not be static
 
diff --git a/java/org/apache/catalina/core/ApplicationFilterRegistration.java 
b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
index 62b51cf..844e178 100644
--- a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
@@ -32,14 +32,12 @@ import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.descriptor.web.FilterMap;
 import org.apache.tomcat.util.res.StringManager;

[tomcat] branch 10.0.x updated (f01dbab -> 67967e4)

2021-07-23 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from f01dbab  Move resource files to same package as code for consistency
 new 93a534a  Look in correct package for i18n strings
 new 67967e4  Remove use of string constant for package name

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


Summary of changes:
 java/org/apache/catalina/core/ApplicationContext.java   |  2 +-
 .../org/apache/catalina/core/ApplicationDispatcher.java |  2 +-
 .../apache/catalina/core/ApplicationFilterChain.java|  3 +--
 .../apache/catalina/core/ApplicationFilterConfig.java   |  3 +--
 .../catalina/core/ApplicationFilterRegistration.java|  6 ++
 .../catalina/core/ApplicationServletRegistration.java   |  6 ++
 .../catalina/core/ApplicationSessionCookieConfig.java   |  3 +--
 java/org/apache/catalina/core/AprLifecycleListener.java |  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java |  3 +--
 java/org/apache/catalina/core/Constants.java|  4 
 java/org/apache/catalina/core/ContainerBase.java|  6 ++
 .../apache/catalina/core/DefaultInstanceManager.java|  3 +--
 java/org/apache/catalina/core/JniLifecycleListener.java |  2 +-
 .../catalina/core/JreMemoryLeakPreventionListener.java  |  6 ++
 .../org/apache/catalina/core/NamingContextListener.java |  9 +
 java/org/apache/catalina/core/StandardHostValve.java| 14 +++---
 java/org/apache/catalina/core/StandardPipeline.java |  2 +-
 java/org/apache/catalina/core/StandardServer.java   |  9 +
 java/org/apache/catalina/core/StandardService.java  |  7 +--
 .../apache/catalina/core/StandardThreadExecutor.java|  3 +--
 java/org/apache/catalina/core/StandardWrapperValve.java | 17 ++---
 .../core/ThreadLocalLeakPreventionListener.java |  3 +--
 22 files changed, 37 insertions(+), 82 deletions(-)

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

[tomcat] 03/03: Remove deprecated code

2021-07-23 Thread 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 678c7a0aaa5de05b99ce3cf005fe79504fe683bc
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:19:25 2021 +0100

Remove deprecated code
---
 java/org/apache/catalina/core/Constants.java | 5 -
 1 file changed, 5 deletions(-)

diff --git a/java/org/apache/catalina/core/Constants.java 
b/java/org/apache/catalina/core/Constants.java
index d7161ba..13b8334 100644
--- a/java/org/apache/catalina/core/Constants.java
+++ b/java/org/apache/catalina/core/Constants.java
@@ -18,11 +18,6 @@ package org.apache.catalina.core;
 
 public class Constants {
 
-/**
- * Unused. Will be removed in Apache Tomcat 10.1.x onwards.
- */
-@Deprecated
-public static final String Package = "org.apache.catalina.core";
 public static final int MAJOR_VERSION = 5;
 public static final int MINOR_VERSION = 1;
 

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

[tomcat] 01/03: Look in correct package for i18n strings

2021-07-23 Thread 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 eb6da1a1462ae5185332a62f14a6924ef076cc7d
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:18:26 2021 +0100

Look in correct package for i18n strings
---
 java/org/apache/catalina/core/NamingContextListener.java | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/core/NamingContextListener.java 
b/java/org/apache/catalina/core/NamingContextListener.java
index ea66312..684041d 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -56,7 +56,6 @@ import org.apache.naming.ResourceLinkRef;
 import org.apache.naming.ResourceRef;
 import org.apache.naming.ServiceRef;
 import org.apache.naming.TransactionRef;
-import org.apache.naming.factory.Constants;
 import org.apache.naming.factory.ResourceLinkFactory;
 import org.apache.tomcat.util.descriptor.web.ContextEjb;
 import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
@@ -82,6 +81,7 @@ import org.apache.tomcat.util.res.StringManager;
 public class NamingContextListener implements LifecycleListener, 
PropertyChangeListener {
 
 private static final Log log = 
LogFactory.getLog(NamingContextListener.class);
+protected static final StringManager sm = 
StringManager.getManager(NamingContextListener.class);
 
 
 // - Instance Variables
@@ -145,13 +145,6 @@ public class NamingContextListener implements 
LifecycleListener, PropertyChangeL
 private boolean exceptionOnFailedWrite = true;
 
 
-/**
- * The string manager for this package.
- */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
-
-
 // - Properties
 
 /**

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

[tomcat] 02/03: Remove use of string constant for package name

2021-07-23 Thread 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 756c4b6b9d091038c7618356b3d2fbad8cadcbf3
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:19:05 2021 +0100

Remove use of string constant for package name
---
 java/org/apache/catalina/core/ApplicationContext.java   |  2 +-
 .../org/apache/catalina/core/ApplicationDispatcher.java |  2 +-
 .../apache/catalina/core/ApplicationFilterChain.java|  3 +--
 .../apache/catalina/core/ApplicationFilterConfig.java   |  3 +--
 .../catalina/core/ApplicationFilterRegistration.java|  6 ++
 .../catalina/core/ApplicationServletRegistration.java   |  6 ++
 .../catalina/core/ApplicationSessionCookieConfig.java   |  3 +--
 java/org/apache/catalina/core/AprLifecycleListener.java |  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java |  3 +--
 java/org/apache/catalina/core/Constants.java|  4 
 java/org/apache/catalina/core/ContainerBase.java|  6 ++
 .../apache/catalina/core/DefaultInstanceManager.java|  3 +--
 java/org/apache/catalina/core/JniLifecycleListener.java |  2 +-
 .../catalina/core/JreMemoryLeakPreventionListener.java  |  6 ++
 java/org/apache/catalina/core/StandardHostValve.java| 14 +++---
 java/org/apache/catalina/core/StandardPipeline.java |  2 +-
 java/org/apache/catalina/core/StandardServer.java   |  9 +
 java/org/apache/catalina/core/StandardService.java  |  7 +--
 .../apache/catalina/core/StandardThreadExecutor.java|  3 +--
 java/org/apache/catalina/core/StandardWrapperValve.java | 17 ++---
 .../core/ThreadLocalLeakPreventionListener.java |  3 +--
 21 files changed, 36 insertions(+), 74 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 3eebb1e..c91f540 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -165,7 +165,7 @@ public class ApplicationContext implements ServletContext {
 /**
  * The string manager for this package.
  */
-private static final StringManager sm = 
StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationContext.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java 
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index a87d8ad..4a4e97c 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -252,7 +252,7 @@ final class ApplicationDispatcher implements 
AsyncDispatcher, RequestDispatcher
 /**
  * The StringManager for this package.
  */
-private static final StringManager sm = 
StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationDispatcher.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java 
b/java/org/apache/catalina/core/ApplicationFilterChain.java
index c323064..9d4265c 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -97,8 +97,7 @@ public final class ApplicationFilterChain implements 
FilterChain {
 /**
  * The string manager for our package.
  */
-private static final StringManager sm =
-  StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(ApplicationFilterChain.class);
 
 
 /**
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java 
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index 33ec91d..aede350 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -57,8 +57,7 @@ public final class ApplicationFilterConfig implements 
FilterConfig, Serializable
 
 private static final long serialVersionUID = 1L;
 
-static final StringManager sm =
-StringManager.getManager(Constants.Package);
+static final StringManager sm = 
StringManager.getManager(ApplicationFilterConfig.class);
 
 private transient Log log = 
LogFactory.getLog(ApplicationFilterConfig.class); // must not be static
 
diff --git a/java/org/apache/catalina/core/ApplicationFilterRegistration.java 
b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
index 62b51cf..844e178 100644
--- a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
@@ -32,14 +32,12 @@ import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.descriptor.web.FilterMap;
 import org.apache.tomcat.util.res.StringManager;

[tomcat] branch main updated (c624511 -> 678c7a0)

2021-07-23 Thread 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 c624511  Move resource files to same package as code for consistency
 new eb6da1a  Look in correct package for i18n strings
 new 756c4b6  Remove use of string constant for package name
 new 678c7a0  Remove deprecated code

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


Summary of changes:
 java/org/apache/catalina/core/ApplicationContext.java   |  2 +-
 .../org/apache/catalina/core/ApplicationDispatcher.java |  2 +-
 .../apache/catalina/core/ApplicationFilterChain.java|  3 +--
 .../apache/catalina/core/ApplicationFilterConfig.java   |  3 +--
 .../catalina/core/ApplicationFilterRegistration.java|  6 ++
 .../catalina/core/ApplicationServletRegistration.java   |  6 ++
 .../catalina/core/ApplicationSessionCookieConfig.java   |  3 +--
 java/org/apache/catalina/core/AprLifecycleListener.java |  6 ++
 java/org/apache/catalina/core/AsyncContextImpl.java |  3 +--
 java/org/apache/catalina/core/Constants.java|  1 -
 java/org/apache/catalina/core/ContainerBase.java|  6 ++
 .../apache/catalina/core/DefaultInstanceManager.java|  3 +--
 java/org/apache/catalina/core/JniLifecycleListener.java |  2 +-
 .../catalina/core/JreMemoryLeakPreventionListener.java  |  6 ++
 .../org/apache/catalina/core/NamingContextListener.java |  9 +
 java/org/apache/catalina/core/StandardHostValve.java| 14 +++---
 java/org/apache/catalina/core/StandardPipeline.java |  2 +-
 java/org/apache/catalina/core/StandardServer.java   |  9 +
 java/org/apache/catalina/core/StandardService.java  |  7 +--
 .../apache/catalina/core/StandardThreadExecutor.java|  3 +--
 java/org/apache/catalina/core/StandardWrapperValve.java | 17 ++---
 .../core/ThreadLocalLeakPreventionListener.java |  3 +--
 22 files changed, 33 insertions(+), 83 deletions(-)

-
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: Move resource files to same package as code for consistency

2021-07-23 Thread 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 588043e  Move resource files to same package as code for consistency
588043e is described below

commit 588043e5e5cc15d32a73e81afe6d61d218fe5f48
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:01:36 2021 +0100

Move resource files to same package as code for consistency
---
 java/org/apache/tomcat/util/threads/{res => }/LocalStrings.properties  | 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_es.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_fr.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_ja.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_ko.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_zh_CN.properties | 0
 java/org/apache/tomcat/util/threads/TaskQueue.java | 3 +--
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java| 2 +-
 8 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_es.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_es.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_ko.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_ko.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_ko.properties
diff --git 
a/java/org/apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties
similarity index 100%
rename from 
java/org/apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties
diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 3aad107..3ad5a2a 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -33,8 +33,7 @@ import org.apache.tomcat.util.res.StringManager;
 public class TaskQueue extends LinkedBlockingQueue {
 
 private static final long serialVersionUID = 1L;
-protected static final StringManager sm = StringManager
-.getManager("org.apache.tomcat.util.threads.res");
+protected static final StringManager sm = 
StringManager.getManager(TaskQueue.class);
 private static final int DEFAULT_FORCED_REMAINING_CAPACITY = -1;
 
 private transient volatile ThreadPoolExecutor parent = null;
diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index dab190a..49a10af 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -329,7 +329,7 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class ThreadPoolExecutor extends AbstractExecutorService {
 
-protected static final StringManager sm = 
StringManager.getManager("org.apache.tomcat.util.threads.res");
+protected static final StringManager sm = 
StringManager.getManager(ThreadPoolExecutor.class);
 
 /**
  * The main pool control state, ctl, is an atomic integer packing

-
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: Move resource files to same package as code for consistency

2021-07-23 Thread 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 1f3d06b  Move resource files to same package as code for consistency
1f3d06b is described below

commit 1f3d06be8bf348928dae3953dfe1eb6576973669
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:01:36 2021 +0100

Move resource files to same package as code for consistency
---
 java/org/apache/tomcat/util/threads/{res => }/LocalStrings.properties  | 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_es.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_fr.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_ja.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_ko.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_zh_CN.properties | 0
 java/org/apache/tomcat/util/threads/TaskQueue.java | 3 +--
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java| 2 +-
 8 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_es.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_es.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_ko.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_ko.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_ko.properties
diff --git 
a/java/org/apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties
similarity index 100%
rename from 
java/org/apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties
diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 3aad107..3ad5a2a 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -33,8 +33,7 @@ import org.apache.tomcat.util.res.StringManager;
 public class TaskQueue extends LinkedBlockingQueue {
 
 private static final long serialVersionUID = 1L;
-protected static final StringManager sm = StringManager
-.getManager("org.apache.tomcat.util.threads.res");
+protected static final StringManager sm = 
StringManager.getManager(TaskQueue.class);
 private static final int DEFAULT_FORCED_REMAINING_CAPACITY = -1;
 
 private transient volatile ThreadPoolExecutor parent = null;
diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index dab190a..49a10af 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -329,7 +329,7 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class ThreadPoolExecutor extends AbstractExecutorService {
 
-protected static final StringManager sm = 
StringManager.getManager("org.apache.tomcat.util.threads.res");
+protected static final StringManager sm = 
StringManager.getManager(ThreadPoolExecutor.class);
 
 /**
  * The main pool control state, ctl, is an atomic integer packing

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

[tomcat] branch 10.0.x updated: Move resource files to same package as code for consistency

2021-07-23 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new f01dbab  Move resource files to same package as code for consistency
f01dbab is described below

commit f01dbab5e1cd34fc409bb1ca2923b30d628459ca
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:01:36 2021 +0100

Move resource files to same package as code for consistency
---
 java/org/apache/tomcat/util/threads/{res => }/LocalStrings.properties  | 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_es.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_fr.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_ja.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_ko.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_zh_CN.properties | 0
 java/org/apache/tomcat/util/threads/TaskQueue.java | 3 +--
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java| 2 +-
 8 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_es.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_es.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_ko.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_ko.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_ko.properties
diff --git 
a/java/org/apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties
similarity index 100%
rename from 
java/org/apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties
diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 3aad107..3ad5a2a 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -33,8 +33,7 @@ import org.apache.tomcat.util.res.StringManager;
 public class TaskQueue extends LinkedBlockingQueue {
 
 private static final long serialVersionUID = 1L;
-protected static final StringManager sm = StringManager
-.getManager("org.apache.tomcat.util.threads.res");
+protected static final StringManager sm = 
StringManager.getManager(TaskQueue.class);
 private static final int DEFAULT_FORCED_REMAINING_CAPACITY = -1;
 
 private transient volatile ThreadPoolExecutor parent = null;
diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index dab190a..49a10af 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -329,7 +329,7 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class ThreadPoolExecutor extends AbstractExecutorService {
 
-protected static final StringManager sm = 
StringManager.getManager("org.apache.tomcat.util.threads.res");
+protected static final StringManager sm = 
StringManager.getManager(ThreadPoolExecutor.class);
 
 /**
  * The main pool control state, ctl, is an atomic integer packing

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

[tomcat] branch main updated: Move resource files to same package as code for consistency

2021-07-23 Thread 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 c624511  Move resource files to same package as code for consistency
c624511 is described below

commit c624511cac767661b758769dbb19c4a2da4d7582
Author: Mark Thomas 
AuthorDate: Fri Jul 23 16:01:36 2021 +0100

Move resource files to same package as code for consistency
---
 java/org/apache/tomcat/util/threads/{res => }/LocalStrings.properties  | 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_es.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_fr.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_ja.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_ko.properties| 0
 .../apache/tomcat/util/threads/{res => }/LocalStrings_zh_CN.properties | 0
 java/org/apache/tomcat/util/threads/TaskQueue.java | 3 +--
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java| 2 +-
 8 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_es.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_es.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_ko.properties
similarity index 100%
rename from java/org/apache/tomcat/util/threads/res/LocalStrings_ko.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_ko.properties
diff --git 
a/java/org/apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties
similarity index 100%
rename from 
java/org/apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties
rename to java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties
diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 24c0ad6..0e7cea6 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -33,8 +33,7 @@ import org.apache.tomcat.util.res.StringManager;
 public class TaskQueue extends LinkedBlockingQueue {
 
 private static final long serialVersionUID = 1L;
-protected static final StringManager sm = StringManager
-.getManager("org.apache.tomcat.util.threads.res");
+protected static final StringManager sm = 
StringManager.getManager(TaskQueue.class);
 private static final int DEFAULT_FORCED_REMAINING_CAPACITY = -1;
 
 private transient volatile ThreadPoolExecutor parent = null;
diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index 630b9f0..f17c881 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -329,7 +329,7 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class ThreadPoolExecutor extends AbstractExecutorService {
 
-protected static final StringManager sm = 
StringManager.getManager("org.apache.tomcat.util.threads.res");
+protected static final StringManager sm = 
StringManager.getManager(ThreadPoolExecutor.class);
 
 /**
  * The main pool control state, ctl, is an atomic integer packing

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

[Bug 65460] http2 request hang on request read

2021-07-23 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=65460

--- Comment #15 from dpy1123  ---
c(In reply to Mark Thomas from comment #14)
> Found it. There is a regression in the previous release.
> 
> If using async IO (available and default in 9.x and 10.x) small updates to
> the connection flow control window were dropped. The window slowly reduced
> in size until no more data could be read.
> 
> If not using async IO, small updates to the connection flow control window
> are written but not flushed so at worst, you'll see a small delay.
> 
> Setting overheadWindowUpdateThreshold="0" avoids the issue with or without
> async IO.
> 
> Fixed in:
> - 10.1.x for 10.1.0-M3 onwards
> - 10.0.x for 10.0.9 onwards
> - 9.0.x for 9.0.51 onwards
> - 8.5.x for 8.5.70 onwards

cool~ looking forward to next release.
Thx for helping~

-- 
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

Tagging next release

2021-07-23 Thread Mark Thomas 

Hi all,

Partly due to the couple of regressions that have emerged this month, 
I'd like to aim to get the next set of releases out closer to the start 
of August than the middle.


With that in mind I'll be starting release prep shortly with a view to 
tagging around the middle of next week and starting the release vote 
towards the end of next week.


Mark

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

[Bug 65460] http2 request hang on request read

2021-07-23 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=65460

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #14 from Mark Thomas  ---
Found it. There is a regression in the previous release.

If using async IO (available and default in 9.x and 10.x) small updates to the
connection flow control window were dropped. The window slowly reduced in size
until no more data could be read.

If not using async IO, small updates to the connection flow control window are
written but not flushed so at worst, you'll see a small delay.

Setting overheadWindowUpdateThreshold="0" avoids the issue with or without
async IO.

Fixed in:
- 10.1.x for 10.1.0-M3 onwards
- 10.0.x for 10.0.9 onwards
- 9.0.x for 9.0.51 onwards
- 8.5.x for 8.5.70 onwards

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

[tomcat] branch 8.5.x updated: Fix BZ 65460

2021-07-23 Thread 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 b392b39  Fix BZ 65460
b392b39 is described below

commit b392b3931d98f5d66a981ab9018f3bc1d8bb9f62
Author: Mark Thomas 
AuthorDate: Fri Jul 23 14:28:38 2021 +0100

Fix BZ 65460

https://bz.apache.org/bugzilla/show_bug.cgi?id=65460
Correct a regression introduced in 8.5.69 in the change to reduce the
number of small HTTP/2 window updates sent for streams. A logic error
meant that small window updates for the connection were not flushed.
This meant that the connection flow window may not update quite as
quickly as the ideal.
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 5 -
 webapps/docs/changelog.xml| 7 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index b994e92..4b0eb56 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -826,6 +826,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 frame[3] = FrameType.WINDOW_UPDATE.getIdByte();
 ByteUtil.set31Bits(frame, 9, increment);
 socketWrapper.write(true, frame, 0, frame.length);
+boolean needFlush = true;
 // No need to send update from closed stream
 if (stream instanceof Stream && ((Stream) stream).canWrite()) {
 int streamIncrement = ((Stream) 
stream).getWindowUpdateSizeToWrite(increment);
@@ -840,6 +841,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 try {
 socketWrapper.write(true, frame, 0, frame.length);
 socketWrapper.flush(true);
+needFlush = false;
 } catch (IOException ioe) {
 if (applicationInitiated) {
 handleAppInitiatedIOException(ioe);
@@ -848,7 +850,8 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 }
 }
 }
-} else {
+}
+if (needFlush) {
 socketWrapper.flush(true);
 }
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5bc3d47..98c415c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,13 @@
 request to finish processing rather than the thread pool creating a new
 thread to process the new request. (markt)
   
+  
+65460: Correct a regression introduced in the previous
+release in the change to reduce the number of small HTTP/2 window
+updates sent for streams. A logic error meant that small window updates
+for the connection were not flushed. This meant that the connection 
flow
+window may not update quite as quickly as the ideal. (markt)
+  
 
   
 

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

[tomcat] branch 9.0.x updated: Fix BZ 65460

2021-07-23 Thread 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 5588a2d  Fix BZ 65460
5588a2d is described below

commit 5588a2deb97189cccb29edcaab223f17715cbd73
Author: Mark Thomas 
AuthorDate: Fri Jul 23 14:28:38 2021 +0100

Fix BZ 65460

https://bz.apache.org/bugzilla/show_bug.cgi?id=65460
Correct a regression introduced in 10.1.0-M2, 10.0.8, 9.0.51 and 8.5.69
in the change to reduce the number of small HTTP/2 window updates sent
for streams. A logic error meant that small window updates for the
connection were dropped. This meant that the connection flow window
slowly reduced over time until nothing could be sent.
---
 java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java | 5 -
 java/org/apache/coyote/http2/Http2UpgradeHandler.java  | 5 -
 webapps/docs/changelog.xml | 7 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index a79a7a8..cc85313 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -240,6 +240,7 @@ public class Http2AsyncUpgradeHandler extends 
Http2UpgradeHandler {
 ByteUtil.setThreeBytes(frame, 0,  4);
 frame[3] = FrameType.WINDOW_UPDATE.getIdByte();
 ByteUtil.set31Bits(frame, 9, increment);
+boolean neetToWriteConnectionUpdate = true;
 // No need to send update from closed stream
 if (stream instanceof Stream && ((Stream) stream).canWrite()) {
 int streamIncrement = ((Stream) 
stream).getWindowUpdateSizeToWrite(increment);
@@ -256,8 +257,10 @@ public class Http2AsyncUpgradeHandler extends 
Http2UpgradeHandler {
 socketWrapper.write(BlockingMode.SEMI_BLOCK, 
protocol.getWriteTimeout(),
 TimeUnit.MILLISECONDS, null, 
SocketWrapperBase.COMPLETE_WRITE, errorCompletion,
 ByteBuffer.wrap(frame), ByteBuffer.wrap(frame2));
+neetToWriteConnectionUpdate = false;
 }
-} else {
+}
+if (neetToWriteConnectionUpdate) {
 socketWrapper.write(BlockingMode.SEMI_BLOCK, 
protocol.getWriteTimeout(),
 TimeUnit.MILLISECONDS, null, 
SocketWrapperBase.COMPLETE_WRITE, errorCompletion,
 ByteBuffer.wrap(frame));
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index add82e7..3b2a017 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -823,6 +823,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 frame[3] = FrameType.WINDOW_UPDATE.getIdByte();
 ByteUtil.set31Bits(frame, 9, increment);
 socketWrapper.write(true, frame, 0, frame.length);
+boolean needFlush = true;
 // No need to send update from closed stream
 if (stream instanceof Stream && ((Stream) stream).canWrite()) {
 int streamIncrement = ((Stream) 
stream).getWindowUpdateSizeToWrite(increment);
@@ -837,6 +838,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 try {
 socketWrapper.write(true, frame, 0, frame.length);
 socketWrapper.flush(true);
+needFlush = false;
 } catch (IOException ioe) {
 if (applicationInitiated) {
 handleAppInitiatedIOException(ioe);
@@ -845,7 +847,8 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 }
 }
 }
-} else {
+}
+if (needFlush) {
 socketWrapper.flush(true);
 }
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0bbed3b..096eaf6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -152,6 +152,13 @@
 request to finish processing rather than the thread pool creating a new
 thread to process the new request. (markt)
   
+  
+65460: Correct a regression introduced in the previous
+release in the change to reduce the number of small HTTP/2 window
+updates sent for streams. A logic error meant that small window updates
+for the connection were dropped. This meant that the connection flow
+window slowly reduced over time until nothing could be sent. (markt)
+

[tomcat] branch 10.0.x updated: Fix BZ 65460

2021-07-23 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 2e68562  Fix BZ 65460
2e68562 is described below

commit 2e6856204b09863b954cf5030fd79b7deb293328
Author: Mark Thomas 
AuthorDate: Fri Jul 23 14:28:38 2021 +0100

Fix BZ 65460

https://bz.apache.org/bugzilla/show_bug.cgi?id=65460
Correct a regression introduced in 10.1.0-M2, 10.0.8, 9.0.51 and 8.5.69
in the change to reduce the number of small HTTP/2 window updates sent
for streams. A logic error meant that small window updates for the
connection were dropped. This meant that the connection flow window
slowly reduced over time until nothing could be sent.
---
 java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java | 5 -
 java/org/apache/coyote/http2/Http2UpgradeHandler.java  | 5 -
 webapps/docs/changelog.xml | 7 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 2ff351a..5d11879 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -240,6 +240,7 @@ public class Http2AsyncUpgradeHandler extends 
Http2UpgradeHandler {
 ByteUtil.setThreeBytes(frame, 0,  4);
 frame[3] = FrameType.WINDOW_UPDATE.getIdByte();
 ByteUtil.set31Bits(frame, 9, increment);
+boolean neetToWriteConnectionUpdate = true;
 // No need to send update from closed stream
 if (stream instanceof Stream && ((Stream) stream).canWrite()) {
 int streamIncrement = ((Stream) 
stream).getWindowUpdateSizeToWrite(increment);
@@ -256,8 +257,10 @@ public class Http2AsyncUpgradeHandler extends 
Http2UpgradeHandler {
 socketWrapper.write(BlockingMode.SEMI_BLOCK, 
protocol.getWriteTimeout(),
 TimeUnit.MILLISECONDS, null, 
SocketWrapperBase.COMPLETE_WRITE, errorCompletion,
 ByteBuffer.wrap(frame), ByteBuffer.wrap(frame2));
+neetToWriteConnectionUpdate = false;
 }
-} else {
+}
+if (neetToWriteConnectionUpdate) {
 socketWrapper.write(BlockingMode.SEMI_BLOCK, 
protocol.getWriteTimeout(),
 TimeUnit.MILLISECONDS, null, 
SocketWrapperBase.COMPLETE_WRITE, errorCompletion,
 ByteBuffer.wrap(frame));
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 807980a..f28ae6d 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -823,6 +823,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 frame[3] = FrameType.WINDOW_UPDATE.getIdByte();
 ByteUtil.set31Bits(frame, 9, increment);
 socketWrapper.write(true, frame, 0, frame.length);
+boolean needFlush = true;
 // No need to send update from closed stream
 if (stream instanceof Stream && ((Stream) stream).canWrite()) {
 int streamIncrement = ((Stream) 
stream).getWindowUpdateSizeToWrite(increment);
@@ -837,6 +838,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 try {
 socketWrapper.write(true, frame, 0, frame.length);
 socketWrapper.flush(true);
+needFlush = false;
 } catch (IOException ioe) {
 if (applicationInitiated) {
 handleAppInitiatedIOException(ioe);
@@ -845,7 +847,8 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 }
 }
 }
-} else {
+}
+if (needFlush) {
 socketWrapper.flush(true);
 }
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 76973f5..3abc164 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -152,6 +152,13 @@
 request to finish processing rather than the thread pool creating a new
 thread to process the new request. (markt)
   
+  
+65460: Correct a regression introduced in the previous
+release in the change to reduce the number of small HTTP/2 window
+updates sent for streams. A logic error meant that small window updates
+for the connection were dropped. This meant that the connection flow
+window slowly reduced over time until nothing could be sent. (markt)
+

[tomcat] branch main updated: Fix BZ 65460

2021-07-23 Thread 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 24e39c9  Fix BZ 65460
24e39c9 is described below

commit 24e39c9ef650cfd36dd5ad5795b2617d3d0de928
Author: Mark Thomas 
AuthorDate: Fri Jul 23 14:28:38 2021 +0100

Fix BZ 65460

https://bz.apache.org/bugzilla/show_bug.cgi?id=65460
Correct a regression introduced in 10.1.0-M2, 10.0.8, 9.0.51 and 8.5.69
in the change to reduce the number of small HTTP/2 window updates sent
for streams. A logic error meant that small window updates for the
connection were dropped. This meant that the connection flow window
slowly reduced over time until nothing could be sent.
---
 java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java | 5 -
 java/org/apache/coyote/http2/Http2UpgradeHandler.java  | 5 -
 webapps/docs/changelog.xml | 7 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 2ff351a..5d11879 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -240,6 +240,7 @@ public class Http2AsyncUpgradeHandler extends 
Http2UpgradeHandler {
 ByteUtil.setThreeBytes(frame, 0,  4);
 frame[3] = FrameType.WINDOW_UPDATE.getIdByte();
 ByteUtil.set31Bits(frame, 9, increment);
+boolean neetToWriteConnectionUpdate = true;
 // No need to send update from closed stream
 if (stream instanceof Stream && ((Stream) stream).canWrite()) {
 int streamIncrement = ((Stream) 
stream).getWindowUpdateSizeToWrite(increment);
@@ -256,8 +257,10 @@ public class Http2AsyncUpgradeHandler extends 
Http2UpgradeHandler {
 socketWrapper.write(BlockingMode.SEMI_BLOCK, 
protocol.getWriteTimeout(),
 TimeUnit.MILLISECONDS, null, 
SocketWrapperBase.COMPLETE_WRITE, errorCompletion,
 ByteBuffer.wrap(frame), ByteBuffer.wrap(frame2));
+neetToWriteConnectionUpdate = false;
 }
-} else {
+}
+if (neetToWriteConnectionUpdate) {
 socketWrapper.write(BlockingMode.SEMI_BLOCK, 
protocol.getWriteTimeout(),
 TimeUnit.MILLISECONDS, null, 
SocketWrapperBase.COMPLETE_WRITE, errorCompletion,
 ByteBuffer.wrap(frame));
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 807980a..f28ae6d 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -823,6 +823,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 frame[3] = FrameType.WINDOW_UPDATE.getIdByte();
 ByteUtil.set31Bits(frame, 9, increment);
 socketWrapper.write(true, frame, 0, frame.length);
+boolean needFlush = true;
 // No need to send update from closed stream
 if (stream instanceof Stream && ((Stream) stream).canWrite()) {
 int streamIncrement = ((Stream) 
stream).getWindowUpdateSizeToWrite(increment);
@@ -837,6 +838,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 try {
 socketWrapper.write(true, frame, 0, frame.length);
 socketWrapper.flush(true);
+needFlush = false;
 } catch (IOException ioe) {
 if (applicationInitiated) {
 handleAppInitiatedIOException(ioe);
@@ -845,7 +847,8 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 }
 }
 }
-} else {
+}
+if (needFlush) {
 socketWrapper.flush(true);
 }
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cafd371..33226e5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -152,6 +152,13 @@
 request to finish processing rather than the thread pool creating a new
 thread to process the new request. (markt)
   
+  
+65460: Correct a regression introduced in the previous
+release in the change to reduce the number of small HTTP/2 window
+updates sent for streams. A logic error meant that small window updates
+for the connection were dropped. This meant that the connection flow
+window slowly reduced over time until nothing could be sent. (markt)
+

[Bug 65460] http2 request hang on request read

2021-07-23 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=65460

Mark Thomas  changed:

   What|Removed |Added

Summary|http2 request hang with |http2 request hang on
   |tomcat 9.0.50's overhead|request read
   |protection  |

--- Comment #13 from Mark Thomas  ---
I'm as sure as I can be this isn't overhead protection related.

The HTTP/2 streams are blocked, waiting to receive data. If the overhead
protection had been triggered, these streams would have been closed. The
exceptions in the logs are also consistent with request reads timing out.

What isn't yet clear is the root cause. Possibilities are:
1. The client isn't sending data. Unlikely given the issue started after the
move from 9.0.45 to 9.0.50.
2. The data is being received but the stream isn't being notified. Unlikely as
there have been no changes in this specific area.
3. Window updates are not being sent correctly. Seems the most likely candidate
at this point as there are changes for this in 9.0.49.

I was about to suggest a couple of things to try to collect more data. As part
of that I was checking exactly what debug logging is provided for Window
updates and I managed to recreate the issue.

I'm investigating now but setting overheadWindowUpdateThreshold="0" seems to
work around the issue.

-- 
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