[Bug 65223] aaa

[bugzilla]

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

andy  changed:

   What|Removed |Added

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

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

[Bug 65223] aaa

[bugzilla]

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

andy  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from andy  ---
ppp

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

[Bug 65223] New: aaa

[bugzilla]

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

Bug ID: 65223
   Summary: aaa
   Product: Tomcat Native
   Version: 1.2.26
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: cdsv...@gmail.com
  Target Milestone: ---

dc

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

[GitHub] [tomcat] efge commented on pull request #406: Improve the SSLValve so it is able to handle the ssl_client_escaped_cert header from Nginx

[GitBox]

efge commented on pull request #406:
URL: https://github.com/apache/tomcat/pull/406#issuecomment-815291840


   (force-pushed to rebase and update correct section of changelog.xml after 
latest release)


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] branch master updated: Fix updated ARM64 JDK location

[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 530c990  Fix updated ARM64 JDK location
530c990 is described below

commit 530c990fd1343c36d9e37c8746424ee016337af9
Author: Mark Thomas 
AuthorDate: Wed Apr 7 19:31:01 2021 +0100

Fix updated ARM64 JDK location
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5f8acaf..8556c36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ install:
 - ARCH=`uname -p`
 - echo $ARCH
 - 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz";
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u282b08.tar.gz";
+- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz";
 - 
JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz";
 - 
JDK_ppc64le="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz";
 - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test 
"$ARCH" = "ppc64le"; then JDK_URL=$JDK_ppc64le; elif test "$ARCH" = "s390x"; 
then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi

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

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

[tomcat] branch master updated: Update Java versions used by Travis

[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 09b5dcd  Update Java versions used by Travis
09b5dcd is described below

commit 09b5dcd59223d714aef205328ebb722fa1e054f3
Author: Mark Thomas 
AuthorDate: Wed Apr 7 17:39:57 2021 +0100

Update Java versions used by Travis
---
 .travis.yml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 159cf52..5f8acaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,10 +40,10 @@ addons:
 install:
 - ARCH=`uname -p`
 - echo $ARCH
-- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz";
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz";
-- 
JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz";
-- 
JDK_ppc64le="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz";
+- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz";
+- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u282b08.tar.gz";
+- 
JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz";
+- 
JDK_ppc64le="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz";
 - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test 
"$ARCH" = "ppc64le"; then JDK_URL=$JDK_ppc64le; elif test "$ARCH" = "s390x"; 
then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
 - if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi

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

buildbot failure in on tomcat-9-trunk

[buildbot]

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

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] 81b03a0720b9495de826d940a67f0d99f1c1e742
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] branch master updated: Update Java versions used by GitHub CI

[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 d42777a  Update Java versions used by GitHub CI
d42777a is described below

commit d42777a3c6fda15f0d5fb6c47528e37e21c254e4
Author: Mark Thomas 
AuthorDate: Wed Apr 7 17:25:19 2021 +0100

Update Java versions used by GitHub CI
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a9f217a..e9c246e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
 strategy:
   fail-fast: false
   matrix:
-java: [ 8, 11, 14, 15-ea ]
+java: [ 8, 11, 16, 17-ea ]
 os: [ ubuntu-latest ]
 include:
 - os: windows-latest
@@ -46,4 +46,4 @@ jobs:
   run: |
 ant -noinput echoproperties deploy embed test-nio test-status
   env:
-ANT_OPTS: -Dtest.openssl.exists=false -Dtest.excludePerformance=true 
-Dtest.exclude=**/TestHttp2Limits.java,org/apache/catalina/connector/TestRequest.java,org/apache/coyote/http11/filters/TestChunkedInputFilter.java,org/apache/catalina/startup/TestTomcat.java,org/apache/coyote/http2/TestHttp2Timeouts.java,org/apache/catalina/core/TestAsyncContextStateChanges.java,org/apache/catalina/valves/TestStuckThreadDetectionValve.java,org/apache/coyote/http11/TestHttp11Processor.java,org/ap
 [...]
\ No newline at end of file
+ANT_OPTS: -Dtest.openssl.exists=false -Dtest.excludePerformance=true 
-Dtest.exclude=**/TestHttp2Limits.java,org/apache/catalina/connector/TestRequest.java,org/apache/coyote/http11/filters/TestChunkedInputFilter.java,org/apache/catalina/startup/TestTomcat.java,org/apache/coyote/http2/TestHttp2Timeouts.java,org/apache/catalina/core/TestAsyncContextStateChanges.java,org/apache/catalina/valves/TestStuckThreadDetectionValve.java,org/apache/coyote/http11/TestHttp11Processor.java,org/ap
 [...]

-
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: Switch test to use localhost as possible fix for CI instability

[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 63a9470  Switch test to use localhost as possible fix for CI 
instability
63a9470 is described below

commit 63a947041c9ae5a620a15a396c044ace908d4f87
Author: Mark Thomas 
AuthorDate: Wed Apr 7 17:17:38 2021 +0100

Switch test to use localhost as possible fix for CI instability
---
 .../org/apache/catalina/session/TestStandardSessionIntegration.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/test/org/apache/catalina/session/TestStandardSessionIntegration.java 
b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
index 553cc48..a69c993 100644
--- a/test/org/apache/catalina/session/TestStandardSessionIntegration.java
+++ b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
@@ -32,6 +32,8 @@ import org.apache.catalina.Context;
 import org.apache.catalina.ha.tcp.SimpleTcpCluster;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.tribes.group.GroupChannel;
+import org.apache.catalina.tribes.transport.ReceiverBase;
 import org.apache.tomcat.util.buf.ByteChunk;
 
 public class TestStandardSessionIntegration extends TomcatBaseTest {
@@ -60,7 +62,9 @@ public class TestStandardSessionIntegration extends 
TomcatBaseTest {
 ctx.addServletMappingDecoded("/bug56578", "bug56578");
 
 if (useClustering) {
-tomcat.getEngine().setCluster(new SimpleTcpCluster());
+SimpleTcpCluster cluster = new SimpleTcpCluster();
+((ReceiverBase) ((GroupChannel) 
cluster.getChannel()).getChannelReceiver()).setHost("localhost");
+tomcat.getEngine().setCluster(cluster);
 ctx.setDistributable(true);
 ctx.setManager(ctx.getCluster().createManager(""));
 }

-
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: Switch test to use localhost as possible fix for CI instability

[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 af4562d  Switch test to use localhost as possible fix for CI 
instability
af4562d is described below

commit af4562d1362cfd2ed822e766f9b7121caa682f6e
Author: Mark Thomas 
AuthorDate: Wed Apr 7 17:17:38 2021 +0100

Switch test to use localhost as possible fix for CI instability
---
 .../org/apache/catalina/session/TestStandardSessionIntegration.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/test/org/apache/catalina/session/TestStandardSessionIntegration.java 
b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
index 553cc48..a69c993 100644
--- a/test/org/apache/catalina/session/TestStandardSessionIntegration.java
+++ b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
@@ -32,6 +32,8 @@ import org.apache.catalina.Context;
 import org.apache.catalina.ha.tcp.SimpleTcpCluster;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.tribes.group.GroupChannel;
+import org.apache.catalina.tribes.transport.ReceiverBase;
 import org.apache.tomcat.util.buf.ByteChunk;
 
 public class TestStandardSessionIntegration extends TomcatBaseTest {
@@ -60,7 +62,9 @@ public class TestStandardSessionIntegration extends 
TomcatBaseTest {
 ctx.addServletMappingDecoded("/bug56578", "bug56578");
 
 if (useClustering) {
-tomcat.getEngine().setCluster(new SimpleTcpCluster());
+SimpleTcpCluster cluster = new SimpleTcpCluster();
+((ReceiverBase) ((GroupChannel) 
cluster.getChannel()).getChannelReceiver()).setHost("localhost");
+tomcat.getEngine().setCluster(cluster);
 ctx.setDistributable(true);
 ctx.setManager(ctx.getCluster().createManager(""));
 }

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

[tomcat] branch master updated: Switch test to use localhost as possible fix for CI instability

[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 9242148  Switch test to use localhost as possible fix for CI 
instability
9242148 is described below

commit 9242148372d6059cfacc2f4ffa81c886c3ed095e
Author: Mark Thomas 
AuthorDate: Wed Apr 7 17:17:38 2021 +0100

Switch test to use localhost as possible fix for CI instability
---
 .../org/apache/catalina/session/TestStandardSessionIntegration.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/test/org/apache/catalina/session/TestStandardSessionIntegration.java 
b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
index a4c8eec..81d5f56 100644
--- a/test/org/apache/catalina/session/TestStandardSessionIntegration.java
+++ b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
@@ -32,6 +32,8 @@ import org.apache.catalina.Context;
 import org.apache.catalina.ha.tcp.SimpleTcpCluster;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.tribes.group.GroupChannel;
+import org.apache.catalina.tribes.transport.ReceiverBase;
 import org.apache.tomcat.util.buf.ByteChunk;
 
 public class TestStandardSessionIntegration extends TomcatBaseTest {
@@ -60,7 +62,9 @@ public class TestStandardSessionIntegration extends 
TomcatBaseTest {
 ctx.addServletMappingDecoded("/bug56578", "bug56578");
 
 if (useClustering) {
-tomcat.getEngine().setCluster(new SimpleTcpCluster());
+SimpleTcpCluster cluster = new SimpleTcpCluster();
+((ReceiverBase) ((GroupChannel) 
cluster.getChannel()).getChannelReceiver()).setHost("localhost");
+tomcat.getEngine().setCluster(cluster);
 ctx.setDistributable(true);
 ctx.setManager(ctx.getCluster().createManager(""));
 }

-
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: Avoid NPEs

[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 5c46969  Avoid NPEs
5c46969 is described below

commit 5c46969e35d9214218a7942de30a939711b037eb
Author: Mark Thomas 
AuthorDate: Wed Apr 7 16:06:18 2021 +0100

Avoid NPEs
---
 java/org/apache/coyote/http2/Stream.java | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index f3bfee8..f4e2b0f 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1090,8 +1090,19 @@ class Stream extends AbstractNonZeroStream implements 
HeaderEmitter {
 
 int written = -1;
 
+// It is still possible that the stream has been closed and 
inBuffer
+// set to null between the call to ensureBuffersExist() above and
+// the sync below. The checks just before and just inside the sync
+// ensure we don't get any NPEs reported.
+ByteBuffer tmpInBuffer = inBuffer;
+if (tmpInBuffer == null) {
+return -1;
+}
 // Ensure that only one thread accesses inBuffer at a time
-synchronized (inBuffer) {
+synchronized (tmpInBuffer) {
+if (inBuffer == null) {
+return -1;
+}
 boolean canRead = false;
 while (inBuffer.position() == 0 && (canRead = isActive() && 
!isInputFinished())) {
 // Need to block until some data is written

-
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 (8d66870 -> 81b03a0)

[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 8d66870  Allow APR connector use with the default HTTP/1.1 protocol
 add 81b03a0  Avoid NPEs

No new revisions were added by this update.

Summary of changes:
 java/org/apache/coyote/http2/Stream.java | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

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

[tomcat] branch master updated: Avoid NPEs

[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 642badb  Avoid NPEs
642badb is described below

commit 642badb1d7a684d3707c594bb37344aa30d907fc
Author: Mark Thomas 
AuthorDate: Wed Apr 7 16:06:18 2021 +0100

Avoid NPEs
---
 java/org/apache/coyote/http2/Stream.java | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index efb2cca..00d2f97 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1028,8 +1028,19 @@ class Stream extends AbstractNonZeroStream implements 
HeaderEmitter {
 
 int written = -1;
 
+// It is still possible that the stream has been closed and 
inBuffer
+// set to null between the call to ensureBuffersExist() above and
+// the sync below. The checks just before and just inside the sync
+// ensure we don't get any NPEs reported.
+ByteBuffer tmpInBuffer = inBuffer;
+if (tmpInBuffer == null) {
+return -1;
+}
 // Ensure that only one thread accesses inBuffer at a time
-synchronized (inBuffer) {
+synchronized (tmpInBuffer) {
+if (inBuffer == null) {
+return -1;
+}
 boolean canRead = false;
 while (inBuffer.position() == 0 && (canRead = isActive() && 
!isInputFinished())) {
 // Need to block until some data is written

-
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: Add release date for 8.5.65

[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 d7a6bc7  Add release date for 8.5.65
d7a6bc7 is described below

commit d7a6bc72033bfaee67dae0755c60396dd714fccd
Author: Mark Thomas 
AuthorDate: Wed Apr 7 15:45:37 2021 +0100

Add release date for 8.5.65
---
 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 2985de1..723c4fa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,7 +113,7 @@
 
   
 
-
+
   
 
   

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

[ANN] Apache Tomcat 8.5.65 available

[Mark Thomas]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.5.65.

Apache Tomcat 8 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and Java Authentication Service Provider Interface for
Containers technologies.

Apache Tomcat 8.5.65 is a bugfix and feature release. The notable
changes compared to 8.5.64 include:

- Fix a regression in 8.5.64 that meant that an error during an
  asynchronous read broke all future asynchronous reads associated with
  the same request instance.

- Prevent concurrent calls to ServletInputStream.isReady() corrupting
  the input buffer.

- Update the packaged version of Tomcat Native to 1.2.27 to pick up
  binaries built with OpenSSL 1.1.1k

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-8.5-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-80.cgi

Migration guides from Apache Tomcat 7.x and 8.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team


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

svn commit: r46920 - /release/tomcat/tomcat-8/v8.5.64/

[markt]

Author: markt
Date: Wed Apr  7 14:43:15 2021
New Revision: 46920

Log:
Drop 8.5.64 from mirrors

Removed:
release/tomcat/tomcat-8/v8.5.64/


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

svn commit: r1888482 - in /tomcat/site/trunk: docs/ xdocs/

[markt]

Author: markt
Date: Wed Apr  7 14:42:22 2021
New Revision: 1888482

URL: http://svn.apache.org/viewvc?rev=1888482&view=rev
Log:
Update site for 8.5.65 release

Modified:
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1888482&r1=1888481&r2=1888482&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Apr  7 14:42:22 2021
@@ -74,8 +74,8 @@
 
   
 Latest Stable 8.5.x Release
-2021-03-10
-8.5.64
+2021-04-06
+8.5.65
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1888482&r1=1888481&r2=1888482&view=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Wed Apr  7 14:42:22 2021
@@ -12,7 +12,7 @@
 
   Quick Navigation
 
-[define v]8.5.64[end]
+[define v]8.5.65[end]
 https://downloads.apache.org/tomcat/tomcat-8/KEYS";>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1888482&r1=1888481&r2=1888482&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Apr  7 14:42:22 2021
@@ -81,6 +81,28 @@ changelog.
 
 https://tomcat.apache.org/download-90.cgi";>Download
 
+2020-04-06 Tomcat 8.5.65 Released
+
+The Apache Tomcat Project is proud to announce the release of version 8.5.65
+of Apache Tomcat. The notable changes compared to 8.5.64 include:
+
+Fix a regression in 8.5.64 that meant that an error during an asynchronous
+read broke all future asynchronous reads associated with the same request
+instance.
+Prevent concurrent calls to ServletInputStream.isReady() corrupting the
+input buffer.
+Update the packaged version of Tomcat Native to 1.2.27 to pick up binaries
+built with OpenSSL 1.1.1k. 
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8.5
+changelog.
+
+
+
+https://tomcat.apache.org/download-80.cgi";>Download
+
 2021-04-06 Tomcat Native 1.2.28 Released
 
 The Apache Tomcat Project is proud to announce the release of version 1.2.28 of
@@ -95,30 +117,6 @@ Tomcat Native. The notable changes since
 https://tomcat.apache.org/download-native.cgi";>Download |
 ChangeLog for 1.2.28
 
-2020-03-10 Tomcat 8.5.64 Released
-
-The Apache Tomcat Project is proud to announce the release of version 8.5.64
-of Apache Tomcat. Apache Tomcat 8.5.x replaces 8.0.x and includes new features
-pulled forward from Tomcat 9.0.x. The minimum Java version and implemented
-specification versions remain unchanged. The notable changes compared
-to 8.5.63 include:
-
-Improvements to Async and non-blocking IO error handling
-Improvements to handling of OpenSSL errors
-Align the behaviour when null is passed to the ServletResponse
-methods setCharacterEncoding(), setContentType() and setLocale()
-with the recent clarification from the Jakarta Servlet project of
-the expected behaviour in these cases. 
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 8.5
-changelog.
-
-
-
-https://tomcat.apache.org/download-80.cgi";>Download
-
 2021-02-18 Tomcat Migration Tool for Jakarta EE 0.2.0 
Released
 
 The Apache Tomcat Project is proud to announce the release of 0.2.0 of the

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1888482&r1=1888481&r2=1888482&view=diff
==
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Wed Apr  7 14:42:22 2021
@@ -324,8 +324,9 @@ of Apache Tomcat.
 8.5.59
 8.5.60
 8.5.61
-8.5.63
-8.5.64
+8.5.63
+8.5.64
+8.5.65
 , new version:
 
 8.5.0
@@ -378,7 +379,8 @@ of Apache Tomcat.
 8.5.60
 8.5.61
 8.5.63
-8.5.64
+8.5.64
+8.5.65
 trunk (unreleased)
 
 

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apa

svn commit: r1888481 - in /tomcat/site/trunk: ./ docs/tomcat-8.5-doc/ docs/tomcat-8.5-doc/annotationapi/ docs/tomcat-8.5-doc/annotationapi/javax/annotation/ docs/tomcat-8.5-doc/annotationapi/javax/ann

[markt]

Author: markt
Date: Wed Apr  7 14:41:23 2021
New Revision: 1888481

URL: http://svn.apache.org/viewvc?rev=1888481&view=rev
Log:
Update docs for 8.5.65 release


[This commit notification would consist of 65 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

[tomcat] branch master updated: Fix changelog

[remm]

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

remm 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 b32121c  Fix changelog
b32121c is described below

commit b32121cf75bffc62e215e4c338705951506c3d6d
Author: remm 
AuthorDate: Wed Apr 7 16:37:00 2021 +0200

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 90cf654..ee3b9d2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,10 +116,6 @@
 Update the packaged version of the Tomcat Native Library to 1.2.28.
 (markt)
   
-
-  
-  
-
   
 Update the OWB module to Apache OpenWebBeans 2.0.22. (remm)
   

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

[tomcat] branch 9.0.x updated (7d58de2 -> 8d66870)

[remm]

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

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


from 7d58de2  Add release date for 9.0.45
 add 8d66870  Allow APR connector use with the default HTTP/1.1 protocol

No new revisions were added by this update.

Summary of changes:
 java/org/apache/catalina/connector/Connector.java |  5 +++--
 webapps/docs/changelog.xml| 12 
 2 files changed, 11 insertions(+), 6 deletions(-)

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

[tomcat] branch 9.0.x updated: Add release date for 9.0.45

[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 7d58de2  Add release date for 9.0.45
7d58de2 is described below

commit 7d58de203751602b8c5188c7d7acd10617062f2b
Author: Mark Thomas 
AuthorDate: Wed Apr 7 15:20:22 2021 +0100

Add release date for 9.0.45
---
 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 30079d6..00d05a4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,7 +129,7 @@
 
   
 
-
+
   
 
   

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

svn commit: r46919 - /release/tomcat/tomcat-9/v9.0.44/

[markt]

Author: markt
Date: Wed Apr  7 14:19:42 2021
New Revision: 46919

Log:
Drop 9.0.44 from mirror network

Removed:
release/tomcat/tomcat-9/v9.0.44/


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

[ANN] Apache Tomcat 9.0.45 available

[Mark Thomas]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 9.0.45.

Apache Tomcat 9 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and JASPIC technologies.

Apache Tomcat 9.0.45 is a bugfix and feature release. The notable
changes compared to 9.0.44 include:

- Fix a regression in 9.0.44 that meant that an error during an
  asynchronous read broke all future asynchronous reads associated with
  the same request instance.

- Prevent concurrent calls to ServletInputStream.isReady() corrupting
  the input buffer.

- Update the packaged version of Tomcat Native to 1.2.27 to pick up
  binaries built with OpenSSL 1.1.1k

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-9.0-doc/changelog.html


Downloads:
http://tomcat.apache.org/download-90.cgi

Migration guides from Apache Tomcat 7.x and 8.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team


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

svn commit: r1888479 - in /tomcat/site/trunk: docs/ xdocs/

[markt]

Author: markt
Date: Wed Apr  7 14:18:09 2021
New Revision: 1888479

URL: http://svn.apache.org/viewvc?rev=1888479&view=rev
Log:
Update site for 9.0.45 release

Modified:
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-90.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1888479&r1=1888478&r2=1888479&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Apr  7 14:18:09 2021
@@ -60,15 +60,15 @@
 
   
 Latest Stable 10.0.x Release
-2021-04-07
+2021-04-06
 10.0.5
   
 
 
   
 Latest Stable 9.0.x Release
-2021-03-10
-9.0.44
+2021-04-06
+9.0.45
   
 
 

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1888479&r1=1888478&r2=1888479&view=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Wed Apr  7 14:18:09 2021
@@ -12,7 +12,7 @@
 
   Quick Navigation
 
-[define v]9.0.44[end]
+[define v]9.0.45[end]
 https://downloads.apache.org/tomcat/tomcat-9/KEYS";>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1888479&r1=1888478&r2=1888479&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Apr  7 14:18:09 2021
@@ -59,6 +59,28 @@ changelog.
 
 https://tomcat.apache.org/download-10.cgi";>Download
 
+2021-04-06 Tomcat 9.0.45 Released
+
+The Apache Tomcat Project is proud to announce the release of version 9.0.45
+of Apache Tomcat. The notable changes compared to 9.0.44 include:
+
+Fix a regression in 9.0.44 that meant that an error during an asynchronous
+read broke all future asynchronous reads associated with the same request
+instance.
+Prevent concurrent calls to ServletInputStream.isReady() corrupting the
+input buffer.
+Update the packaged version of Tomcat Native to 1.2.27 to pick up binaries
+built with OpenSSL 1.1.1k. 
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
+
+
+https://tomcat.apache.org/download-90.cgi";>Download
+
 2021-04-06 Tomcat Native 1.2.28 Released
 
 The Apache Tomcat Project is proud to announce the release of version 1.2.28 of
@@ -73,27 +95,6 @@ Tomcat Native. The notable changes since
 https://tomcat.apache.org/download-native.cgi";>Download |
 ChangeLog for 1.2.28
 
-2021-03-10 Tomcat 9.0.44 Released
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.44
-of Apache Tomcat. The notable changes compared to 9.0.43 include:
-
-Improvements to Async and non-blocking IO error handling
-Improvements to handling of OpenSSL errors
-Align the behaviour when null is passed to the ServletResponse
-methods setCharacterEncoding(), setContentType() and setLocale()
-with the recent clarification from the Jakarta Servlet project of
-the expected behaviour in these cases. 
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
-
-
-
-https://tomcat.apache.org/download-90.cgi";>Download
-
 2020-03-10 Tomcat 8.5.64 Released
 
 The Apache Tomcat Project is proud to announce the release of version 8.5.64

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1888479&r1=1888478&r2=1888479&view=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Wed Apr  7 14:18:09 2021
@@ -405,8 +405,9 @@ of Apache Tomcat.
 9.0.39
 9.0.40
 9.0.41
-9.0.43
-9.0.44
+9.0.43
+9.0.44
+9.0.45
 , new version:
 
 9.0.0-M1
@@ -460,7 +461,8 @@ of Apache Tomcat.
 9.0.40
 9.0.41
 9.0.43
-9.0.44
+9.0.44
+9.0.45
 trunk (unreleased)
 
 

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1888479&r1=1888478&r2=1888479&view=di

svn commit: r1888478 - in /tomcat/site/trunk: ./ docs/tomcat-9.0-doc/ docs/tomcat-9.0-doc/annotationapi/ docs/tomcat-9.0-doc/annotationapi/javax/annotation/ docs/tomcat-9.0-doc/annotationapi/javax/ann

[markt]

Author: markt
Date: Wed Apr  7 14:11:03 2021
New Revision: 1888478

URL: http://svn.apache.org/viewvc?rev=1888478&view=rev
Log:
Update site docs for 9.0.45 release


[This commit notification would consist of 67 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

[tomcat] branch master updated: Add release date for 10.0.5

[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 8676c3e  Add release date for 10.0.5
8676c3e is described below

commit 8676c3e03387959924f1522404ce6aa339466fe0
Author: Mark Thomas 
AuthorDate: Wed Apr 7 14:58:07 2021 +0100

Add release date for 10.0.5
---
 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 43a0486..90cf654 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,7 +129,7 @@
 
   
 
-
+
   
 
   

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

[ANN] Apache Tomcat 10.0.5 available

[Mark Thomas]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 10.0.5.

This release is targeted at Jakarta EE 9.

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory. This conversion is performed using the Apache Tomcat 
migration tool for Jakarta EE tool which is also available as a separate 
download for off-line use.


Apache Tomcat 10 is an open source software implementation of the
Jakarta Servlet, Jakarta Server Pages, Jakarta Expression Language,
Jakarta WebSocket, Jakarta Authentication and Jakarta Annotations
specifications.

The notable changes compared to 10.0.4 include:

- Fix a regression in 10.0.4 that meant that an error during an
  asynchronous read broke all future asynchronous reads associated with
  the same request instance.

- Prevent concurrent calls to ServletInputStream.isReady() corrupting
  the input buffer.

- Update the packaged version of Tomcat Native to 1.2.27 to pick up
  binaries built with OpenSSL 1.1.1k

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-10.0-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-10.cgi

Migration guides from Apache Tomcat 7.0.x, 8.5.x and 9.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

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

svn commit: r46918 - /release/tomcat/tomcat-10/v10.0.4/

[markt]

Author: markt
Date: Wed Apr  7 13:59:44 2021
New Revision: 46918

Log:
Drop 10.0.4 from mirrors

Removed:
release/tomcat/tomcat-10/v10.0.4/


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

svn commit: r1888477 - in /tomcat/site/trunk: docs/ xdocs/

[markt]

Author: markt
Date: Wed Apr  7 13:57:30 2021
New Revision: 1888477

URL: http://svn.apache.org/viewvc?rev=1888477&view=rev
Log:
Update site for 10.0.5 release

Modified:
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-10.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-10.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-10.xml
tomcat/site/trunk/xdocs/migration-10.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1888477&r1=1888476&r2=1888477&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Apr  7 13:57:30 2021
@@ -60,8 +60,8 @@
 
   
 Latest Stable 10.0.x Release
-2021-03-10
-10.0.4
+2021-04-07
+10.0.5
   
 
 

Modified: tomcat/site/trunk/docs/download-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-10.html?rev=1888477&r1=1888476&r2=1888477&view=diff
==
--- tomcat/site/trunk/docs/download-10.html (original)
+++ tomcat/site/trunk/docs/download-10.html Wed Apr  7 13:57:30 2021
@@ -21,7 +21,7 @@
 
   Quick Navigation
 
-[define v]10.0.4[end]
+[define v]10.0.5[end]
 https://downloads.apache.org/tomcat/tomcat-10/KEYS";>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1888477&r1=1888476&r2=1888477&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Apr  7 13:57:30 2021
@@ -28,23 +28,9 @@ wiki page.
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
 
-2021-04-06 Tomcat Native 1.2.28 Released
-
-The Apache Tomcat Project is proud to announce the release of version 1.2.28 of
-Tomcat Native. The notable changes since 1.2.27 include:
-
-
-Correct a regression in the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=65181";>65181 that 
prevented an error
-message from being displayed if an invalid key file was provided and no
-OpenSSL Engine was configured.
-
-
-https://tomcat.apache.org/download-native.cgi";>Download |
-ChangeLog for 1.2.28
-
-2021-03-10 Tomcat 10.0.4 Released
+2021-04-06 Tomcat 10.0.5 Released
 
-The Apache Tomcat Project is proud to announce the release of version 10.0.4
+The Apache Tomcat Project is proud to announce the release of version 10.0.5
 of Apache Tomcat. This release is targeted at Jakarta EE 9.
 Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
 without changes. Java EE applications designed for Tomcat 9 and earlier may be
@@ -56,20 +42,37 @@ migration tool for Jakarta EE tool w
 https://tomcat.apache.org/download-migration.cgi";>download for 
off-line use.
 The notable changes in this release are:
 
-Integration of the Apache Tomcat Migration Tool for Jakarta EE via the
-webapps-javaee directory
-Improvements to Async and non-blocking IO error handling
-Add support for Unix Domain Sockets to the APR/Native connector 
+Fix a regression in 10.0.4 that meant that an error during an asynchronous
+read broke all future asynchronous reads associated with the same request
+instance.
+Prevent concurrent calls to ServletInputStream.isReady() corrupting the
+input buffer.
+Update the packaged version of Tomcat Native to 1.2.27 to pick up binaries
+built with OpenSSL 1.1.1k. 
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 10
+Tomcat 10
 changelog.
 
 
 
 https://tomcat.apache.org/download-10.cgi";>Download
 
+2021-04-06 Tomcat Native 1.2.28 Released
+
+The Apache Tomcat Project is proud to announce the release of version 1.2.28 of
+Tomcat Native. The notable changes since 1.2.27 include:
+
+
+Correct a regression in the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=65181";>65181 that 
prevented an error
+message from being displayed if an invalid key file was provided and no
+OpenSSL Engine was configured.
+
+
+https://tomcat.apache.org/download-native.cgi";>Download |
+ChangeLog for 1.2.28
+
 2021-03-10 Tomcat 9.0.44 Released
 
 The Apache Tomcat Project is proud to announce the release of version 9.0.44

Modified: tomcat/site/trunk/docs/migration-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.html?rev=1888477&r1=1888476&r2=1888477&view=diff
==

svn commit: r1888476 - in /tomcat/site/trunk: ./ docs/ docs/tomcat-10.0-doc/ docs/tomcat-10.0-doc/annotationapi/ docs/tomcat-10.0-doc/annotationapi/jakarta/annotation/ docs/tomcat-10.0-doc/annotationa

[markt]

Author: markt
Date: Wed Apr  7 13:56:17 2021
New Revision: 1888476

URL: http://svn.apache.org/viewvc?rev=1888476&view=rev
Log:
Update docs for 10.0.5 release


[This commit notification would consist of 66 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

Re: AprLifecycleListener broken since 9.0.38?

[Rémy Maucherat]

On Wed, Apr 7, 2021 at 2:42 PM Rainer Jung  wrote:

> The only direct calls to AprStatus.isAprAvailable() outside of the
> APRLifecycleListener itself are actually in Connector.java. Replacing
> those by calls to the listener seems to work for me:
>

I get the idea. So I think the purpose of the change was to avoid APR and
it worked out great for that. Normally the AprStatus.isInstanceCreated
should be enough to achieve what was originally needed and it is possible
to check AprLifecycleListener.isAprAvailable, since as you correctly
noticed AprStatus.isAprAvailable does nothing. I´m still a bit worried I
could be causing problems.

OTOH, it could be a good move to stop using this since it is removed in
Tomcat 10 and use the APR connector classname instead.

Rémy


>
> diff --git a/java/org/apache/catalina/connector/Connector.java
> b/java/org/apache/catalina/connector/Connector.java
> index 1cc15802eb..53a210e6b2 100644
> --- a/java/org/apache/catalina/connector/Connector.java
> +++ b/java/org/apache/catalina/connector/Connector.java
> @@ -29,6 +29,7 @@ import org.apache.catalina.Globals;
>   import org.apache.catalina.LifecycleException;
>   import org.apache.catalina.LifecycleState;
>   import org.apache.catalina.Service;
> +import org.apache.catalina.core.AprLifecycleListener;
>   import org.apache.catalina.core.AprStatus;
>   import org.apache.catalina.util.LifecycleMBeanBase;
>   import org.apache.coyote.AbstractProtocol;
> @@ -80,7 +81,7 @@ public class Connector extends LifecycleMBeanBase  {
>
>
>   public Connector(String protocol) {
> -boolean apr = AprStatus.isAprAvailable() &&
> +boolean apr = AprLifecycleListener.isAprAvailable() &&
>   AprStatus.getUseAprConnector();
>   ProtocolHandler p = null;
>   try {
> @@ -1020,11 +1021,11 @@ public class Connector extends LifecycleMBeanBase
> {
>   throw new
>
> LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprListener",
>   getProtocolHandlerClassName()));
>   }
> -if (protocolHandler.isAprRequired() &&
> !AprStatus.isAprAvailable()) {
> +if (protocolHandler.isAprRequired() &&
> !AprLifecycleListener.isAprAvailable()) {
>   throw new
>
> LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprLibrary",
>   getProtocolHandlerClassName()));
>   }
> -if (AprStatus.isAprAvailable() && AprStatus.getUseOpenSSL() &&
> +if (AprLifecycleListener.isAprAvailable() &&
> AprStatus.getUseOpenSSL() &&
>   protocolHandler instanceof AbstractHttp11JsseProtocol) {
>   AbstractHttp11JsseProtocol jsseProtocolHandler =
>   (AbstractHttp11JsseProtocol) protocolHandler;
>
> Feel free to apply.
>
> Regards,
>
> Rainer
>
>
> Am 07.04.2021 um 14:32 schrieb Rainer Jung:
> > I think the reason is:
> >
> > o.a.c.connector.Connector checks AprStatus.isAprAvailable(). It
> > previously checked AprLifecycleListener.isAprAvailable(). The difference
> > is, that the old AprLifecycleListener.isAprAvailable() triggers the
> > init() of AprLifecycleListener, whereas AprStatus.isAprAvailable() does
> > not.
> >
> > I think isAprAvailable() is the only method with side effects that was
> > moved from AprLifecycleListener to AprStatus. Since it is still
> > available in AprLifecycleListener, I think it would be safest to
> > typically not call it in AprStatus but instead in AprLifecycleListener.
> >
> > Regards,
> >
> > Rainer
> >
> > Am 07.04.2021 um 14:02 schrieb Rainer Jung:
> >> Maybe related to f4dac6846c548144799b1c3f33aba4eb320a3413.
> >>
> >> Am 07.04.2021 um 13:53 schrieb Rainer Jung:
> >>> Hi there,
> >>>
> >>> a colleague of mine observed a change in behavior starting with TC
> >>> 9.0.38: until 9.0.37 the default server.xml with the connector
> >>> protocol="HTTP/1.1", installed tcnative and attribute
> >>> useAprConnector="true" for the AprLifecycleListener actually starts
> >>> an APR connector as documented and expected:
> >>>
> >>> INFO [main] org.apache.coyote.AbstractProtocol.init Initializing
> >>> ProtocolHandler ["http-apr-8080"]
> >>>
> >>> Same situation starting with 9.0.38 (and at least until 9.0.44):
> >>>
> >>> INFO [main] org.apache.coyote.AbstractProtocol.init Initializing
> >>> ProtocolHandler ["http-nio-8080"]
> >>>
> >>> I increased log level for a coupe of packages to FINEST and see the
> >>> following differences during startup:
> >>>
> >>> FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty
> >>> IntrospectionUtils: setProperty(class
> >>> org.apache.catalina.core.AprLifecycleListener SSLEngine=on)
> >>> FINE [main] org.apache.tomcat.util.digester.SetPropertiesRule.begin
> >>> [SetPropertiesRule]{Server/Listener} Setting property
> >>> 'useAprConnector' to 'true'
> >>> FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty
> >>> IntrospectionUtils: setProperty(class
> >>> org.apache.catalina.core

Re: AprLifecycleListener broken since 9.0.38?

[Rainer Jung]

The only direct calls to AprStatus.isAprAvailable() outside of the 
APRLifecycleListener itself are actually in Connector.java. Replacing 
those by calls to the listener seems to work for me:


diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java

index 1cc15802eb..53a210e6b2 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -29,6 +29,7 @@ import org.apache.catalina.Globals;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.Service;
+import org.apache.catalina.core.AprLifecycleListener;
 import org.apache.catalina.core.AprStatus;
 import org.apache.catalina.util.LifecycleMBeanBase;
 import org.apache.coyote.AbstractProtocol;
@@ -80,7 +81,7 @@ public class Connector extends LifecycleMBeanBase  {


 public Connector(String protocol) {
-boolean apr = AprStatus.isAprAvailable() &&
+boolean apr = AprLifecycleListener.isAprAvailable() &&
 AprStatus.getUseAprConnector();
 ProtocolHandler p = null;
 try {
@@ -1020,11 +1021,11 @@ public class Connector extends LifecycleMBeanBase  {
 throw new 
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprListener",

 getProtocolHandlerClassName()));
 }
-if (protocolHandler.isAprRequired() && 
!AprStatus.isAprAvailable()) {
+if (protocolHandler.isAprRequired() && 
!AprLifecycleListener.isAprAvailable()) {
 throw new 
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprLibrary",

 getProtocolHandlerClassName()));
 }
-if (AprStatus.isAprAvailable() && AprStatus.getUseOpenSSL() &&
+if (AprLifecycleListener.isAprAvailable() && 
AprStatus.getUseOpenSSL() &&

 protocolHandler instanceof AbstractHttp11JsseProtocol) {
 AbstractHttp11JsseProtocol jsseProtocolHandler =
 (AbstractHttp11JsseProtocol) protocolHandler;

Feel free to apply.

Regards,

Rainer


Am 07.04.2021 um 14:32 schrieb Rainer Jung:

I think the reason is:

o.a.c.connector.Connector checks AprStatus.isAprAvailable(). It 
previously checked AprLifecycleListener.isAprAvailable(). The difference 
is, that the old AprLifecycleListener.isAprAvailable() triggers the 
init() of AprLifecycleListener, whereas AprStatus.isAprAvailable() does 
not.


I think isAprAvailable() is the only method with side effects that was 
moved from AprLifecycleListener to AprStatus. Since it is still 
available in AprLifecycleListener, I think it would be safest to 
typically not call it in AprStatus but instead in AprLifecycleListener.


Regards,

Rainer

Am 07.04.2021 um 14:02 schrieb Rainer Jung:

Maybe related to f4dac6846c548144799b1c3f33aba4eb320a3413.

Am 07.04.2021 um 13:53 schrieb Rainer Jung:

Hi there,

a colleague of mine observed a change in behavior starting with TC 
9.0.38: until 9.0.37 the default server.xml with the connector 
protocol="HTTP/1.1", installed tcnative and attribute 
useAprConnector="true" for the AprLifecycleListener actually starts 
an APR connector as documented and expected:


INFO [main] org.apache.coyote.AbstractProtocol.init Initializing 
ProtocolHandler ["http-apr-8080"]


Same situation starting with 9.0.38 (and at least until 9.0.44):

INFO [main] org.apache.coyote.AbstractProtocol.init Initializing 
ProtocolHandler ["http-nio-8080"]


I increased log level for a coupe of packages to FINEST and see the 
following differences during startup:


FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.catalina.core.AprLifecycleListener SSLEngine=on)
FINE [main] org.apache.tomcat.util.digester.SetPropertiesRule.begin 
[SetPropertiesRule]{Server/Listener} Setting property 
'useAprConnector' to 'true'
FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.catalina.core.AprLifecycleListener useAprConnector=true)

### ONLY ADDRESS DIFFERENCE
-FINE [main] org.apache.tomcat.util.digester.SetNextRule.end 
[SetNextRule]{Server/Listener} Call 
org.apache.catalina.core.StandardServer.addLifecycleListener(org.apache.catalina.core.AprLifecycleListener@383534aa) 

+FINE [main] org.apache.tomcat.util.digester.SetNextRule.end 
[SetNextRule]{Server/Listener} Call 
org.apache.catalina.core.StandardServer.addLifecycleListener(org.apache.catalina.core.AprLifecycleListener@136432db) 

FINE [main] org.apache.tomcat.util.IntrospectionUtils.callMethod1 
IntrospectionUtils: callMethod1 
org.apache.catalina.core.StandardServer 
org.apache.catalina.core.AprLifecycleListener 
org.apache.catalina.LifecycleListener
FINE [main] org.apache.tomcat.util.digester.ObjectCreateRule.end 
[ObjectCreateRule]{Server/Listener} Pop 
org.apache.catalina.core.AprLifecycleListener

 WRONG CLAS

[tomcat] branch 7.0.x updated: Update Tomcat Native to 1.2.28 # Conflicts: # webapps/docs/changelog.xml

[markt]

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

markt 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 ece3c70  Update Tomcat Native to 1.2.28 # Conflicts: # 
webapps/docs/changelog.xml
ece3c70 is described below

commit ece3c701f7e41fe501671da3f5921d52facfd33d
Author: Mark Thomas 
AuthorDate: Wed Apr 7 13:35:41 2021 +0100

Update Tomcat Native to 1.2.28
# Conflicts:
#   webapps/docs/changelog.xml

# Conflicts:
#   webapps/docs/changelog.xml
---
 build.properties.default   | 6 +++---
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 0480f27..5b6f041 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -186,13 +186,13 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.27
+tomcat-native.version=1.2.28
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=99e356cef89bdc35cfcb98fafe0d5dda8375461382053969509b6b24d9129ca89782bc618c58245980c921abbdb25eece80cb129e33ad06741d22681b84d7742
+tomcat-native.src.checksum.value=16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=90553cb8d74f00e00ac220a18c5c647c5b74f0487020d41efe33beb501c2caac43d77363a7820c2e91ac7a0f23967a2077e704e8db56ad18978780346a642ca3
+tomcat-native.win.checksum.value=a0a7c05ca1b2b873456e2331232f9752b52af23a205e61d14905e0779f4c517563438b45fc36b1a81803f67d47b39e77009e4a4e892a3fd0e548398ed9a69dc3
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5389d74..875a339 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,7 +135,7 @@
 Shirayuking. (markt)
   
   
-Update the packaged version of the Tomcat Native Library to 1.2.27.
+Update the packaged version of the Tomcat Native Library to 1.2.28.
 (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: Update Tomcat Native to 1.2.28 # Conflicts: # webapps/docs/changelog.xml

[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 076bcde  Update Tomcat Native to 1.2.28 # Conflicts: # 
webapps/docs/changelog.xml
076bcde is described below

commit 076bcde63d50cc1b9626fa10b0b00aad7de24c5c
Author: Mark Thomas 
AuthorDate: Wed Apr 7 13:35:41 2021 +0100

Update Tomcat Native to 1.2.28
# Conflicts:
#   webapps/docs/changelog.xml
---
 build.properties.default   | 6 +++---
 webapps/docs/changelog.xml | 8 
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 2fefd2e..f0d5935 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -151,13 +151,13 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.27
+tomcat-native.version=1.2.28
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=99e356cef89bdc35cfcb98fafe0d5dda8375461382053969509b6b24d9129ca89782bc618c58245980c921abbdb25eece80cb129e33ad06741d22681b84d7742
+tomcat-native.src.checksum.value=16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=90553cb8d74f00e00ac220a18c5c647c5b74f0487020d41efe33beb501c2caac43d77363a7820c2e91ac7a0f23967a2077e704e8db56ad18978780346a642ca3
+tomcat-native.win.checksum.value=a0a7c05ca1b2b873456e2331232f9752b52af23a205e61d14905e0779f4c517563438b45fc36b1a81803f67d47b39e77009e4a4e892a3fd0e548398ed9a69dc3
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a2b66fc..2985de1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Update the packaged version of the Tomcat Native Library to 1.2.28.
+(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: Update Tomcat Native to 1.2.28

[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 f44cb57  Update Tomcat Native to 1.2.28
f44cb57 is described below

commit f44cb5722c214c53d06788509d91af8eaf7a7ec5
Author: Mark Thomas 
AuthorDate: Wed Apr 7 13:35:41 2021 +0100

Update Tomcat Native to 1.2.28
---
 build.properties.default   | 6 +++---
 webapps/docs/changelog.xml | 4 
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index e045e28..b4101c0 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -147,13 +147,13 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.27
+tomcat-native.version=1.2.28
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=99e356cef89bdc35cfcb98fafe0d5dda8375461382053969509b6b24d9129ca89782bc618c58245980c921abbdb25eece80cb129e33ad06741d22681b84d7742
+tomcat-native.src.checksum.value=16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=90553cb8d74f00e00ac220a18c5c647c5b74f0487020d41efe33beb501c2caac43d77363a7820c2e91ac7a0f23967a2077e704e8db56ad18978780346a642ca3
+tomcat-native.win.checksum.value=a0a7c05ca1b2b873456e2331232f9752b52af23a205e61d14905e0779f4c517563438b45fc36b1a81803f67d47b39e77009e4a4e892a3fd0e548398ed9a69dc3
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b91a49c..30079d6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,10 @@
 aQute.bnd.annotation.spi.ServiceConsumer annotation as 
this
 triggers TCK failures for downstream consumers of the API JARs. (markt)
   
+  
+Update the packaged version of the Tomcat Native Library to 1.2.28.
+(markt)
+  
 
   
   

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

[tomcat] branch master updated: Update Tomcat Native to 1.2.28

[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 b293109  Update Tomcat Native to 1.2.28
b293109 is described below

commit b293109e2c10d30706439686a014570e82807d52
Author: Mark Thomas 
AuthorDate: Wed Apr 7 13:35:41 2021 +0100

Update Tomcat Native to 1.2.28
---
 build.properties.default   | 6 +++---
 webapps/docs/changelog.xml | 4 
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index c163e02..fd8d153 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -147,13 +147,13 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.27
+tomcat-native.version=1.2.28
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=99e356cef89bdc35cfcb98fafe0d5dda8375461382053969509b6b24d9129ca89782bc618c58245980c921abbdb25eece80cb129e33ad06741d22681b84d7742
+tomcat-native.src.checksum.value=16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=90553cb8d74f00e00ac220a18c5c647c5b74f0487020d41efe33beb501c2caac43d77363a7820c2e91ac7a0f23967a2077e704e8db56ad18978780346a642ca3
+tomcat-native.win.checksum.value=a0a7c05ca1b2b873456e2331232f9752b52af23a205e61d14905e0779f4c517563438b45fc36b1a81803f67d47b39e77009e4a4e892a3fd0e548398ed9a69dc3
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bbb9e60..43a0486 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,10 @@
 aQute.bnd.annotation.spi.ServiceConsumer annotation as 
this
 triggers TCK failures for downstream consumers of the API JARs. (markt)
   
+  
+Update the packaged version of the Tomcat Native Library to 1.2.28.
+(markt)
+  
 
   
   

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

Re: AprLifecycleListener broken since 9.0.38?

[Rainer Jung]

I think the reason is:

o.a.c.connector.Connector checks AprStatus.isAprAvailable(). It 
previously checked AprLifecycleListener.isAprAvailable(). The difference 
is, that the old AprLifecycleListener.isAprAvailable() triggers the 
init() of AprLifecycleListener, whereas AprStatus.isAprAvailable() does not.


I think isAprAvailable() is the only method with side effects that was 
moved from AprLifecycleListener to AprStatus. Since it is still 
available in AprLifecycleListener, I think it would be safest to 
typically not call it in AprStatus but instead in AprLifecycleListener.


Regards,

Rainer

Am 07.04.2021 um 14:02 schrieb Rainer Jung:

Maybe related to f4dac6846c548144799b1c3f33aba4eb320a3413.

Am 07.04.2021 um 13:53 schrieb Rainer Jung:

Hi there,

a colleague of mine observed a change in behavior starting with TC 
9.0.38: until 9.0.37 the default server.xml with the connector 
protocol="HTTP/1.1", installed tcnative and attribute 
useAprConnector="true" for the AprLifecycleListener actually starts an 
APR connector as documented and expected:


INFO [main] org.apache.coyote.AbstractProtocol.init Initializing 
ProtocolHandler ["http-apr-8080"]


Same situation starting with 9.0.38 (and at least until 9.0.44):

INFO [main] org.apache.coyote.AbstractProtocol.init Initializing 
ProtocolHandler ["http-nio-8080"]


I increased log level for a coupe of packages to FINEST and see the 
following differences during startup:


FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.catalina.core.AprLifecycleListener SSLEngine=on)
FINE [main] org.apache.tomcat.util.digester.SetPropertiesRule.begin 
[SetPropertiesRule]{Server/Listener} Setting property 
'useAprConnector' to 'true'
FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.catalina.core.AprLifecycleListener useAprConnector=true)

### ONLY ADDRESS DIFFERENCE
-FINE [main] org.apache.tomcat.util.digester.SetNextRule.end 
[SetNextRule]{Server/Listener} Call 
org.apache.catalina.core.StandardServer.addLifecycleListener(org.apache.catalina.core.AprLifecycleListener@383534aa) 

+FINE [main] org.apache.tomcat.util.digester.SetNextRule.end 
[SetNextRule]{Server/Listener} Call 
org.apache.catalina.core.StandardServer.addLifecycleListener(org.apache.catalina.core.AprLifecycleListener@136432db) 

FINE [main] org.apache.tomcat.util.IntrospectionUtils.callMethod1 
IntrospectionUtils: callMethod1 
org.apache.catalina.core.StandardServer 
org.apache.catalina.core.AprLifecycleListener 
org.apache.catalina.LifecycleListener
FINE [main] org.apache.tomcat.util.digester.ObjectCreateRule.end 
[ObjectCreateRule]{Server/Listener} Pop 
org.apache.catalina.core.AprLifecycleListener

 WRONG CLASS CHOSEN IN NEWER VERSIONS
-FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.coyote.http11.Http11AprProtocol port=8080)
+FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.coyote.http11.Http11NioProtocol port=8080)
FINE [main] org.apache.tomcat.util.digester.SetPropertiesRule.begin 
[SetPropertiesRule]{Server/Service/Connector} Setting property 
'protocol' to 'HTTP/1.1'

...

and after these lines the logs use consistenly APR versus NIO in the 
two versions. Both startup logs show the same


INFO [main] 
org.apache.catalina.core.AprLifecycleListener.lifecycleEvent Loaded 
Apache Tomcat Native library [1.2.27] using APR version [1.7.0].
INFO [main] 
org.apache.catalina.core.AprLifecycleListener.lifecycleEvent APR 
capabilities: IPv6 [true], sendfile [true], accept filters [false], 
random [true].
INFO [main] 
org.apache.catalina.core.AprLifecycleListener.lifecycleEvent 
APR/OpenSSL configuration: useAprConnector [true], useOpenSSL [true]
INFO [main] 
org.apache.catalina.core.AprLifecycleListener.initializeSSL OpenSSL 
successfully initialized [OpenSSL 1.1.1k  25 Mar 2021]


I didn't find an obvious reason in the changelog. Maybe an unwanted 
backport part from 10 or some startup order change.


I have not yet checked 8.5 etc.

Regards,

Rainer


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

[ANN] Apache Tomcat Native 1.2.28 released

[Mark Thomas]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat Native 1.2.28 stable.

The key features of this release are:
- Windows binaries built using 1.1.1k
- Correct a regression in the fix for 65181 that prevented an error
  message from being displayed if an invalid key file was provided
  and no OpenSSL Engine was configured.

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/native-doc/miscellaneous/changelog.html

Downloads:
http://tomcat.apache.org/download-native.cgi

The Apache Tomcat Native Library provides portable API for features
not found in contemporary JDK's. It uses Apache Portable Runtime as
operating system abstraction layer and OpenSSL for SSL networking and
allows optimal performance in production environments.

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

svn commit: r46915 - /release/tomcat/tomcat-connectors/native/1.2.27/

[markt]

Author: markt
Date: Wed Apr  7 12:26:44 2021
New Revision: 46915

Log:
Drop 1.2.27 from mirrors

Removed:
release/tomcat/tomcat-connectors/native/1.2.27/


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

svn commit: r1888470 - in /tomcat/site/trunk: docs/download-native.html docs/index.html docs/oldnews.html xdocs/download-native.xml xdocs/index.xml xdocs/oldnews.xml

[markt]

Author: markt
Date: Wed Apr  7 12:25:42 2021
New Revision: 1888470

URL: http://svn.apache.org/viewvc?rev=1888470&view=rev
Log:
Update site for 1.2.28 release

Modified:
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/xdocs/download-native.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/oldnews.xml

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1888470&r1=1888469&r2=1888470&view=diff
==
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Wed Apr  7 12:25:42 2021
@@ -49,22 +49,22 @@
   Source (please choose the 
correct format for your platform)
   
 
-  
-Native 1.2.27 Source Release tar.gz (e.g. Unix, Linux, Mac 
OS)
+  
+Native 1.2.28 Source Release tar.gz (e.g. Unix, Linux, Mac 
OS)
 
   
-[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.27/source/tomcat-native-1.2.27-src.tar.gz.asc";>PGP],
-[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.27/source/tomcat-native-1.2.27-src.tar.gz.sha512";>SHA512]
+[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.28/source/tomcat-native-1.2.28-src.tar.gz.asc";>PGP],
+[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.28/source/tomcat-native-1.2.28-src.tar.gz.sha512";>SHA512]
   
 
 
 
-  
-Native 1.2.27 Source Release zip (e.g. Windows)
+  
+Native 1.2.28 Source Release zip (e.g. Windows)
 
   
-[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.27/source/tomcat-native-1.2.27-win32-src.zip.asc";>PGP],
-[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.27/source/tomcat-native-1.2.27-win32-src.zip.sha512";>SHA512]
+[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.28/source/tomcat-native-1.2.28-win32-src.zip.asc";>PGP],
+[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.28/source/tomcat-native-1.2.28-win32-src.zip.sha512";>SHA512]
   
 
 
@@ -73,7 +73,7 @@
 
 You can find binaries release too.
 You may download them from
-  HERE
+  HERE
 
 
   
@@ -91,22 +91,22 @@
 Binaries for Microsoft Windows built with 
OpenSSL 1.1.1k
 
   
-
-  Native 1.2.27 Windows Binaries zip (recommended)
+
+  Native 1.2.28 Windows Binaries zip (recommended)
   
 
-  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-win32-bin.zip.asc";>PGP],
-  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-win32-bin.zip.sha512";>SHA512]
+  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.28/binaries/tomcat-native-1.2.28-openssl-1.1.1k-win32-bin.zip.asc";>PGP],
+  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.28/binaries/tomcat-native-1.2.28-openssl-1.1.1k-win32-bin.zip.sha512";>SHA512]
 
   
   
   
-
-  Native 1.2.27 Windows OCSP-enabled Binaries zip
+
+  Native 1.2.28 Windows OCSP-enabled Binaries zip
   
 
-  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip.asc";>PGP],
-  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.27/binaries/tomcat-native-1.2.27-openssl-1.1.1k-ocsp-win32-bin.zip.sha512";>SHA512]
+  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.28/binaries/tomcat-native-1.2.28-openssl-1.1.1k-ocsp-win32-bin.zip.asc";>PGP],
+  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.28/binaries/tomcat-native-1.2.28-openssl-1.1.1k-ocsp-win32-bin.zip.sha512";>SHA512]
 
   
   

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1888470&r1=1888469&r2=1888470&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tom

Re: AprLifecycleListener broken since 9.0.38?

[Rainer Jung]

Maybe related to f4dac6846c548144799b1c3f33aba4eb320a3413.

Am 07.04.2021 um 13:53 schrieb Rainer Jung:

Hi there,

a colleague of mine observed a change in behavior starting with TC 
9.0.38: until 9.0.37 the default server.xml with the connector 
protocol="HTTP/1.1", installed tcnative and attribute 
useAprConnector="true" for the AprLifecycleListener actually starts an 
APR connector as documented and expected:


INFO [main] org.apache.coyote.AbstractProtocol.init Initializing 
ProtocolHandler ["http-apr-8080"]


Same situation starting with 9.0.38 (and at least until 9.0.44):

INFO [main] org.apache.coyote.AbstractProtocol.init Initializing 
ProtocolHandler ["http-nio-8080"]


I increased log level for a coupe of packages to FINEST and see the 
following differences during startup:


FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.catalina.core.AprLifecycleListener SSLEngine=on)
FINE [main] org.apache.tomcat.util.digester.SetPropertiesRule.begin 
[SetPropertiesRule]{Server/Listener} Setting property 'useAprConnector' 
to 'true'
FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.catalina.core.AprLifecycleListener useAprConnector=true)

### ONLY ADDRESS DIFFERENCE
-FINE [main] org.apache.tomcat.util.digester.SetNextRule.end 
[SetNextRule]{Server/Listener} Call 
org.apache.catalina.core.StandardServer.addLifecycleListener(org.apache.catalina.core.AprLifecycleListener@383534aa) 

+FINE [main] org.apache.tomcat.util.digester.SetNextRule.end 
[SetNextRule]{Server/Listener} Call 
org.apache.catalina.core.StandardServer.addLifecycleListener(org.apache.catalina.core.AprLifecycleListener@136432db) 

FINE [main] org.apache.tomcat.util.IntrospectionUtils.callMethod1 
IntrospectionUtils: callMethod1 org.apache.catalina.core.StandardServer 
org.apache.catalina.core.AprLifecycleListener 
org.apache.catalina.LifecycleListener
FINE [main] org.apache.tomcat.util.digester.ObjectCreateRule.end 
[ObjectCreateRule]{Server/Listener} Pop 
org.apache.catalina.core.AprLifecycleListener

 WRONG CLASS CHOSEN IN NEWER VERSIONS
-FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.coyote.http11.Http11AprProtocol port=8080)
+FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.coyote.http11.Http11NioProtocol port=8080)
FINE [main] org.apache.tomcat.util.digester.SetPropertiesRule.begin 
[SetPropertiesRule]{Server/Service/Connector} Setting property 
'protocol' to 'HTTP/1.1'

...

and after these lines the logs use consistenly APR versus NIO in the two 
versions. Both startup logs show the same


INFO [main] org.apache.catalina.core.AprLifecycleListener.lifecycleEvent 
Loaded Apache Tomcat Native library [1.2.27] using APR version [1.7.0].
INFO [main] org.apache.catalina.core.AprLifecycleListener.lifecycleEvent 
APR capabilities: IPv6 [true], sendfile [true], accept filters [false], 
random [true].
INFO [main] org.apache.catalina.core.AprLifecycleListener.lifecycleEvent 
APR/OpenSSL configuration: useAprConnector [true], useOpenSSL [true]
INFO [main] org.apache.catalina.core.AprLifecycleListener.initializeSSL 
OpenSSL successfully initialized [OpenSSL 1.1.1k  25 Mar 2021]


I didn't find an obvious reason in the changelog. Maybe an unwanted 
backport part from 10 or some startup order change.


I have not yet checked 8.5 etc.

Regards,

Rainer


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

AprLifecycleListener broken since 9.0.38?

[Rainer Jung]

Hi there,

a colleague of mine observed a change in behavior starting with TC 
9.0.38: until 9.0.37 the default server.xml with the connector 
protocol="HTTP/1.1", installed tcnative and attribute 
useAprConnector="true" for the AprLifecycleListener actually starts an 
APR connector as documented and expected:


INFO [main] org.apache.coyote.AbstractProtocol.init Initializing 
ProtocolHandler ["http-apr-8080"]


Same situation starting with 9.0.38 (and at least until 9.0.44):

INFO [main] org.apache.coyote.AbstractProtocol.init Initializing 
ProtocolHandler ["http-nio-8080"]


I increased log level for a coupe of packages to FINEST and see the 
following differences during startup:


 FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.catalina.core.AprLifecycleListener SSLEngine=on)
 FINE [main] org.apache.tomcat.util.digester.SetPropertiesRule.begin 
[SetPropertiesRule]{Server/Listener} Setting property 'useAprConnector' 
to 'true'
 FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.catalina.core.AprLifecycleListener useAprConnector=true)

### ONLY ADDRESS DIFFERENCE
-FINE [main] org.apache.tomcat.util.digester.SetNextRule.end 
[SetNextRule]{Server/Listener} Call 
org.apache.catalina.core.StandardServer.addLifecycleListener(org.apache.catalina.core.AprLifecycleListener@383534aa)
+FINE [main] org.apache.tomcat.util.digester.SetNextRule.end 
[SetNextRule]{Server/Listener} Call 
org.apache.catalina.core.StandardServer.addLifecycleListener(org.apache.catalina.core.AprLifecycleListener@136432db)
 FINE [main] org.apache.tomcat.util.IntrospectionUtils.callMethod1 
IntrospectionUtils: callMethod1 org.apache.catalina.core.StandardServer 
org.apache.catalina.core.AprLifecycleListener 
org.apache.catalina.LifecycleListener
 FINE [main] org.apache.tomcat.util.digester.ObjectCreateRule.end 
[ObjectCreateRule]{Server/Listener} Pop 
org.apache.catalina.core.AprLifecycleListener

 WRONG CLASS CHOSEN IN NEWER VERSIONS
-FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.coyote.http11.Http11AprProtocol port=8080)
+FINE [main] org.apache.tomcat.util.IntrospectionUtils.setProperty 
IntrospectionUtils: setProperty(class 
org.apache.coyote.http11.Http11NioProtocol port=8080)
 FINE [main] org.apache.tomcat.util.digester.SetPropertiesRule.begin 
[SetPropertiesRule]{Server/Service/Connector} Setting property 
'protocol' to 'HTTP/1.1'

...

and after these lines the logs use consistenly APR versus NIO in the two 
versions. Both startup logs show the same


INFO [main] org.apache.catalina.core.AprLifecycleListener.lifecycleEvent 
Loaded Apache Tomcat Native library [1.2.27] using APR version [1.7.0].
INFO [main] org.apache.catalina.core.AprLifecycleListener.lifecycleEvent 
APR capabilities: IPv6 [true], sendfile [true], accept filters [false], 
random [true].
INFO [main] org.apache.catalina.core.AprLifecycleListener.lifecycleEvent 
APR/OpenSSL configuration: useAprConnector [true], useOpenSSL [true]
INFO [main] org.apache.catalina.core.AprLifecycleListener.initializeSSL 
OpenSSL successfully initialized [OpenSSL 1.1.1k  25 Mar 2021]


I didn't find an obvious reason in the changelog. Maybe an unwanted 
backport part from 10 or some startup order change.


I have not yet checked 8.5 etc.

Regards,

Rainer

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

Re: TCK Signature for EL API

[Martin Grigorov]

Hi,

On Tue, Apr 6, 2021 at 7:22 PM Raymond Augé
 wrote:

> Great news! I'm both sad that the annotations caused you pain (the complete
> opposite was intended) and happy that you managed to work around the
> problem.
>
> It's not by coincidence that BND uses the intermediate state of the
> manifest to go between the annotations and the module info. However, I
> wasn't sure that this would cover all cases particularly w.r.t. the service
> loader handling. However, it appears it does.
>

I am not sure how exactly BND works but at [1] I see that ServiceConsumer
annotation has retention policy CLASS.
Would it be possible to use SOURCE instead ? This way at compile time it
could be used to generate module-info.class and be discarded, i.e. the
annotation won't be in the API .class


1.
https://github.com/bndtools/bnd/blob/ba0bd37c2c33afe4ccfd8660b1a37b1c1ac52eaa/biz.aQute.bnd.annotation/src/aQute/bnd/annotation/spi/ServiceConsumer.java#L33


>
> Sincerely,
> Ray
>
>
> On Tue, Apr 6, 2021 at 10:39 AM Mark Thomas  wrote:
>
> > On 02/04/2021 13:58, Raymond Augé wrote:
> > > I just wanted to make a note that removing the annotation will also
> mean
> > > that the module-info.java will need to be manually managed since bnd
> also
> > > generated that based on the annotations.
> >
> > Good news. I compared the module-info.class files for the EL API jar and
> > the WebSocket API jar between the 9.0.45 release (that used the
> > annotation) and a current build from source (that doesn't use the
> > annotation) and they are identical. On that basis I think we have a
> > working solution.
> >
> > Mark
> >
> >
> > >
> > > Just FYI,
> > > - Ray
> > >
> > > On Thu, Apr 1, 2021 at 4:40 AM Jean-Louis MONTEIRO  >
> > > wrote:
> > >
> > >> That's awesome news.
> > >>
> > >> I'm glad it's something that can be achieved without too much effort.
> > >> I understand and buy the pragmatic approach.
> > >>
> > >> But at the same time, if we can do a step forward and get even closer
> to
> > >> being certified, that'd be great.
> > >>
> > >> Le jeu. 1 avr. 2021 à 10:06, Mark Thomas  a écrit :
> > >>
> > >>> I've been playing with this a bit more and it appears we can simply
> > >>> hard-code the "Require-Capability" header in el-api.jar.bnd
> > >>>
> > >>> Having taken the time to look at the actual values generated for
> these
> > >>> API JARs, this does look like something that would be simple to
> > maintain
> > >>> manually - especially for the API JARs where adding a new use of
> > >>> ServiceLoader is likely to happen fairly rarely.
> > >>>
> > >>> We should be able to remove the Bnd annotation in
> > >>> - 10.0.x for 10.0.6 onwards
> > >>> - 9.0.x for 9.0.46 onwards
> > >>>
> > >>> We'll certainly do this for the API JARs. I think we'll leave it in
> > >>> place for the implementation JARs
> > >>>
> > >>> I have a few things on my TODO list at the moment but I don't see
> why I
> > >>> shouldn't be able to get this done for the May set of releases.
> > >>>
> > >>> Mark
> > >>>
> > >>>
> > >>> On 01/04/2021 08:24, Romain Manni-Bucau wrote:
> >  Hi,
> > 
> >  AFAIK TomEE will try to be certified and will try to not fork as
> much
> > >> as
> >  possible Tomcat code so can be neat to solve it in particular when
> >  relatively easy:
> > 
> >  1. compile tomcat classes with bnd as of today
> >  2. run bnd to get the manifest.mf (
> >  3. post process tomcat classes to remove bnd from the .class
> >  4. jar it
> > 
> >  should solve the process and does not look crazy compared to what
> > >> tomcat
> >  already does, no?
> > 
> >  Alternative is indeed to drop bnd since the manifest is quite easy
> to
> > >>> write
> >  manually or with an ant task to filter the version for tomcat case,
> at
> >  least for spec jars (it is harder for the impl but here bnd is
> fine).
> > 
> >  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 jeu. 1 avr. 2021 à 09:19, Mark Thomas  a
> écrit :
> > 
> > > On 31/03/2021 20:14, Volodymyr Siedlecki wrote:
> > >> Hello,
> > >>
> > >> It appears the TCK Signature tests will not be relaxed (see 1 &
> 2),
> > >> and I'm wondering how Tomcat will proceed with the bnd annotation
> in
> > >> the EL API? Will it be removed in the next release?
> > >
> > > Currently, there are no plans to change the Tomcat code.
> > >
> > > We do run the TCKs but take a pragmatic view of any failures. For
> > > example, the Servlet TCK test that tests setting a context path in
> > > web.xml always fails because T

[tomcat] branch 9.0.x updated: Update to new versions

[remm]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new a24f47a  Update to new versions
a24f47a is described below

commit a24f47a75920a68ba9f31953b9b7a3c8c4dc28a1
Author: remm 
AuthorDate: Wed Apr 7 10:10:52 2021 +0200

Update to new versions
---
 modules/cxf/pom.xml|  2 +-
 modules/owb/pom.xml|  4 ++--
 webapps/docs/changelog.xml | 10 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 4059716..a961832 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -29,7 +29,7 @@
 Apache CXF for Apache Tomcat CDI
 Apache CXF packaged for Apache Tomcat CDI
 
-3.4.2
+3.4.3
 jar
 
 
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index cda3eed..4899f13 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -29,14 +29,14 @@
 Apache Tomcat CDI 2 support
 Apache Tomcat CDI 2 support using Apache 
OpenWebBeans
 
-2.0.21
+2.0.22
 jar
 
 
 1.2
 1.2
 1.3
-9.0.43
+9.0.45
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 55e5ff8..b91a49c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,16 @@
   
 
   
+  
+
+  
+Update the OWB module to Apache OpenWebBeans 2.0.22. (remm)
+  
+  
+Update the CXF module to Apache CXF 3.4.3. (remm)
+  
+
+  
 
 
   

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

[tomcat] 05/06: Remove unnecessary code. imports never contains a null entry

[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 fa993e48f5281a76e2ba9f1c3698ae0590b257c2
Author: Mark Thomas 
AuthorDate: Thu Apr 1 21:22:49 2021 +0100

Remove unnecessary code. imports never contains a null entry
---
 java/org/apache/jasper/compiler/Generator.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 745fca6..4c36b08 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -616,9 +616,6 @@ class Generator {
 Set packages = new HashSet<>();
 Set classes = new HashSet<>();
 for (String importName : imports) {
-if (importName == null) {
-continue;
-}
 String trimmed = importName.trim();
 if (trimmed.endsWith(".*")) {
 packages.add(trimmed.substring(0, trimmed.length() - 2));

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

[tomcat] 06/06: Remove unnecessary code. There are always at least 3 package imports,

[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 032f503ee4fc3e27d371b4ba51b45453c97ec27c
Author: Mark Thomas 
AuthorDate: Thu Apr 1 21:23:21 2021 +0100

Remove unnecessary code. There are always at least 3 package imports,
---
 java/org/apache/jasper/compiler/Generator.java | 20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 4c36b08..37f2588 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -629,18 +629,16 @@ class Generator {
 out.println();
 out.printil("static {");
 out.pushIndent();
-if (packages.size() == 0) {
-out.printin("_jspx_imports_packages = null;");
-out.println();
-} else {
-out.printin("_jspx_imports_packages = new java.util.HashSet<>();");
-out.println();
-for (String packageName : packages) {
-out.printin("_jspx_imports_packages.add(\"");
-out.print(packageName);
-out.println("\");");
-}
+// Packages is never empty because o.a.j.Constants.STANDARD_IMPORTS
+// contains 3 packages and is always added to the imports.
+out.printin("_jspx_imports_packages = new java.util.HashSet<>();");
+out.println();
+for (String packageName : packages) {
+out.printin("_jspx_imports_packages.add(\"");
+out.print(packageName);
+out.println("\");");
 }
+// classes however, may be empty depending on the import declarations
 if (classes.size() == 0) {
 out.printin("_jspx_imports_classes = null;");
 out.println();

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

[tomcat] 03/06: Fix validation warnings

[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 4f106d48af341a40e7cc02e5b6e502cefc88eade
Author: Mark Thomas 
AuthorDate: Wed Apr 7 09:00:58 2021 +0100

Fix validation warnings
---
 test/webapp/WEB-INF/bugs.tld | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/webapp/WEB-INF/bugs.tld b/test/webapp/WEB-INF/bugs.tld
index ede1011..268e7ee 100644
--- a/test/webapp/WEB-INF/bugs.tld
+++ b/test/webapp/WEB-INF/bugs.tld
@@ -55,15 +55,16 @@
 Bug48701c
 org.apache.jasper.compiler.TestGenerator$Bug48701
 empty
-
-  beanName
-  java.lang.String
-
 
   beanName
   
org.apache.jasper.compiler.TestGenerator.Bean
   AT_END
 
+
+  beanName
+  true
+  java.lang.String
+
   
   
 Bug56529

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

[tomcat] 04/06: Remove unnecessary code. Cannot use default package in a JSP.

[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 763baeec6ac67905f2890be5f3147ee8f25234de
Author: Mark Thomas 
AuthorDate: Thu Apr 1 21:11:28 2021 +0100

Remove unnecessary code. Cannot use default package in a JSP.
---
 java/org/apache/jasper/compiler/Generator.java | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index a6c67a2..745fca6 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -557,13 +557,12 @@ class Generator {
 
 /**
  * Generate preamble package name (shared by servlet and tag handler
- * preamble generation)
+ * preamble generation). Package is always non-null as neither Servlets nor
+ * tags can use a default package.
  */
 private void genPreamblePackage(String packageName) {
-if (packageName != null && !packageName.isEmpty()) {
-out.printil("package " + packageName + ";");
-out.println();
-}
+out.printil("package " + packageName + ";");
+out.println();
 }
 
 /**

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

[tomcat] 02/06: Remove unnecessary code

[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 0af381c70e57f44f53aed6a0fb1ea76eb6791cb5
Author: Mark Thomas 
AuthorDate: Wed Mar 31 12:02:34 2021 +0100

Remove unnecessary code
---
 java/org/apache/jasper/compiler/Generator.java | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 633426d..a6c67a2 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -255,13 +255,11 @@ class Generator {
 @Override
 public void visit(Node.CustomTag n) throws JasperException {
 if (n.useTagPlugin()) {
-if (n.getAtSTag() != null) {
-n.getAtSTag().visit(this);
-}
+// If a custom tag is configured to use a plug-in
+// getAtSTag() and  getAtETag() will always be non-null
+n.getAtSTag().visit(this);
 visitBody(n);
-if (n.getAtETag() != null) {
-n.getAtETag().visit(this);
-}
+n.getAtETag().visit(this);
 } else {
 visitBody(n);
 }

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

[tomcat] 01/06: Remove unnecessary code. s cannot be null here

[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 d58a0728fcfba92f7ab30b1fbf3123e0087c01e4
Author: Mark Thomas 
AuthorDate: Wed Mar 31 09:17:41 2021 +0100

Remove unnecessary code. s cannot be null here
---
 java/org/apache/jasper/compiler/Generator.java | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 91c7555..633426d 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -138,22 +138,20 @@ class Generator {
  */
 static String quote(String s) {
 
-if (s == null)
+if (s == null) {
 return "null";
+}
 
 return '"' + escape(s) + '"';
 }
 
 /**
- * @param s
- *the input string
+ * @param s the input string - must not be {@code null}
+ *
  * @return escaped string, per Java rule
  */
 static String escape(String s) {
 
-if (s == null)
-return "";
-
 StringBuilder b = new StringBuilder();
 for (int i = 0; i < s.length(); i++) {
 char c = s.charAt(i);

-
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 (66e4aa2 -> 032f503)

[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 66e4aa2  Code formatting. Fix indent.
 new d58a072  Remove unnecessary code. s cannot be null here
 new 0af381c  Remove unnecessary code
 new 4f106d4  Fix validation warnings
 new 763baee  Remove unnecessary code. Cannot use default package in a JSP.
 new fa993e4  Remove unnecessary code. imports never contains a null entry
 new 032f503  Remove unnecessary code. There are always at least 3 package 
imports,

The 6 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/jasper/compiler/Generator.java | 52 +++---
 test/webapp/WEB-INF/bugs.tld   |  9 +++--
 2 files changed, 26 insertions(+), 35 deletions(-)

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

[tomcat] 06/06: Remove unnecessary code. There are always at least 3 package imports,

[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 d065ea851080afc039c98fcd2b45d114cf3921da
Author: Mark Thomas 
AuthorDate: Thu Apr 1 21:23:21 2021 +0100

Remove unnecessary code. There are always at least 3 package imports,
---
 java/org/apache/jasper/compiler/Generator.java | 20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index e51ad17..2e6509c 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -636,18 +636,16 @@ class Generator {
 out.println();
 out.printil("static {");
 out.pushIndent();
-if (packages.size() == 0) {
-out.printin("_jspx_imports_packages = null;");
-out.println();
-} else {
-out.printin("_jspx_imports_packages = new java.util.HashSet<>();");
-out.println();
-for (String packageName : packages) {
-out.printin("_jspx_imports_packages.add(\"");
-out.print(packageName);
-out.println("\");");
-}
+// Packages is never empty because o.a.j.Constants.STANDARD_IMPORTS
+// contains 3 packages and is always added to the imports.
+out.printin("_jspx_imports_packages = new java.util.HashSet<>();");
+out.println();
+for (String packageName : packages) {
+out.printin("_jspx_imports_packages.add(\"");
+out.print(packageName);
+out.println("\");");
 }
+// classes however, may be empty depending on the import declarations
 if (classes.size() == 0) {
 out.printin("_jspx_imports_classes = null;");
 out.println();

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

[tomcat] 05/06: Remove unnecessary code. imports never contains a null entry

[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 272936054d5180c8cd13899d9a341bdebe69348d
Author: Mark Thomas 
AuthorDate: Thu Apr 1 21:22:49 2021 +0100

Remove unnecessary code. imports never contains a null entry
---
 java/org/apache/jasper/compiler/Generator.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 246cf7d..e51ad17 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -623,9 +623,6 @@ class Generator {
 Set packages = new HashSet<>();
 Set classes = new HashSet<>();
 for (String importName : imports) {
-if (importName == null) {
-continue;
-}
 String trimmed = importName.trim();
 if (trimmed.endsWith(".*")) {
 packages.add(trimmed.substring(0, trimmed.length() - 2));

-
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 (97e6911 -> d065ea8)

[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 97e6911  Fix merge error
 new 41fe83f  Remove unnecessary code. s cannot be null here
 new 409a82b  Remove unnecessary code
 new 585f628  Fix validation warnings
 new 9d7a841  Remove unnecessary code. Cannot use default package in a JSP.
 new 2729360  Remove unnecessary code. imports never contains a null entry
 new d065ea8  Remove unnecessary code. There are always at least 3 package 
imports,

The 6 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/jasper/compiler/Generator.java | 52 +++---
 test/webapp/WEB-INF/bugs.tld   |  9 +++--
 2 files changed, 26 insertions(+), 35 deletions(-)

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

[tomcat] 04/06: Remove unnecessary code. Cannot use default package in a JSP.

[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 9d7a841d6d2381ed8462e4ede77c40a933dda3cf
Author: Mark Thomas 
AuthorDate: Thu Apr 1 21:11:28 2021 +0100

Remove unnecessary code. Cannot use default package in a JSP.
---
 java/org/apache/jasper/compiler/Generator.java | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 152c42a..246cf7d 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -564,13 +564,12 @@ class Generator {
 
 /**
  * Generate preamble package name (shared by servlet and tag handler
- * preamble generation)
+ * preamble generation). Package is always non-null as neither Servlets nor
+ * tags can use a default package.
  */
 private void genPreamblePackage(String packageName) {
-if (packageName != null && !packageName.isEmpty()) {
-out.printil("package " + packageName + ";");
-out.println();
-}
+out.printil("package " + packageName + ";");
+out.println();
 }
 
 /**

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

[tomcat] 02/06: Remove unnecessary code

[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 409a82b2779ca8fa37256f6e120234a1c3ded8c5
Author: Mark Thomas 
AuthorDate: Wed Mar 31 12:02:34 2021 +0100

Remove unnecessary code
---
 java/org/apache/jasper/compiler/Generator.java | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 5f9df54..152c42a 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -262,13 +262,11 @@ class Generator {
 @Override
 public void visit(Node.CustomTag n) throws JasperException {
 if (n.useTagPlugin()) {
-if (n.getAtSTag() != null) {
-n.getAtSTag().visit(this);
-}
+// If a custom tag is configured to use a plug-in
+// getAtSTag() and  getAtETag() will always be non-null
+n.getAtSTag().visit(this);
 visitBody(n);
-if (n.getAtETag() != null) {
-n.getAtETag().visit(this);
-}
+n.getAtETag().visit(this);
 } else {
 visitBody(n);
 }

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

[tomcat] 01/06: Remove unnecessary code. s cannot be null here

[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 41fe83f3605a42c614fb557567efc273ec72bc45
Author: Mark Thomas 
AuthorDate: Wed Mar 31 09:17:41 2021 +0100

Remove unnecessary code. s cannot be null here
---
 java/org/apache/jasper/compiler/Generator.java | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 396cd91..5f9df54 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -145,22 +145,20 @@ class Generator {
  */
 static String quote(String s) {
 
-if (s == null)
+if (s == null) {
 return "null";
+}
 
 return '"' + escape(s) + '"';
 }
 
 /**
- * @param s
- *the input string
+ * @param s the input string - must not be {@code null}
+ *
  * @return escaped string, per Java rule
  */
 static String escape(String s) {
 
-if (s == null)
-return "";
-
 StringBuilder b = new StringBuilder();
 for (int i = 0; i < s.length(); i++) {
 char c = s.charAt(i);

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

[tomcat] 03/06: Fix validation warnings

[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 585f628b1a68517b16b070466571aed2ecde2d7d
Author: Mark Thomas 
AuthorDate: Wed Apr 7 09:00:58 2021 +0100

Fix validation warnings
---
 test/webapp/WEB-INF/bugs.tld | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/webapp/WEB-INF/bugs.tld b/test/webapp/WEB-INF/bugs.tld
index ede1011..268e7ee 100644
--- a/test/webapp/WEB-INF/bugs.tld
+++ b/test/webapp/WEB-INF/bugs.tld
@@ -55,15 +55,16 @@
 Bug48701c
 org.apache.jasper.compiler.TestGenerator$Bug48701
 empty
-
-  beanName
-  java.lang.String
-
 
   beanName
   
org.apache.jasper.compiler.TestGenerator.Bean
   AT_END
 
+
+  beanName
+  true
+  java.lang.String
+
   
   
 Bug56529

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

[tomcat] 04/06: Remove unnecessary code. Cannot use default package in a JSP.

[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

commit afb6d44574b68954fd270c2172d23be0689198f0
Author: Mark Thomas 
AuthorDate: Thu Apr 1 21:11:28 2021 +0100

Remove unnecessary code. Cannot use default package in a JSP.
---
 java/org/apache/jasper/compiler/Generator.java | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 2333063..c2f96fb 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -548,13 +548,12 @@ class Generator {
 
 /**
  * Generate preamble package name (shared by servlet and tag handler
- * preamble generation)
+ * preamble generation). Package is always non-null as neither Servlets nor
+ * tags can use a default package.
  */
 private void genPreamblePackage(String packageName) {
-if (packageName != null && !packageName.isEmpty()) {
-out.printil("package " + packageName + ";");
-out.println();
-}
+out.printil("package " + packageName + ";");
+out.println();
 }
 
 /**

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

[tomcat] 03/06: Fix validation warnings

[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

commit 7112769e878aacdd388f75d796d6691627f5e717
Author: Mark Thomas 
AuthorDate: Wed Apr 7 09:00:58 2021 +0100

Fix validation warnings
---
 test/webapp/WEB-INF/bugs.tld | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/webapp/WEB-INF/bugs.tld b/test/webapp/WEB-INF/bugs.tld
index ede1011..268e7ee 100644
--- a/test/webapp/WEB-INF/bugs.tld
+++ b/test/webapp/WEB-INF/bugs.tld
@@ -55,15 +55,16 @@
 Bug48701c
 org.apache.jasper.compiler.TestGenerator$Bug48701
 empty
-
-  beanName
-  java.lang.String
-
 
   beanName
   
org.apache.jasper.compiler.TestGenerator.Bean
   AT_END
 
+
+  beanName
+  true
+  java.lang.String
+
   
   
 Bug56529

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

[tomcat] 01/06: Remove unnecessary code. s cannot be null here

[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

commit 28b4b98f522dfe311249193a25953abf4e7d2829
Author: Mark Thomas 
AuthorDate: Wed Mar 31 09:17:41 2021 +0100

Remove unnecessary code. s cannot be null here
---
 java/org/apache/jasper/compiler/Generator.java | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 09e1053..ff79296 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -129,22 +129,20 @@ class Generator {
  */
 static String quote(String s) {
 
-if (s == null)
+if (s == null) {
 return "null";
+}
 
 return '"' + escape(s) + '"';
 }
 
 /**
- * @param s
- *the input string
+ * @param s the input string - must not be {@code null}
+ *
  * @return escaped string, per Java rule
  */
 static String escape(String s) {
 
-if (s == null)
-return "";
-
 StringBuilder b = new StringBuilder();
 for (int i = 0; i < s.length(); i++) {
 char c = s.charAt(i);

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

[tomcat] 06/06: Remove unnecessary code. There are always at least 3 package imports,

[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

commit 27a0d770284ff54881d867c2fd9218030ca77097
Author: Mark Thomas 
AuthorDate: Thu Apr 1 21:23:21 2021 +0100

Remove unnecessary code. There are always at least 3 package imports,
---
 java/org/apache/jasper/compiler/Generator.java | 20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 91d4ddc..07de664 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -620,18 +620,16 @@ class Generator {
 out.println();
 out.printil("static {");
 out.pushIndent();
-if (packages.size() == 0) {
-out.printin("_jspx_imports_packages = null;");
-out.println();
-} else {
-out.printin("_jspx_imports_packages = new java.util.HashSet<>();");
-out.println();
-for (String packageName : packages) {
-out.printin("_jspx_imports_packages.add(\"");
-out.print(packageName);
-out.println("\");");
-}
+// Packages is never empty because o.a.j.Constants.STANDARD_IMPORTS
+// contains 3 packages and is always added to the imports.
+out.printin("_jspx_imports_packages = new java.util.HashSet<>();");
+out.println();
+for (String packageName : packages) {
+out.printin("_jspx_imports_packages.add(\"");
+out.print(packageName);
+out.println("\");");
 }
+// classes however, may be empty depending on the import declarations
 if (classes.size() == 0) {
 out.printin("_jspx_imports_classes = null;");
 out.println();

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

[tomcat] 02/06: Remove unnecessary code

[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

commit d96e744b3c02b05839e9ad753d4d43c95ff205e7
Author: Mark Thomas 
AuthorDate: Wed Mar 31 12:02:34 2021 +0100

Remove unnecessary code
---
 java/org/apache/jasper/compiler/Generator.java | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index ff79296..2333063 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -246,13 +246,11 @@ class Generator {
 @Override
 public void visit(Node.CustomTag n) throws JasperException {
 if (n.useTagPlugin()) {
-if (n.getAtSTag() != null) {
-n.getAtSTag().visit(this);
-}
+// If a custom tag is configured to use a plug-in
+// getAtSTag() and  getAtETag() will always be non-null
+n.getAtSTag().visit(this);
 visitBody(n);
-if (n.getAtETag() != null) {
-n.getAtETag().visit(this);
-}
+n.getAtETag().visit(this);
 } else {
 visitBody(n);
 }

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

[tomcat] 05/06: Remove unnecessary code. imports never contains a null entry

[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

commit 48424dc8c4108c1f561e7fd8d569dd6a61842d6f
Author: Mark Thomas 
AuthorDate: Thu Apr 1 21:22:49 2021 +0100

Remove unnecessary code. imports never contains a null entry
---
 java/org/apache/jasper/compiler/Generator.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index c2f96fb..91d4ddc 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -607,9 +607,6 @@ class Generator {
 Set packages = new HashSet<>();
 Set classes = new HashSet<>();
 for (String importName : imports) {
-if (importName == null) {
-continue;
-}
 String trimmed = importName.trim();
 if (trimmed.endsWith(".*")) {
 packages.add(trimmed.substring(0, trimmed.length() - 2));

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

[tomcat] branch master updated (d51a186 -> 27a0d77)

[markt]

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

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


from d51a186  Update to new versions
 new 28b4b98  Remove unnecessary code. s cannot be null here
 new d96e744  Remove unnecessary code
 new 7112769  Fix validation warnings
 new afb6d44  Remove unnecessary code. Cannot use default package in a JSP.
 new 48424dc  Remove unnecessary code. imports never contains a null entry
 new 27a0d77  Remove unnecessary code. There are always at least 3 package 
imports,

The 6 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/jasper/compiler/Generator.java | 52 +++---
 test/webapp/WEB-INF/bugs.tld   |  9 +++--
 2 files changed, 26 insertions(+), 35 deletions(-)

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

[tomcat] branch master updated: Update to new versions

[remm]

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

remm 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 d51a186  Update to new versions
d51a186 is described below

commit d51a1863f2dd9ccff4de4afe07399676fce16d29
Author: remm 
AuthorDate: Wed Apr 7 10:05:56 2021 +0200

Update to new versions
---
 modules/cxf/pom.xml|  2 +-
 modules/owb/pom.xml|  4 ++--
 modules/stuffed/pom.xml|  4 ++--
 webapps/docs/changelog.xml | 10 ++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 88ba629..ea0ab77 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -29,7 +29,7 @@
 Apache CXF for Apache Tomcat CDI
 Apache CXF packaged for Apache Tomcat CDI
 
-3.4.2
+3.4.3
 jar
 
 
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index e22c9bd..45b017e 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -29,14 +29,14 @@
 Apache Tomcat CDI 2 support
 Apache Tomcat CDI 2 support using Apache 
OpenWebBeans
 
-2.0.21
+2.0.22
 jar
 
 
 1.2
 1.2
 1.3
-10.0.2
+10.0.5
 
 
 
diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml
index 3d6f129..ded2fef 100644
--- a/modules/stuffed/pom.xml
+++ b/modules/stuffed/pom.xml
@@ -29,8 +29,8 @@
 
 UTF-8
 org.apache.catalina.startup.Tomcat
-10.0.2
-
+10.0.5
+
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2f03833..bbb9e60 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,16 @@
   
 
   
+  
+
+  
+Update the OWB module to Apache OpenWebBeans 2.0.22. (remm)
+  
+  
+Update the CXF module to Apache CXF 3.4.3. (remm)
+  
+
+  
 
 
   

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

svn commit: r1888464 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

[kkolinko]

Author: kkolinko
Date: Wed Apr  7 07:44:24 2021
New Revision: 1888464

URL: http://svn.apache.org/viewvc?rev=1888464&view=rev
Log:
Correct version typo in the announcement for Tomcat Native 1.2.27.

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1888464&r1=1888463&r2=1888464&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Apr  7 07:44:24 2021
@@ -40,7 +40,7 @@ Tomcat Native. The notable changes since
 
 
 https://tomcat.apache.org/download-native.cgi";>Download |
-ChangeLog for 1.2.26
+ChangeLog for 1.2.27
 
 2021-03-10 Tomcat 10.0.4 Released
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1888464&r1=1888463&r2=1888464&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Wed Apr  7 07:44:24 2021
@@ -52,7 +52,7 @@ Tomcat Native. The notable changes since
 
 
 Download |
-ChangeLog for 1.2.26
+ChangeLog for 1.2.27
 
 
 



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