[Bug 64872] Inefficient enum resolution in JSPs

[bugzilla]

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

--- Comment #18 from Mark Thomas  ---
ACK re the Enum handling. I'll take another look at options for that. I'm still
leaning towards something like a "StringInterpreter".

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

EE 8 / 9 TCK status

[Jean-Louis MONTEIRO]

Hello community,

I'm working on the TCK in the TomEE project which leverages Tomcat.
I was running the TCK and I realized JSTL/JSP/Servlet/WebSockets aren't
100% green.

I'm questioning my setup. That's why I wanted to ask if you guys spent time
running the TCK against Tomcat. And if yes, is Tomcat 100% compatible?

-- 
Jean-Louis

Re: EE 8 / 9 TCK status

[Romain Manni-Bucau]

Hi JL,

did you check
https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+TCKs out?

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le mar. 17 nov. 2020 à 10:16, Jean-Louis MONTEIRO  a
écrit :

> Hello community,
>
> I'm working on the TCK in the TomEE project which leverages Tomcat.
> I was running the TCK and I realized JSTL/JSP/Servlet/WebSockets aren't
> 100% green.
>
> I'm questioning my setup. That's why I wanted to ask if you guys spent time
> running the TCK against Tomcat. And if yes, is Tomcat 100% compatible?
>
> --
> Jean-Louis
>

Re: EE 8 / 9 TCK status

[Jean-Louis MONTEIRO]

No I did not. Thanks for the pointer. I'll check it out

Le mar. 17 nov. 2020 à 10:18, Romain Manni-Bucau  a
écrit :

> Hi JL,
>
> did you check
> https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+TCKs out?
>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github <
> https://github.com/rmannibucau> |
> LinkedIn  | Book
> <
> https://www.packtpub.com/application-development/java-ee-8-high-performance
> >
>
>
> Le mar. 17 nov. 2020 à 10:16, Jean-Louis MONTEIRO  a
> écrit :
>
> > Hello community,
> >
> > I'm working on the TCK in the TomEE project which leverages Tomcat.
> > I was running the TCK and I realized JSTL/JSP/Servlet/WebSockets aren't
> > 100% green.
> >
> > I'm questioning my setup. That's why I wanted to ask if you guys spent
> time
> > running the TCK against Tomcat. And if yes, is Tomcat 100% compatible?
> >
> > --
> > Jean-Louis
> >
>


-- 
Jean-Louis

[VOTE][RESULT] Release Apache Tomcat 10.0.0-M10

[Mark Thomas]

The following votes were cast:

Binding:
+1: markt. mgrigorov, remm, isapir

No other votes were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

Mark

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

svn commit: r44541 - /dev/tomcat/tomcat-10/v10.0.0-M10/ /release/tomcat/tomcat-10/v10.0.0-M10/

[markt]

Author: markt
Date: Tue Nov 17 14:20:51 2020
New Revision: 44541

Log:
Release Apache Tomact 10.0.0-M10

Added:
release/tomcat/tomcat-10/v10.0.0-M10/
  - copied from r44540, dev/tomcat/tomcat-10/v10.0.0-M10/
Removed:
dev/tomcat/tomcat-10/v10.0.0-M10/


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

[VOTE][RESULT] Release Apache Tomcat 9.0.40

[Mark Thomas]

The following votes were cast:

Binding:
+1: markt, mgrigorov, remm, isapir

No other votes were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

Mark

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

svn commit: r44542 - /dev/tomcat/tomcat-9/v9.0.40/ /release/tomcat/tomcat-9/v9.0.40/

[markt]

Author: markt
Date: Tue Nov 17 14:23:17 2020
New Revision: 44542

Log:
Release Apache Tomact 9.0.40

Added:
release/tomcat/tomcat-9/v9.0.40/
  - copied from r44541, dev/tomcat/tomcat-9/v9.0.40/
Removed:
dev/tomcat/tomcat-9/v9.0.40/


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

Tag Tomcat 7

[Violeta Georgieva]

Hi,

Tomorrow I'm going to prepare Tomcat 7 for a release/vote.
Please reply here if you need more time for additional fixes.

Thanks,
Violeta

[Bug 64872] Inefficient enum resolution in JSPs

[bugzilla]

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

--- Comment #19 from John Engebretson  ---
A StringInterpreter is a good idea.  I've had the nagging feeling that there
are other places where this pattern is useful and I just haven't found them
yet centralizing the logic will make that easier.

Now that I mention other places, etc. - constant numbers?

-- 
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 master updated: Fix typos

[violetagg]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 4741f50  Fix typos
4741f50 is described below

commit 4741f50f5632ebc15d93057ac40886cd37a607ec
Author: Violeta Georgieva [VMware] 
AuthorDate: Tue Nov 17 17:39:16 2020 +0200

Fix typos
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 57754b7..68f74dd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,7 +119,7 @@
   
 Fix processing of URIs with %nn encoded solidus characters when
 encodedSolidusHandling was set to passthrough
-and the encoded solidus was preceeded by other %nn encoded characters.
+and the encoded solidus was preceded by other %nn encoded characters.
 Based on a pull request by willmeck. (markt)
   
   
@@ -175,7 +175,7 @@
   
   
 64849: Correct JPMS metadata for the Jakarta Expression
-Langauge JARs to provide missing ServiceLoader information. (markt)
+Language JARs to provide missing ServiceLoader information. (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 typos

[violetagg]

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

violetagg 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 5c80d1b  Fix typos
5c80d1b is described below

commit 5c80d1b39cc2a2de00b2ff3526b576ab0b67d1b4
Author: Violeta Georgieva [VMware] 
AuthorDate: Tue Nov 17 17:39:16 2020 +0200

Fix typos
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0475fe5..5bb8743 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -115,7 +115,7 @@
   
 Fix processing of URIs with %nn encoded solidus characters when
 encodedSolidusHandling was set to passthrough
-and the encoded solidus was preceeded by other %nn encoded characters.
+and the encoded solidus was preceded by other %nn encoded characters.
 Based on a pull request by willmeck. (markt)
   
   
@@ -171,7 +171,7 @@
   
   
 64849: Correct JPMS metadata for the Jakarta Expression
-Langauge JARs to provide missing ServiceLoader information. (markt)
+Language JARs to provide missing ServiceLoader information. (markt)
   
 
   


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

[tomcat] branch 8.5.x updated: Fix typo

[violetagg]

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

violetagg 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 af1ed8d  Fix typo
af1ed8d is described below

commit af1ed8d83b665f9c0fa5d2a96e41d1ae3b0fa8be
Author: Violeta Georgieva [VMware] 
AuthorDate: Tue Nov 17 17:39:16 2020 +0200

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bbec37a..0ce3113 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -96,7 +96,7 @@
   
 Fix processing of URIs with %nn encoded solidus characters when
 encodedSolidusHandling was set to passthrough
-and the encoded solidus was preceeded by other %nn encoded characters.
+and the encoded solidus was preceded by other %nn encoded characters.
 Based on a pull request by willmeck. (markt)
   
   


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

[tomcat] branch 7.0.x updated: Fix typo

[violetagg]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 1d51a13  Fix typo
1d51a13 is described below

commit 1d51a13382291313d6558ed68d72e1842bc5bda7
Author: Violeta Georgieva [VMware] 
AuthorDate: Tue Nov 17 17:54:16 2020 +0200

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4e6b6f2..f36af42 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -98,7 +98,7 @@
   
 Fix processing of URIs with %nn encoded solidus characters when
 encodedSolidusHandling was set to passthrough
-and the encoded solidus was preceeded by other %nn encoded characters.
+and the encoded solidus was preceded by other %nn encoded characters.
 Based on a pull request by willmeck. (markt)
   
   


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

buildbot success in on tomcat-9-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/546

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 5c80d1b39cc2a2de00b2ff3526b576ab0b67d1b4
Blamelist: Violeta Georgieva [VMware] 

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

[buildbot]

The Buildbot has detected a new failure on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/2545

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] af1ed8d83b665f9c0fa5d2a96e41d1ae3b0fa8be
Blamelist: Violeta Georgieva [VMware] 

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

[Bug 64872] Inefficient enum resolution in JSPs

[bugzilla]

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

--- Comment #20 from Mark Thomas  ---
Most of the String conversion (outside of EL) should be reasonably optimal
already. Enums look to be by far the most likely potential optimisation there
unless folks are using custom PropertyEditors.

The custom ELInterpreter could easily be extended for numerics. char /
Character is the only remaining standard EL conversion. Could easily add that
too. Actually, aligning with the standard type conversion rules in the EL spec
is likely the way to go.

-- 
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 master updated: Refactor the Acceptor to make the stop on wait optional/configurable

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e863f54  Refactor the Acceptor to make the stop on wait 
optional/configurable
e863f54 is described below

commit e863f544f94a4435bcd9d4b98760f99d200c3407
Author: Mark Thomas 
AuthorDate: Tue Nov 17 17:33:51 2020 +

Refactor the Acceptor to make the stop on wait optional/configurable

This is some preparatory work towards a fix for BZ 64080.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
I need to be able to signal the Acceptor to stop without having to wait
for the stop to complete.
---
 java/org/apache/tomcat/util/net/Acceptor.java | 34 +++
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 2927b6f..ff810e9 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -156,14 +156,38 @@ public class Acceptor implements Runnable {
 }
 
 
+/**
+ * Signals the Acceptor to stop, waiting at most 10 seconds for the stop to
+ * complete before returning. If the stop does not complete in that time a
+ * warning will be logged.
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards.
+ * Use {@link #stop(int)} instead.
+ */
+@Deprecated
 public void stop() {
+stop(10);
+}
+
+
+/**
+ * Signals the Acceptor to stop, optionally waiting for that stop process
+ * to complete before returning. If a wait is requested and the stop does
+ * not complete in that time a warning will be logged.
+ *
+ * @param waitSeconds The time to wait in seconds. Use a value less than
+ *zero for no wait.
+ */
+public void stop(int waitSeconds) {
 stopCalled = true;
-try {
-if (!stopLatch.await(10, TimeUnit.SECONDS)) {
-   log.warn(sm.getString("acceptor.stop.fail", getThreadName()));
+if (waitSeconds > 0) {
+try {
+if (!stopLatch.await(waitSeconds, TimeUnit.SECONDS)) {
+   log.warn(sm.getString("acceptor.stop.fail", 
getThreadName()));
+}
+} catch (InterruptedException e) {
+log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
-} catch (InterruptedException e) {
-log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
 }
 


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

[tomcat] branch master updated: Refactor the Acceptor to make the stop on wait optional/configurable

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e863f54  Refactor the Acceptor to make the stop on wait 
optional/configurable
e863f54 is described below

commit e863f544f94a4435bcd9d4b98760f99d200c3407
Author: Mark Thomas 
AuthorDate: Tue Nov 17 17:33:51 2020 +

Refactor the Acceptor to make the stop on wait optional/configurable

This is some preparatory work towards a fix for BZ 64080.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
I need to be able to signal the Acceptor to stop without having to wait
for the stop to complete.
---
 java/org/apache/tomcat/util/net/Acceptor.java | 34 +++
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 2927b6f..ff810e9 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -156,14 +156,38 @@ public class Acceptor implements Runnable {
 }
 
 
+/**
+ * Signals the Acceptor to stop, waiting at most 10 seconds for the stop to
+ * complete before returning. If the stop does not complete in that time a
+ * warning will be logged.
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards.
+ * Use {@link #stop(int)} instead.
+ */
+@Deprecated
 public void stop() {
+stop(10);
+}
+
+
+/**
+ * Signals the Acceptor to stop, optionally waiting for that stop process
+ * to complete before returning. If a wait is requested and the stop does
+ * not complete in that time a warning will be logged.
+ *
+ * @param waitSeconds The time to wait in seconds. Use a value less than
+ *zero for no wait.
+ */
+public void stop(int waitSeconds) {
 stopCalled = true;
-try {
-if (!stopLatch.await(10, TimeUnit.SECONDS)) {
-   log.warn(sm.getString("acceptor.stop.fail", getThreadName()));
+if (waitSeconds > 0) {
+try {
+if (!stopLatch.await(waitSeconds, TimeUnit.SECONDS)) {
+   log.warn(sm.getString("acceptor.stop.fail", 
getThreadName()));
+}
+} catch (InterruptedException e) {
+log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
-} catch (InterruptedException e) {
-log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
 }
 


-
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: Refactor the Acceptor to make the stop on wait optional/configurable

[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 3cbfa18  Refactor the Acceptor to make the stop on wait 
optional/configurable
3cbfa18 is described below

commit 3cbfa18d55122afdefe36590d7f67e4d4b40d5ed
Author: Mark Thomas 
AuthorDate: Tue Nov 17 17:33:51 2020 +

Refactor the Acceptor to make the stop on wait optional/configurable

This is some preparatory work towards a fix for BZ 64080.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
I need to be able to signal the Acceptor to stop without having to wait
for the stop to complete.
---
 java/org/apache/tomcat/util/net/Acceptor.java | 34 +++
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 2927b6f..ff810e9 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -156,14 +156,38 @@ public class Acceptor implements Runnable {
 }
 
 
+/**
+ * Signals the Acceptor to stop, waiting at most 10 seconds for the stop to
+ * complete before returning. If the stop does not complete in that time a
+ * warning will be logged.
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards.
+ * Use {@link #stop(int)} instead.
+ */
+@Deprecated
 public void stop() {
+stop(10);
+}
+
+
+/**
+ * Signals the Acceptor to stop, optionally waiting for that stop process
+ * to complete before returning. If a wait is requested and the stop does
+ * not complete in that time a warning will be logged.
+ *
+ * @param waitSeconds The time to wait in seconds. Use a value less than
+ *zero for no wait.
+ */
+public void stop(int waitSeconds) {
 stopCalled = true;
-try {
-if (!stopLatch.await(10, TimeUnit.SECONDS)) {
-   log.warn(sm.getString("acceptor.stop.fail", getThreadName()));
+if (waitSeconds > 0) {
+try {
+if (!stopLatch.await(waitSeconds, TimeUnit.SECONDS)) {
+   log.warn(sm.getString("acceptor.stop.fail", 
getThreadName()));
+}
+} catch (InterruptedException e) {
+log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
-} catch (InterruptedException e) {
-log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
 }
 


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

[tomcat] branch master updated: Refactor the Acceptor to make the stop on wait optional/configurable

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e863f54  Refactor the Acceptor to make the stop on wait 
optional/configurable
e863f54 is described below

commit e863f544f94a4435bcd9d4b98760f99d200c3407
Author: Mark Thomas 
AuthorDate: Tue Nov 17 17:33:51 2020 +

Refactor the Acceptor to make the stop on wait optional/configurable

This is some preparatory work towards a fix for BZ 64080.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
I need to be able to signal the Acceptor to stop without having to wait
for the stop to complete.
---
 java/org/apache/tomcat/util/net/Acceptor.java | 34 +++
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 2927b6f..ff810e9 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -156,14 +156,38 @@ public class Acceptor implements Runnable {
 }
 
 
+/**
+ * Signals the Acceptor to stop, waiting at most 10 seconds for the stop to
+ * complete before returning. If the stop does not complete in that time a
+ * warning will be logged.
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards.
+ * Use {@link #stop(int)} instead.
+ */
+@Deprecated
 public void stop() {
+stop(10);
+}
+
+
+/**
+ * Signals the Acceptor to stop, optionally waiting for that stop process
+ * to complete before returning. If a wait is requested and the stop does
+ * not complete in that time a warning will be logged.
+ *
+ * @param waitSeconds The time to wait in seconds. Use a value less than
+ *zero for no wait.
+ */
+public void stop(int waitSeconds) {
 stopCalled = true;
-try {
-if (!stopLatch.await(10, TimeUnit.SECONDS)) {
-   log.warn(sm.getString("acceptor.stop.fail", getThreadName()));
+if (waitSeconds > 0) {
+try {
+if (!stopLatch.await(waitSeconds, TimeUnit.SECONDS)) {
+   log.warn(sm.getString("acceptor.stop.fail", 
getThreadName()));
+}
+} catch (InterruptedException e) {
+log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
-} catch (InterruptedException e) {
-log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
 }
 


-
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: Refactor the Acceptor to make the stop on wait optional/configurable

[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 3cbfa18  Refactor the Acceptor to make the stop on wait 
optional/configurable
3cbfa18 is described below

commit 3cbfa18d55122afdefe36590d7f67e4d4b40d5ed
Author: Mark Thomas 
AuthorDate: Tue Nov 17 17:33:51 2020 +

Refactor the Acceptor to make the stop on wait optional/configurable

This is some preparatory work towards a fix for BZ 64080.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
I need to be able to signal the Acceptor to stop without having to wait
for the stop to complete.
---
 java/org/apache/tomcat/util/net/Acceptor.java | 34 +++
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 2927b6f..ff810e9 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -156,14 +156,38 @@ public class Acceptor implements Runnable {
 }
 
 
+/**
+ * Signals the Acceptor to stop, waiting at most 10 seconds for the stop to
+ * complete before returning. If the stop does not complete in that time a
+ * warning will be logged.
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards.
+ * Use {@link #stop(int)} instead.
+ */
+@Deprecated
 public void stop() {
+stop(10);
+}
+
+
+/**
+ * Signals the Acceptor to stop, optionally waiting for that stop process
+ * to complete before returning. If a wait is requested and the stop does
+ * not complete in that time a warning will be logged.
+ *
+ * @param waitSeconds The time to wait in seconds. Use a value less than
+ *zero for no wait.
+ */
+public void stop(int waitSeconds) {
 stopCalled = true;
-try {
-if (!stopLatch.await(10, TimeUnit.SECONDS)) {
-   log.warn(sm.getString("acceptor.stop.fail", getThreadName()));
+if (waitSeconds > 0) {
+try {
+if (!stopLatch.await(waitSeconds, TimeUnit.SECONDS)) {
+   log.warn(sm.getString("acceptor.stop.fail", 
getThreadName()));
+}
+} catch (InterruptedException e) {
+log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
-} catch (InterruptedException e) {
-log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
 }
 


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

[tomcat] branch master updated: Refactor the Acceptor to make the stop on wait optional/configurable

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e863f54  Refactor the Acceptor to make the stop on wait 
optional/configurable
e863f54 is described below

commit e863f544f94a4435bcd9d4b98760f99d200c3407
Author: Mark Thomas 
AuthorDate: Tue Nov 17 17:33:51 2020 +

Refactor the Acceptor to make the stop on wait optional/configurable

This is some preparatory work towards a fix for BZ 64080.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
I need to be able to signal the Acceptor to stop without having to wait
for the stop to complete.
---
 java/org/apache/tomcat/util/net/Acceptor.java | 34 +++
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 2927b6f..ff810e9 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -156,14 +156,38 @@ public class Acceptor implements Runnable {
 }
 
 
+/**
+ * Signals the Acceptor to stop, waiting at most 10 seconds for the stop to
+ * complete before returning. If the stop does not complete in that time a
+ * warning will be logged.
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards.
+ * Use {@link #stop(int)} instead.
+ */
+@Deprecated
 public void stop() {
+stop(10);
+}
+
+
+/**
+ * Signals the Acceptor to stop, optionally waiting for that stop process
+ * to complete before returning. If a wait is requested and the stop does
+ * not complete in that time a warning will be logged.
+ *
+ * @param waitSeconds The time to wait in seconds. Use a value less than
+ *zero for no wait.
+ */
+public void stop(int waitSeconds) {
 stopCalled = true;
-try {
-if (!stopLatch.await(10, TimeUnit.SECONDS)) {
-   log.warn(sm.getString("acceptor.stop.fail", getThreadName()));
+if (waitSeconds > 0) {
+try {
+if (!stopLatch.await(waitSeconds, TimeUnit.SECONDS)) {
+   log.warn(sm.getString("acceptor.stop.fail", 
getThreadName()));
+}
+} catch (InterruptedException e) {
+log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
-} catch (InterruptedException e) {
-log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
 }
 


-
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: Refactor the Acceptor to make the stop on wait optional/configurable

[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 3cbfa18  Refactor the Acceptor to make the stop on wait 
optional/configurable
3cbfa18 is described below

commit 3cbfa18d55122afdefe36590d7f67e4d4b40d5ed
Author: Mark Thomas 
AuthorDate: Tue Nov 17 17:33:51 2020 +

Refactor the Acceptor to make the stop on wait optional/configurable

This is some preparatory work towards a fix for BZ 64080.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
I need to be able to signal the Acceptor to stop without having to wait
for the stop to complete.
---
 java/org/apache/tomcat/util/net/Acceptor.java | 34 +++
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 2927b6f..ff810e9 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -156,14 +156,38 @@ public class Acceptor implements Runnable {
 }
 
 
+/**
+ * Signals the Acceptor to stop, waiting at most 10 seconds for the stop to
+ * complete before returning. If the stop does not complete in that time a
+ * warning will be logged.
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards.
+ * Use {@link #stop(int)} instead.
+ */
+@Deprecated
 public void stop() {
+stop(10);
+}
+
+
+/**
+ * Signals the Acceptor to stop, optionally waiting for that stop process
+ * to complete before returning. If a wait is requested and the stop does
+ * not complete in that time a warning will be logged.
+ *
+ * @param waitSeconds The time to wait in seconds. Use a value less than
+ *zero for no wait.
+ */
+public void stop(int waitSeconds) {
 stopCalled = true;
-try {
-if (!stopLatch.await(10, TimeUnit.SECONDS)) {
-   log.warn(sm.getString("acceptor.stop.fail", getThreadName()));
+if (waitSeconds > 0) {
+try {
+if (!stopLatch.await(waitSeconds, TimeUnit.SECONDS)) {
+   log.warn(sm.getString("acceptor.stop.fail", 
getThreadName()));
+}
+} catch (InterruptedException e) {
+log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
-} catch (InterruptedException e) {
-log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
 }
 


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

[tomcat] branch master updated: Refactor the Acceptor to make the stop on wait optional/configurable

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e863f54  Refactor the Acceptor to make the stop on wait 
optional/configurable
e863f54 is described below

commit e863f544f94a4435bcd9d4b98760f99d200c3407
Author: Mark Thomas 
AuthorDate: Tue Nov 17 17:33:51 2020 +

Refactor the Acceptor to make the stop on wait optional/configurable

This is some preparatory work towards a fix for BZ 64080.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
I need to be able to signal the Acceptor to stop without having to wait
for the stop to complete.
---
 java/org/apache/tomcat/util/net/Acceptor.java | 34 +++
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 2927b6f..ff810e9 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -156,14 +156,38 @@ public class Acceptor implements Runnable {
 }
 
 
+/**
+ * Signals the Acceptor to stop, waiting at most 10 seconds for the stop to
+ * complete before returning. If the stop does not complete in that time a
+ * warning will be logged.
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards.
+ * Use {@link #stop(int)} instead.
+ */
+@Deprecated
 public void stop() {
+stop(10);
+}
+
+
+/**
+ * Signals the Acceptor to stop, optionally waiting for that stop process
+ * to complete before returning. If a wait is requested and the stop does
+ * not complete in that time a warning will be logged.
+ *
+ * @param waitSeconds The time to wait in seconds. Use a value less than
+ *zero for no wait.
+ */
+public void stop(int waitSeconds) {
 stopCalled = true;
-try {
-if (!stopLatch.await(10, TimeUnit.SECONDS)) {
-   log.warn(sm.getString("acceptor.stop.fail", getThreadName()));
+if (waitSeconds > 0) {
+try {
+if (!stopLatch.await(waitSeconds, TimeUnit.SECONDS)) {
+   log.warn(sm.getString("acceptor.stop.fail", 
getThreadName()));
+}
+} catch (InterruptedException e) {
+log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
-} catch (InterruptedException e) {
-log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
 }
 


-
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: Refactor the Acceptor to make the stop on wait optional/configurable

[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 3cbfa18  Refactor the Acceptor to make the stop on wait 
optional/configurable
3cbfa18 is described below

commit 3cbfa18d55122afdefe36590d7f67e4d4b40d5ed
Author: Mark Thomas 
AuthorDate: Tue Nov 17 17:33:51 2020 +

Refactor the Acceptor to make the stop on wait optional/configurable

This is some preparatory work towards a fix for BZ 64080.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
I need to be able to signal the Acceptor to stop without having to wait
for the stop to complete.
---
 java/org/apache/tomcat/util/net/Acceptor.java | 34 +++
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 2927b6f..ff810e9 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -156,14 +156,38 @@ public class Acceptor implements Runnable {
 }
 
 
+/**
+ * Signals the Acceptor to stop, waiting at most 10 seconds for the stop to
+ * complete before returning. If the stop does not complete in that time a
+ * warning will be logged.
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards.
+ * Use {@link #stop(int)} instead.
+ */
+@Deprecated
 public void stop() {
+stop(10);
+}
+
+
+/**
+ * Signals the Acceptor to stop, optionally waiting for that stop process
+ * to complete before returning. If a wait is requested and the stop does
+ * not complete in that time a warning will be logged.
+ *
+ * @param waitSeconds The time to wait in seconds. Use a value less than
+ *zero for no wait.
+ */
+public void stop(int waitSeconds) {
 stopCalled = true;
-try {
-if (!stopLatch.await(10, TimeUnit.SECONDS)) {
-   log.warn(sm.getString("acceptor.stop.fail", getThreadName()));
+if (waitSeconds > 0) {
+try {
+if (!stopLatch.await(waitSeconds, TimeUnit.SECONDS)) {
+   log.warn(sm.getString("acceptor.stop.fail", 
getThreadName()));
+}
+} catch (InterruptedException e) {
+log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
-} catch (InterruptedException e) {
-log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
 }
 


-
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: Refactor the Acceptor to make the stop on wait optional/configurable

[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 3cbfa18  Refactor the Acceptor to make the stop on wait 
optional/configurable
3cbfa18 is described below

commit 3cbfa18d55122afdefe36590d7f67e4d4b40d5ed
Author: Mark Thomas 
AuthorDate: Tue Nov 17 17:33:51 2020 +

Refactor the Acceptor to make the stop on wait optional/configurable

This is some preparatory work towards a fix for BZ 64080.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
I need to be able to signal the Acceptor to stop without having to wait
for the stop to complete.
---
 java/org/apache/tomcat/util/net/Acceptor.java | 34 +++
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Acceptor.java 
b/java/org/apache/tomcat/util/net/Acceptor.java
index 2927b6f..ff810e9 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -156,14 +156,38 @@ public class Acceptor implements Runnable {
 }
 
 
+/**
+ * Signals the Acceptor to stop, waiting at most 10 seconds for the stop to
+ * complete before returning. If the stop does not complete in that time a
+ * warning will be logged.
+ *
+ * @deprecated This method will be removed in Tomcat 10.1.x onwards.
+ * Use {@link #stop(int)} instead.
+ */
+@Deprecated
 public void stop() {
+stop(10);
+}
+
+
+/**
+ * Signals the Acceptor to stop, optionally waiting for that stop process
+ * to complete before returning. If a wait is requested and the stop does
+ * not complete in that time a warning will be logged.
+ *
+ * @param waitSeconds The time to wait in seconds. Use a value less than
+ *zero for no wait.
+ */
+public void stop(int waitSeconds) {
 stopCalled = true;
-try {
-if (!stopLatch.await(10, TimeUnit.SECONDS)) {
-   log.warn(sm.getString("acceptor.stop.fail", getThreadName()));
+if (waitSeconds > 0) {
+try {
+if (!stopLatch.await(waitSeconds, TimeUnit.SECONDS)) {
+   log.warn(sm.getString("acceptor.stop.fail", 
getThreadName()));
+}
+} catch (InterruptedException e) {
+log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
-} catch (InterruptedException e) {
-log.warn(sm.getString("acceptor.stop.interrupted", 
getThreadName()), e);
 }
 }
 


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

[Bug 64080] Graceful shutdown does not occur for connected clients that have not yet submitted their request payload

[bugzilla]

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

--- Comment #13 from Christopher Schultz  ---
FYI there is some movement on this.

https://lists.apache.org/thread.html/r980a8ed033a14b417231f1296e52daf07b15f76d565586520e5446f1%40%3Cdev.tomcat.apache.org%3E

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

Re: [VOTE] Release Apache Tomcat 8.5.60

[Mark Thomas]

The following votes were cast:

Binding:
+1: markt, mgrigorov, remm, isapir

No other votes were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

Mark

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

svn commit: r44553 - /dev/tomcat/tomcat-8/v8.5.60/ /release/tomcat/tomcat-8/v8.5.60/

[markt]

Author: markt
Date: Tue Nov 17 20:33:09 2020
New Revision: 44553

Log:
Release Apache Tomcat 8.5.60

Added:
release/tomcat/tomcat-8/v8.5.60/
  - copied from r44552, dev/tomcat/tomcat-8/v8.5.60/
Removed:
dev/tomcat/tomcat-8/v8.5.60/


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