date:20240901

(tomcat) branch 11.0.x updated: Fix workflow

2024-09-01 Thread remm

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

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


The following commit(s) were added to refs/heads/11.0.x by this push:
 new 6284e02a88 Fix workflow
6284e02a88 is described below

commit 6284e02a880d00f389c8942e8ec4d3b5543f8fb2
Author: remm 
AuthorDate: Sun Sep 1 11:01:30 2024 +0200

Fix workflow
---
 .github/workflows/ci.yml | 21 -
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 918dbe96ee..3bd36c6fc7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,12 +15,10 @@ name: Smoke Test
 on:
   push:
 branches:
-  - main
-  - 10.1.x
-  - 9.0.x
+  - 11.0.x
   pull_request:
 branches:
-  - main
+  - 11.0.x
 
 env:
   LC_ALL: en_US.UTF-8
@@ -32,19 +30,8 @@ jobs:
   matrix:
 isMain:
   - ${{ contains(github.ref, 'main') }}
-java: [ 17, 21, 22, 24-ea ]
-os: [ ubuntu-latest, windows-latest, macos-latest ]
-exclude:
-  - isMain: true
-java: 17
-  - os: windows-latest
-java: 21
-  - os: macos-latest
-java: 21
-  - os: windows-latest
-java: 24-ea
-  - os: macos-latest
-java: 24-ea
+java: [ 22 ]
+os: [ ubuntu-latest ]
 name: JDK${{ matrix.java }} ${{ matrix.os }}
 runs-on: ${{ matrix.os }}
 steps:


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

Re: (tomcat) branch 9.0.x updated: Fix imports

2024-09-01 Thread Mark Thomas


1 Sept 2024 09:22:03 r...@apache.org:


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 9a8848a10d Fix imports
9a8848a10d is described below

commit 9a8848a10d1fb2c166c00372ee2233a7cc252303
Author: remm 
AuthorDate: Sun Sep 1 10:21:50 2024 +0200

    Fix imports


Thanks.

Mark

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

(tomcat) branch 10.1.x updated: Fix Tomcat not sending close_notify with OpenSSLImplementation

2024-09-01 Thread remm

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 56b511a1c8 Fix Tomcat not sending close_notify with 
OpenSSLImplementation
56b511a1c8 is described below

commit 56b511a1c8bdf9b67f6244b33ab158d2d12ca947
Author: remm 
AuthorDate: Sun Sep 1 10:53:44 2024 +0200

Fix Tomcat not sending close_notify with OpenSSLImplementation

Port patch
---
 .../util/net/openssl/panama/OpenSSLEngine.java  | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java 
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 8bdd3d8b69..8aece600dc 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -370,8 +370,8 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // If isOutboundDone is set, then the data from the network BIO
 // was the close_notify message -- we are not required to wait
-// for the receipt the peer's close_notify message -- shutdown.
-if (isOutboundDone) {
+// for the receipt of the peer's close_notify message -- shutdown.
+if (isOutboundDone()) {
 shutdown();
 }
 
@@ -471,9 +471,6 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // protect against protocol overflow attack vector
 if (len > MAX_ENCRYPTED_PACKET_LENGTH) {
-isInboundDone = true;
-isOutboundDone = true;
-engineClosed = true;
 shutdown();
 throw new SSLException(sm.getString("engine.oversizedPacket"));
 }
@@ -549,7 +546,6 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 // Check to see if we received a close_notify message from the peer
 if (!receivedShutdown && (SSL_get_shutdown(state.ssl) & 
SSL_RECEIVED_SHUTDOWN()) == SSL_RECEIVED_SHUTDOWN()) {
 receivedShutdown = true;
-closeOutbound();
 closeInbound();
 }
 
@@ -603,7 +599,10 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 isInboundDone = true;
 engineClosed = true;
 
-shutdown();
+if (isOutboundDone()) {
+// Only call shutdown if there is no outbound data pending.
+shutdown();
+}
 
 if (accepted != Accepted.NOT && !receivedShutdown) {
 throw new SSLException(sm.getString("engine.inboundClose"));
@@ -1038,13 +1037,15 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // Check if we are in the shutdown phase
 if (engineClosed) {
-// Waiting to send the close_notify message
 if (BIO_ctrl_pending(state.networkBIO) != 0) {
+// Waiting to send the close_notify message
 return SSLEngineResult.HandshakeStatus.NEED_WRAP;
 }
 
-// Must be waiting to receive the close_notify message
-return SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+if (!isInboundDone()) {
+// Must be waiting to receive the close_notify message
+return SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+}
 }
 
 return SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;


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

(tomcat) branch 9.0.x updated: Fix imports

2024-09-01 Thread 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 9a8848a10d Fix imports
9a8848a10d is described below

commit 9a8848a10d1fb2c166c00372ee2233a7cc252303
Author: remm 
AuthorDate: Sun Sep 1 10:21:50 2024 +0200

Fix imports
---
 test/org/apache/coyote/http2/TestHttp2AccessLogs.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2AccessLogs.java 
b/test/org/apache/coyote/http2/TestHttp2AccessLogs.java
index ae9a9b5ace..45897bf0a6 100644
--- a/test/org/apache/coyote/http2/TestHttp2AccessLogs.java
+++ b/test/org/apache/coyote/http2/TestHttp2AccessLogs.java
@@ -22,10 +22,10 @@ import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
 import org.junit.Test;


-
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.0.x

2024-09-01 Thread buildbot

Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/1057
Blamelist: Mark Thomas , remm 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 9.0.x] 9a8848a10d1fb2c166c00372ee2233a7cc252303


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

(tomcat) branch 9.0.x updated: Fix Tomcat not sending close_notify with OpenSSLImplementation

2024-09-01 Thread 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 a171bf3909 Fix Tomcat not sending close_notify with 
OpenSSLImplementation
a171bf3909 is described below

commit a171bf3909c3964a8e298b31a87c45441eb649e3
Author: remm 
AuthorDate: Sun Sep 1 10:53:44 2024 +0200

Fix Tomcat not sending close_notify with OpenSSLImplementation

Port patch
---
 .../util/net/openssl/panama/OpenSSLEngine.java  | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java 
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 5ab85f6e8c..c4161263a8 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -370,8 +370,8 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // If isOutboundDone is set, then the data from the network BIO
 // was the close_notify message -- we are not required to wait
-// for the receipt the peer's close_notify message -- shutdown.
-if (isOutboundDone) {
+// for the receipt of the peer's close_notify message -- shutdown.
+if (isOutboundDone()) {
 shutdown();
 }
 
@@ -471,9 +471,6 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // protect against protocol overflow attack vector
 if (len > MAX_ENCRYPTED_PACKET_LENGTH) {
-isInboundDone = true;
-isOutboundDone = true;
-engineClosed = true;
 shutdown();
 throw new SSLException(sm.getString("engine.oversizedPacket"));
 }
@@ -549,7 +546,6 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 // Check to see if we received a close_notify message from the peer
 if (!receivedShutdown && (SSL_get_shutdown(state.ssl) & 
SSL_RECEIVED_SHUTDOWN()) == SSL_RECEIVED_SHUTDOWN()) {
 receivedShutdown = true;
-closeOutbound();
 closeInbound();
 }
 
@@ -603,7 +599,10 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 isInboundDone = true;
 engineClosed = true;
 
-shutdown();
+if (isOutboundDone()) {
+// Only call shutdown if there is no outbound data pending.
+shutdown();
+}
 
 if (accepted != Accepted.NOT && !receivedShutdown) {
 throw new SSLException(sm.getString("engine.inboundClose"));
@@ -1038,13 +1037,15 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // Check if we are in the shutdown phase
 if (engineClosed) {
-// Waiting to send the close_notify message
 if (BIO_ctrl_pending(state.networkBIO) != 0) {
+// Waiting to send the close_notify message
 return SSLEngineResult.HandshakeStatus.NEED_WRAP;
 }
 
-// Must be waiting to receive the close_notify message
-return SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+if (!isInboundDone()) {
+// Must be waiting to receive the close_notify message
+return SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+}
 }
 
 return SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;


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

(tomcat) branch 11.0.x updated: Fix Tomcat not sending close_notify with OpenSSLImplementation

2024-09-01 Thread remm

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

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


The following commit(s) were added to refs/heads/11.0.x by this push:
 new 84e75259fb Fix Tomcat not sending close_notify with 
OpenSSLImplementation
84e75259fb is described below

commit 84e75259fbe50309f7bffa92317744f38076b0be
Author: remm 
AuthorDate: Sun Sep 1 10:53:44 2024 +0200

Fix Tomcat not sending close_notify with OpenSSLImplementation

Port patch
---
 .../util/net/openssl/panama/OpenSSLEngine.java  | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java 
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index ac2c275fb2..a528df7676 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -370,8 +370,8 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // If isOutboundDone is set, then the data from the network BIO
 // was the close_notify message -- we are not required to wait
-// for the receipt the peer's close_notify message -- shutdown.
-if (isOutboundDone) {
+// for the receipt of the peer's close_notify message -- shutdown.
+if (isOutboundDone()) {
 shutdown();
 }
 
@@ -471,9 +471,6 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // protect against protocol overflow attack vector
 if (len > MAX_ENCRYPTED_PACKET_LENGTH) {
-isInboundDone = true;
-isOutboundDone = true;
-engineClosed = true;
 shutdown();
 throw new SSLException(sm.getString("engine.oversizedPacket"));
 }
@@ -549,7 +546,6 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 // Check to see if we received a close_notify message from the peer
 if (!receivedShutdown && (SSL_get_shutdown(state.ssl) & 
SSL_RECEIVED_SHUTDOWN()) == SSL_RECEIVED_SHUTDOWN()) {
 receivedShutdown = true;
-closeOutbound();
 closeInbound();
 }
 
@@ -603,7 +599,10 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 isInboundDone = true;
 engineClosed = true;
 
-shutdown();
+if (isOutboundDone()) {
+// Only call shutdown if there is no outbound data pending.
+shutdown();
+}
 
 if (accepted != Accepted.NOT && !receivedShutdown) {
 throw new SSLException(sm.getString("engine.inboundClose"));
@@ -1038,13 +1037,15 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // Check if we are in the shutdown phase
 if (engineClosed) {
-// Waiting to send the close_notify message
 if (BIO_ctrl_pending(state.networkBIO) != 0) {
+// Waiting to send the close_notify message
 return SSLEngineResult.HandshakeStatus.NEED_WRAP;
 }
 
-// Must be waiting to receive the close_notify message
-return SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+if (!isInboundDone()) {
+// Must be waiting to receive the close_notify message
+return SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+}
 }
 
 return SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;


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

(tomcat) branch main updated: Fix Tomcat not sending close_notify with OpenSSLImplementation

2024-09-01 Thread remm

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 424c4cf22d Fix Tomcat not sending close_notify with 
OpenSSLImplementation
424c4cf22d is described below

commit 424c4cf22d63fc753912083c250edcf1f21d9261
Author: remm 
AuthorDate: Sun Sep 1 10:53:44 2024 +0200

Fix Tomcat not sending close_notify with OpenSSLImplementation

Port patch
---
 .../util/net/openssl/panama/OpenSSLEngine.java  | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java 
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index ac2c275fb2..a528df7676 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -370,8 +370,8 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // If isOutboundDone is set, then the data from the network BIO
 // was the close_notify message -- we are not required to wait
-// for the receipt the peer's close_notify message -- shutdown.
-if (isOutboundDone) {
+// for the receipt of the peer's close_notify message -- shutdown.
+if (isOutboundDone()) {
 shutdown();
 }
 
@@ -471,9 +471,6 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // protect against protocol overflow attack vector
 if (len > MAX_ENCRYPTED_PACKET_LENGTH) {
-isInboundDone = true;
-isOutboundDone = true;
-engineClosed = true;
 shutdown();
 throw new SSLException(sm.getString("engine.oversizedPacket"));
 }
@@ -549,7 +546,6 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 // Check to see if we received a close_notify message from the peer
 if (!receivedShutdown && (SSL_get_shutdown(state.ssl) & 
SSL_RECEIVED_SHUTDOWN()) == SSL_RECEIVED_SHUTDOWN()) {
 receivedShutdown = true;
-closeOutbound();
 closeInbound();
 }
 
@@ -603,7 +599,10 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 isInboundDone = true;
 engineClosed = true;
 
-shutdown();
+if (isOutboundDone()) {
+// Only call shutdown if there is no outbound data pending.
+shutdown();
+}
 
 if (accepted != Accepted.NOT && !receivedShutdown) {
 throw new SSLException(sm.getString("engine.inboundClose"));
@@ -1038,13 +1037,15 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
 
 // Check if we are in the shutdown phase
 if (engineClosed) {
-// Waiting to send the close_notify message
 if (BIO_ctrl_pending(state.networkBIO) != 0) {
+// Waiting to send the close_notify message
 return SSLEngineResult.HandshakeStatus.NEED_WRAP;
 }
 
-// Must be waiting to receive the close_notify message
-return SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+if (!isInboundDone()) {
+// Must be waiting to receive the close_notify message
+return SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+}
 }
 
 return SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;


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

(tomcat) branch 11.0.x updated: Fix workflow

Re: (tomcat) branch 9.0.x updated: Fix imports

(tomcat) branch 10.1.x updated: Fix Tomcat not sending close_notify with OpenSSLImplementation

(tomcat) branch 9.0.x updated: Fix imports

Buildbot success in on tomcat-9.0.x

(tomcat) branch 9.0.x updated: Fix Tomcat not sending close_notify with OpenSSLImplementation

(tomcat) branch 11.0.x updated: Fix Tomcat not sending close_notify with OpenSSLImplementation

(tomcat) branch main updated: Fix Tomcat not sending close_notify with OpenSSLImplementation

8 matches

Site Navigation

Mail list logo

Footer information