(tomcat) branch main updated: Don't overwrite the initial exception with any subsequent exception

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 8910694963 Don't overwrite the initial exception with any subsequent 
exception
8910694963 is described below

commit 89106949633cd778939574960980d4cfcbdba915
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:03:42 2024 +

Don't overwrite the initial exception with any subsequent exception
---
 java/org/apache/coyote/Response.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index d0d7f2a54d..8bc89249b7 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -284,7 +284,9 @@ public final class Response {
  * @param ex The exception that occurred
  */
 public void setErrorException(Exception ex) {
-errorException = ex;
+if (errorException == null) {
+errorException = ex;
+}
 }
 
 


-
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: Don't overwrite the initial exception with any subsequent exception

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new afab76ec57 Don't overwrite the initial exception with any subsequent 
exception
afab76ec57 is described below

commit afab76ec57db3140997062ff3ca99dffe2b02b09
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:03:42 2024 +

Don't overwrite the initial exception with any subsequent exception
---
 java/org/apache/coyote/Response.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index 354634513d..b1d88ee267 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -288,7 +288,9 @@ public final class Response {
  * @param ex The exception that occurred
  */
 public void setErrorException(Exception ex) {
-errorException = ex;
+if (errorException == null) {
+errorException = ex;
+}
 }
 
 


-
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: Don't overwrite the initial exception with any subsequent exception

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 2f876d2997 Don't overwrite the initial exception with any subsequent 
exception
2f876d2997 is described below

commit 2f876d29974b79fdf5740470bca60a5678b177ea
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:03:42 2024 +

Don't overwrite the initial exception with any subsequent exception
---
 java/org/apache/coyote/Response.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index e1bed1c4e0..4af1c8a4c7 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -278,7 +278,9 @@ public final class Response {
  * @param ex The exception that occurred
  */
 public void setErrorException(Exception ex) {
-errorException = ex;
+if (errorException == null) {
+errorException = ex;
+}
 }
 
 


-
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: Don't overwrite the initial exception with any subsequent exception

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 0b4848acdd Don't overwrite the initial exception with any subsequent 
exception
0b4848acdd is described below

commit 0b4848acddac44944c07fe846e9b8046b53e7b59
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:03:42 2024 +

Don't overwrite the initial exception with any subsequent exception
---
 java/org/apache/coyote/Response.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index 9e11308278..930f2c19e3 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -275,7 +275,9 @@ public final class Response {
  * @param ex The exception that occurred
  */
 public void setErrorException(Exception ex) {
-errorException = ex;
+if (errorException == null) {
+errorException = ex;
+}
 }
 
 


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



(tomcat) branch main updated: Align error handling for CoyoteWriter and CoyoteOutputStream

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 6ee4600185 Align error handling for CoyoteWriter and CoyoteOutputStream
6ee4600185 is described below

commit 6ee4600185945c4c37ff81403c616bf9db3ec34f
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:10:19 2024 +

Align error handling for CoyoteWriter and CoyoteOutputStream

Prior to this change it was possible for errors on the
CoyoteOutputStream to be recorded against the wrong response if the
response was recycled during the call to realWriteBytes().
---
 .../catalina/connector/CoyoteOutputStream.java | 35 ++
 .../apache/catalina/connector/CoyoteWriter.java| 12 +---
 .../apache/catalina/connector/OutputBuffer.java|  7 -
 webapps/docs/changelog.xml |  7 +
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteOutputStream.java 
b/java/org/apache/catalina/connector/CoyoteOutputStream.java
index c61eebf8e5..9dd3f11197 100644
--- a/java/org/apache/catalina/connector/CoyoteOutputStream.java
+++ b/java/org/apache/catalina/connector/CoyoteOutputStream.java
@@ -78,7 +78,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(int i) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.writeByte(i);
+try {
+ob.writeByte(i);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -94,7 +99,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(byte[] b, int off, int len) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(b, off, len);
+try {
+ob.write(b, off, len);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -108,7 +118,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 if (from.remaining() == 0) {
 return;
 }
-ob.write(from);
+try {
+ob.write(from);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -121,7 +136,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 @Override
 public void flush() throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.flush();
+try {
+ob.flush();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -156,7 +176,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 
 @Override
 public void close() throws IOException {
-ob.close();
+try {
+ob.close();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 }
 
 @Override
diff --git a/java/org/apache/catalina/connector/CoyoteWriter.java 
b/java/org/apache/catalina/connector/CoyoteWriter.java
index 6eef35949d..6868156f0a 100644
--- a/java/org/apache/catalina/connector/CoyoteWriter.java
+++ b/java/org/apache/catalina/connector/CoyoteWriter.java
@@ -92,7 +92,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.flush();
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -130,7 +130,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(c);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -146,7 +146,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(buf, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -168,7 +168,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(s, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -313,4 +313,8 @@ public class CoyoteWriter extends PrintWriter {
 }
 
 
+private void setErrorException(Exception e) {
+error = true;
+ob.setErrorException(e);
+}
 }
diff --git a/java/org/apache/catalina/connector/OutputBuffer.java 
b/java/org/apac

(tomcat) branch 10.1.x updated: Align error handling for CoyoteWriter and CoyoteOutputStream

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 67584b93a0 Align error handling for CoyoteWriter and CoyoteOutputStream
67584b93a0 is described below

commit 67584b93a0dd4b447105540f76d318c8406d68c3
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:10:19 2024 +

Align error handling for CoyoteWriter and CoyoteOutputStream

Prior to this change it was possible for errors on the
CoyoteOutputStream to be recorded against the wrong response if the
response was recycled during the call to realWriteBytes().
---
 .../catalina/connector/CoyoteOutputStream.java | 35 ++
 .../apache/catalina/connector/CoyoteWriter.java| 12 +---
 .../apache/catalina/connector/OutputBuffer.java|  7 -
 webapps/docs/changelog.xml |  7 +
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteOutputStream.java 
b/java/org/apache/catalina/connector/CoyoteOutputStream.java
index 4096e4d38d..139b1e6eb5 100644
--- a/java/org/apache/catalina/connector/CoyoteOutputStream.java
+++ b/java/org/apache/catalina/connector/CoyoteOutputStream.java
@@ -78,7 +78,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(int i) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.writeByte(i);
+try {
+ob.writeByte(i);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -94,7 +99,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(byte[] b, int off, int len) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(b, off, len);
+try {
+ob.write(b, off, len);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -104,7 +114,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 public void write(ByteBuffer from) throws IOException {
 Objects.requireNonNull(from);
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(from);
+try {
+ob.write(from);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -117,7 +132,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 @Override
 public void flush() throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.flush();
+try {
+ob.flush();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -152,7 +172,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 
 @Override
 public void close() throws IOException {
-ob.close();
+try {
+ob.close();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 }
 
 @Override
diff --git a/java/org/apache/catalina/connector/CoyoteWriter.java 
b/java/org/apache/catalina/connector/CoyoteWriter.java
index 6eef35949d..6868156f0a 100644
--- a/java/org/apache/catalina/connector/CoyoteWriter.java
+++ b/java/org/apache/catalina/connector/CoyoteWriter.java
@@ -92,7 +92,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.flush();
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -130,7 +130,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(c);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -146,7 +146,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(buf, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -168,7 +168,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(s, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -313,4 +313,8 @@ public class CoyoteWriter extends PrintWriter {
 }
 
 
+private void setErrorException(Exception e) {
+error = true;
+ob.setErrorException(e);
+ 

(tomcat) branch 9.0.x updated: Align error handling for CoyoteWriter and CoyoteOutputStream

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 0f873149e5 Align error handling for CoyoteWriter and CoyoteOutputStream
0f873149e5 is described below

commit 0f873149e52c83307038e2d2347682b56d276fb9
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:10:19 2024 +

Align error handling for CoyoteWriter and CoyoteOutputStream

Prior to this change it was possible for errors on the
CoyoteOutputStream to be recorded against the wrong response if the
response was recycled during the call to realWriteBytes().
---
 .../catalina/connector/CoyoteOutputStream.java | 35 ++
 .../apache/catalina/connector/CoyoteWriter.java| 12 +---
 .../apache/catalina/connector/OutputBuffer.java|  7 -
 webapps/docs/changelog.xml |  7 +
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteOutputStream.java 
b/java/org/apache/catalina/connector/CoyoteOutputStream.java
index a6cb729b9e..40209b352e 100644
--- a/java/org/apache/catalina/connector/CoyoteOutputStream.java
+++ b/java/org/apache/catalina/connector/CoyoteOutputStream.java
@@ -78,7 +78,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(int i) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.writeByte(i);
+try {
+ob.writeByte(i);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -94,7 +99,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(byte[] b, int off, int len) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(b, off, len);
+try {
+ob.write(b, off, len);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -104,7 +114,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 public void write(ByteBuffer from) throws IOException {
 Objects.requireNonNull(from);
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(from);
+try {
+ob.write(from);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -117,7 +132,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 @Override
 public void flush() throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.flush();
+try {
+ob.flush();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -152,7 +172,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 
 @Override
 public void close() throws IOException {
-ob.close();
+try {
+ob.close();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 }
 
 @Override
diff --git a/java/org/apache/catalina/connector/CoyoteWriter.java 
b/java/org/apache/catalina/connector/CoyoteWriter.java
index 6eef35949d..6868156f0a 100644
--- a/java/org/apache/catalina/connector/CoyoteWriter.java
+++ b/java/org/apache/catalina/connector/CoyoteWriter.java
@@ -92,7 +92,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.flush();
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -130,7 +130,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(c);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -146,7 +146,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(buf, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -168,7 +168,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(s, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -313,4 +313,8 @@ public class CoyoteWriter extends PrintWriter {
 }
 
 
+private void setErrorException(Exception e) {
+error = true;
+ob.setErrorException(e);
+   

(tomcat) branch 8.5.x updated: Align error handling for CoyoteWriter and CoyoteOutputStream

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new fda5196f31 Align error handling for CoyoteWriter and CoyoteOutputStream
fda5196f31 is described below

commit fda5196f317d3d014b35969029ccddffd022563c
Author: Mark Thomas 
AuthorDate: Thu Feb 29 09:10:19 2024 +

Align error handling for CoyoteWriter and CoyoteOutputStream

Prior to this change it was possible for errors on the
CoyoteOutputStream to be recorded against the wrong response if the
response was recycled during the call to realWriteBytes().
---
 .../catalina/connector/CoyoteOutputStream.java | 35 ++
 .../apache/catalina/connector/CoyoteWriter.java| 12 +---
 .../apache/catalina/connector/OutputBuffer.java|  7 -
 webapps/docs/changelog.xml | 11 +++
 4 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteOutputStream.java 
b/java/org/apache/catalina/connector/CoyoteOutputStream.java
index a6cb729b9e..40209b352e 100644
--- a/java/org/apache/catalina/connector/CoyoteOutputStream.java
+++ b/java/org/apache/catalina/connector/CoyoteOutputStream.java
@@ -78,7 +78,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(int i) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.writeByte(i);
+try {
+ob.writeByte(i);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -94,7 +99,12 @@ public class CoyoteOutputStream extends ServletOutputStream {
 @Override
 public void write(byte[] b, int off, int len) throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(b, off, len);
+try {
+ob.write(b, off, len);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -104,7 +114,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 public void write(ByteBuffer from) throws IOException {
 Objects.requireNonNull(from);
 boolean nonBlocking = checkNonBlockingWrite();
-ob.write(from);
+try {
+ob.write(from);
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -117,7 +132,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 @Override
 public void flush() throws IOException {
 boolean nonBlocking = checkNonBlockingWrite();
-ob.flush();
+try {
+ob.flush();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 if (nonBlocking) {
 checkRegisterForWrite();
 }
@@ -152,7 +172,12 @@ public class CoyoteOutputStream extends 
ServletOutputStream {
 
 @Override
 public void close() throws IOException {
-ob.close();
+try {
+ob.close();
+} catch (IOException ioe) {
+ob.setErrorException(ioe);
+throw ioe;
+}
 }
 
 @Override
diff --git a/java/org/apache/catalina/connector/CoyoteWriter.java 
b/java/org/apache/catalina/connector/CoyoteWriter.java
index 6eef35949d..6868156f0a 100644
--- a/java/org/apache/catalina/connector/CoyoteWriter.java
+++ b/java/org/apache/catalina/connector/CoyoteWriter.java
@@ -92,7 +92,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.flush();
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -130,7 +130,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(c);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -146,7 +146,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(buf, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -168,7 +168,7 @@ public class CoyoteWriter extends PrintWriter {
 try {
 ob.write(s, off, len);
 } catch (IOException e) {
-error = true;
+setErrorException(e);
 }
 
 }
@@ -313,4 +313,8 @@ public class CoyoteWriter extends PrintWriter {
 }
 
 
+private void setErrorException(Exception e) {
+error = true;
+ob.setErrorException(e);
+ 

Buildbot success in on tomcat-9.0.x

2024-02-29 Thread buildbot
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/876
Blamelist: Mark Thomas , remm 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 9.0.x] 0f873149e52c83307038e2d2347682b56d276fb9


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



Re: [PR] Remove duplicate if statements from the OutputBuffer.close() method [tomcat]

2024-02-29 Thread via GitHub


rmaucher merged PR #703:
URL: https://github.com/apache/tomcat/pull/703


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

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

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


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



(tomcat) 01/01: Merge pull request #703 from RealTake/main

2024-02-29 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

commit b7a5b138b026a69c61132a7cb037365781021d1e
Merge: 6ee4600185 6f545896bd
Author: Rémy Maucherat 
AuthorDate: Thu Feb 29 16:05:43 2024 +0100

Merge pull request #703 from RealTake/main

Remove duplicate if statements from the OutputBuffer.close() method

 java/org/apache/catalina/connector/OutputBuffer.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)



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



(tomcat) branch main updated (6ee4600185 -> b7a5b138b0)

2024-02-29 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


from 6ee4600185 Align error handling for CoyoteWriter and CoyoteOutputStream
 add 6f545896bd Update OutputBuffer.java
 new b7a5b138b0 Merge pull request #703 from RealTake/main

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


Summary of changes:
 java/org/apache/catalina/connector/OutputBuffer.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


-
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: Merge pull request #703 from RealTake/main

2024-02-29 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 fde19a0759 Merge pull request #703 from RealTake/main
fde19a0759 is described below

commit fde19a07591bc671558144ac6f198b5bd1a5fdf9
Author: Rémy Maucherat 
AuthorDate: Thu Feb 29 16:05:43 2024 +0100

Merge pull request #703 from RealTake/main

Remove duplicate if statements from the OutputBuffer.close() method
---
 java/org/apache/catalina/connector/OutputBuffer.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/connector/OutputBuffer.java 
b/java/org/apache/catalina/connector/OutputBuffer.java
index 3b7bdc5fd5..de6dbd35fd 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -235,9 +235,7 @@ public class OutputBuffer extends Writer {
 if ((!coyoteResponse.isCommitted()) && 
(coyoteResponse.getContentLengthLong() == -1)) {
 // If this didn't cause a commit of the response, the final content
 // length can be calculated.
-if (!coyoteResponse.isCommitted()) {
-coyoteResponse.setContentLength(bb.remaining());
-}
+coyoteResponse.setContentLength(bb.remaining());
 }
 
 if (coyoteResponse.getStatus() == 
HttpServletResponse.SC_SWITCHING_PROTOCOLS) {


-
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: Merge pull request #703 from RealTake/main

2024-02-29 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 671965bca4 Merge pull request #703 from RealTake/main
671965bca4 is described below

commit 671965bca4dd13f655686d0f40af90632c80d8d0
Author: Rémy Maucherat 
AuthorDate: Thu Feb 29 16:05:43 2024 +0100

Merge pull request #703 from RealTake/main

Remove duplicate if statements from the OutputBuffer.close() method
---
 java/org/apache/catalina/connector/OutputBuffer.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/connector/OutputBuffer.java 
b/java/org/apache/catalina/connector/OutputBuffer.java
index 7a395c0f05..f522a09ad5 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -239,9 +239,7 @@ public class OutputBuffer extends Writer {
 // request since in that case no body should have been written and
 // setting a value of zero here will result in an explicit content
 // length of zero being set on the response.
-if (!coyoteResponse.isCommitted()) {
-coyoteResponse.setContentLength(bb.remaining());
-}
+coyoteResponse.setContentLength(bb.remaining());
 }
 
 if (coyoteResponse.getStatus() == 
HttpServletResponse.SC_SWITCHING_PROTOCOLS) {


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



[Bug 68692] New: Http11Nio2Protocol not using provided executor

2024-02-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68692

Bug ID: 68692
   Summary: Http11Nio2Protocol not using provided executor
   Product: Tomcat 9
   Version: 9.0.83
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: gabor.b...@blackrock.com
  Target Milestone: -

We're using NIO2 with a StandardThreadExecutor we declared in our server.xml,
and noticed in our logs that REST controllers run in a default thread pool,
i.e. thread names in the format Thread-x are logged, e.g.

2024-02-29 14:42:48,313 (Thread-6:[]) INFO ...

Upon further debugging we noticed that the threadGroup field of the
Nio2Endpoint is NULL. Looking at the source code, it seems that this condition
in the bind() method evaluates to false:

if (getExecutor() instanceof ExecutorService) {
threadGroup =
AsynchronousChannelGroup.withThreadPool((ExecutorService) getExecutor());
}

which makes sense, since StandardThreadExecutor doesn't implement
ExecutorService. We suspect that the NULL threadGroup causes NIO2 to use the
default thread pool.

If we specify the thread attributes on the connector itself instead of passing
an executor attribute, the correct channel group/thread pool is used:

2024-02-29 15:15:07,166 (http-nio2-1776-exec-7:[]) INFO ...

since in that case, the endpoint instantiates a standard ThreadPoolExecutor
which implements ExecutorService.

   if (getUseVirtualThreads()) {
executor = new VirtualThreadExecutor(getName() + "-virt-");
} else {
TaskQueue taskqueue = new TaskQueue();
TaskThreadFactory tf = new TaskThreadFactory(getName() + "-exec-",
daemon, getThreadPriority());
executor = new ThreadPoolExecutor(getMinSpareThreads(),
getMaxThreads(), 60, TimeUnit.SECONDS,taskqueue, tf);
taskqueue.setParent( (ThreadPoolExecutor) executor);
}

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



Buildbot failure in on tomcat-9.0.x

2024-02-29 Thread buildbot
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/877
Blamelist: Rémy Maucherat 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 9.0.x] 671965bca4dd13f655686d0f40af90632c80d8d0


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

  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-tck) 01/05: Update TCK group ID. Fix warnings in pom.

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 8eab85c10ff6ccbec041edc6737f19abb254fd84
Author: Mark Thomas 
AuthorDate: Thu Feb 29 15:23:03 2024 +

Update TCK group ID. Fix warnings in pom.
---
 el-tck/pom.xml | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/el-tck/pom.xml b/el-tck/pom.xml
index a644a3b..c902151 100644
--- a/el-tck/pom.xml
+++ b/el-tck/pom.xml
@@ -30,7 +30,7 @@
 
 
 
-jakartatck
+jakarta.tck
 jakarta-expression-language-tck
 ${tck.el.version}
 

(tomcat-tck) 03/05: Version updates. TCK group ID change

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 365ba8f834edaf9fbf49e9b4b90474540b74663f
Author: Mark Thomas 
AuthorDate: Thu Feb 29 15:28:45 2024 +

Version updates. TCK group ID change
---
 websocket-tck/pom.xml | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/websocket-tck/pom.xml b/websocket-tck/pom.xml
index 65f707e..8a180fe 100644
--- a/websocket-tck/pom.xml
+++ b/websocket-tck/pom.xml
@@ -30,7 +30,7 @@
 
 
 
-jakartatck
+jakarta.tck
 websocket-tck
 ${tck.websocket.version}
 
@@ -54,7 +54,7 @@
 test
 
 
-jakartatck
+jakarta.tck
 common
 ${tck.common.version}
 
@@ -89,7 +89,9 @@
 
 
 
+org.apache.maven.plugins
 maven-failsafe-plugin
+${failsafe.plugin.version}
 
 
 
@@ -100,7 +102,7 @@
 
 **/platform/**
 
-
jakartatck:websocket-tck
+
jakarta.tck:websocket-tck
 false
 
 localhost


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



(tomcat-tck) 04/05: First pass at adding JSP TCK

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit ca80e510e3096d563736b106fbaf960bd84ea5be
Author: Mark Thomas 
AuthorDate: Thu Feb 29 15:29:06 2024 +

First pass at adding JSP TCK
---
 README.md   |  22 ++
 jsp-tck/pom.xml | 124 
 2 files changed, 146 insertions(+)

diff --git a/README.md b/README.md
index f687d65..e24ac46 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,22 @@ At the moment, you will need to build the TCK locally (see 
below).
 
 1. `mvn verify`
 
+### Running the Servlet TCK
+
+1. Review the component TCK and Tomcat versions in `$TCK_TOMCAT/pom.xml` and 
edit as required.
+
+1. `cd $TOMCAT_TCK\servlet-tck`
+
+1. `mvn verify`
+
+### Running the JSP TCK
+
+1. Review the component TCK and Tomcat versions in `$TCK_TOMCAT/pom.xml` and 
edit as required.
+
+1. `cd $TOMCAT_TCK\jsp-tck`
+
+1. `mvn verify`
+
 ### Running against a local build of the TCK
 
 1. Checkout the tckrefactor branch of the jakarta-tck repository to `$TCK`
@@ -63,6 +79,12 @@ At the moment, you will need to build the TCK locally (see 
below).
cd $TCK/el
mvn install

+   cd $TCK/servlet
+   mvn install
+   
+   cd $TCK/jsp
+   mvn install
+   
cd $TCK/websocket
mvn install
 ```
diff --git a/jsp-tck/pom.xml b/jsp-tck/pom.xml
new file mode 100644
index 000..ed5df5a
--- /dev/null
+++ b/jsp-tck/pom.xml
@@ -0,0 +1,124 @@
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+jsp-tck
+jar
+4.0.0
+
+
+org.apache.tomcat
+tck
+11.0.0-SNAPSHOT
+../pom.xml
+
+
+
+
+jakarta.tck
+jakarta-pages-tck
+${tck.jsp.version}
+
+
+  
+jakarta.servlet.jsp
+jakarta.jsp-api
+  
+
+
+
+org.apache.tomcat
+tomcat-jasper-el
+${tomcat.version}
+test
+
+
+org.apache.tomcat.embed
+tomcat-embed-jasper
+${tomcat.version}
+test
+
+
+jakarta.tck
+common
+${tck.common.version}
+
+
+org.jboss.arquillian.container
+arquillian-tomcat-embedded-10
+${arquillian.tomcat.version}
+test
+
+
+org.jboss.arquillian.container
+arquillian-container-spi
+${arquillian.version}
+
+
+org.jboss.arquillian.test
+arquillian-test-api
+${arquillian.version}
+
+
+org.jboss.arquillian.junit5
+arquillian-junit5-container
+${arquillian.version}
+
+
+org.jboss.arquillian.junit5
+arquillian-junit5-core
+${arquillian.version}
+
+
+junit
+junit
+4.13.2
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+${failsafe.plugin.version}
+
+
+
+integration-test
+verify
+
+
+
jakarta.tck:jakarta-pages-tck
+false
+
+localhost
+8080
+
8443
+5
+true
+
com.sun.ts.tests.jsp.lib.implementation.sun.common.SunRIURL
+
${settings.localRepository}/org/apache/tomcat/tomcat-jsp-api/${tomcat.version}/tomcat-jsp-api-${tomcat.version}.jar:${settings.localRepository}/org/apache/tomcat/tomcat-el-api/11.0.0-M18-SNAPSHOT/tomcat-el-api-11.0.0-M18-SNAPSHOT.jar:${settings.localRepository}/org/apache/tomcat/tomcat-servlet-api/11.0.0-M18-SNAPSHOT/tomcat-servlet-api-11.0.0-M18-SNAPSHOT.jar:${env.JAVA_HOME}/jmods/java.base
+
+
+
+
+
+
+
+


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



(tomcat-tck) 05/05: The final 6.0.0 TCK has been staged

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 1af6a7d2f1192365f51b0891b97893f9d81bd11c
Author: Mark Thomas 
AuthorDate: Thu Feb 29 17:46:02 2024 +

The final 6.0.0 TCK has been staged
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8df9a7a..3933b6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
 11.0.0-M18-SNAPSHOT
 
 
-6.0.0-SNAPSHOT
+6.0.0
 6.0.0-SNAPSHOT
 4.0.0-SNAPSHOT
 10.0.0-SNAPSHOT


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



(tomcat-tck) branch main updated (d315c80 -> 1af6a7d)

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


from d315c80  Get the EL signature tests passing
 new 8eab85c  Update TCK group ID. Fix warnings in pom.
 new c921268  Version updates. Add JSP TCK (not complete yet)
 new 365ba8f  Version updates. TCK group ID change
 new ca80e51  First pass at adding JSP TCK
 new 1af6a7d  The final 6.0.0 TCK has been staged

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


Summary of changes:
 README.md  | 22 
 el-tck/pom.xml |  6 --
 {websocket-tck => jsp-tck}/pom.xml | 41 +++---
 pom.xml|  7 +--
 websocket-tck/pom.xml  |  8 +---
 5 files changed, 56 insertions(+), 28 deletions(-)
 copy {websocket-tck => jsp-tck}/pom.xml (75%)


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



(tomcat-tck) 02/05: Version updates. Add JSP TCK (not complete yet)

2024-02-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit c9212682edb8fde8014c4d88b52d216e92836408
Author: Mark Thomas 
AuthorDate: Thu Feb 29 15:28:20 2024 +

Version updates. Add JSP TCK (not complete yet)
---
 pom.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d80181a..8df9a7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,13 +36,15 @@
 
 6.0.0-SNAPSHOT
 6.0.0-SNAPSHOT
+4.0.0-SNAPSHOT
 10.0.0-SNAPSHOT
 
 
 10.0.0-SNAPSHOT
 1.8.0.Final
 1.2.0.Final
-5.7.2
+5.9.1
+3.2.5
 
 
 
@@ -62,6 +64,7 @@
 
 
 el-tck
+jsp-tck
 websocket-tck
 
 


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



[Bug 68495] Unable to find match between the canonical context and the URI presented by the user agent

2024-02-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68495

Noah Adams  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |---
 CC||nad...@cirqular.com

--- Comment #4 from Noah Adams  ---
Also encountering this bug on upgrading from Tomcat 9.0.73 to 9.0.85

After the upgrade I can replicate by logging in, bringing up a page, letting my
session expire and then submitting a POST.  It brings up the login page and
then after logging in throws a server error 500.

Downgrading back to 9.0.73 worked to fix it.  I am not running any sort of
monitoring agent.  It looks like the POST is getting mangled into a broken GET
somehow?

>From the access log:

10.64.249.226 - AN00040 [29/Feb/2024:13:53:24 -0600] "POST
e=ryan&fname=ryan&bed=&ssn=&idnum=&topNavSearc HTTP/1.1" 500 1891

Error thrown:

Feb 29, 2024 1:53:24 PM org.apache.catalina.core.StandardHostValve custom
SEVERE: Exception Processing ErrorPage[errorCode=500,
location=/error/ServletError.jsp]
java.lang.IllegalStateException: Unable to find match between the canonical
context path [/conline] and the URI presented by the user agent
[e=ryan&fname=ryan&bed=&ssn=&idnum=&topNavSearc]


We are running tomcat using Java 8 on a RHEL 7 machine.

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



svn commit: r1916061 - in /tomcat/site/trunk/docs/tck: ./ el-6.0.0-tomcat-11.0.0-M18-SNAPSHOT.txt

2024-02-29 Thread markt
Author: markt
Date: Thu Feb 29 20:57:11 2024
New Revision: 1916061

URL: http://svn.apache.org/viewvc?rev=1916061&view=rev
Log:
Add certification summary for EL 6.0.0 TCK with Tomcat 11.0.0-M18-SNAPSHOT

Added:
tomcat/site/trunk/docs/tck/
tomcat/site/trunk/docs/tck/el-6.0.0-tomcat-11.0.0-M18-SNAPSHOT.txt

Added: tomcat/site/trunk/docs/tck/el-6.0.0-tomcat-11.0.0-M18-SNAPSHOT.txt
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tck/el-6.0.0-tomcat-11.0.0-M18-SNAPSHOT.txt?rev=1916061&view=auto
==
--- tomcat/site/trunk/docs/tck/el-6.0.0-tomcat-11.0.0-M18-SNAPSHOT.txt (added)
+++ tomcat/site/trunk/docs/tck/el-6.0.0-tomcat-11.0.0-M18-SNAPSHOT.txt Thu Feb 
29 20:57:11 2024
@@ -0,0 +1,46 @@
+TCK Certification Summary
+=
+
+License:
+  The terms of the EFTL are acceptable.
+
+Product Name, Version and download URL:
+  Apache Tomcat
+  11.0.0-M18-SNAPSHOT (build 20240229.151453-26)
+  
https://repository.apache.org/content/groups/snapshots/org/apache/tomcat/tomcat-jasper-el/11.0.0-M18-SNAPSHOT/tomcat-jasper-el-11.0.0-M18-20240229.151453-26.jar
+
+Specification Name, Version and download URL:
+  Jakarta Expression Language
+  6.0.0
+  https://github.com/jakartaee/specifications/pull/701
+
+TCK Version, digital SHA-256 fingerprint and download URL
+  TCK
+  6.0.0
+  
https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee11/staged/eftl/jakarta-expression-language-tck-6.0.0.zip
+
+Implementation runtime Version(s) tested:
+  Apache Tomcat
+  11.0.0-M18-SNAPSHOT (build 20240229.151453-26)
+
+Public URL of TCK Results Summary:
+  https://tomcat.apache.org/tck/el-6.0.0-tomcat-11.0.0-M18-SNAPSHOT.txt
+
+Any Additional Specification Certification Requirements:
+  None
+
+Java runtime used to run the implementation:
+  Java 17 - Temurin 17.0.10
+  Java 21 - Temurin 21.0.2
+
+Summary of the information for the certification environment:
+  Ubuntu 22.04.4 LTS
+​  https://github.com/apache/tomcat-tck
+  hash 1af6a7d
+
+A statement attesting that all TCK requirements have been met, including any 
compatibility rules:
+  Confirmed
+
+Test results:
+  Java 17: Tests run: 361, Failures: 0, Errors: 0, Skipped: 0
+  Java 21: Tests run: 361, Failures: 0, Errors: 0, Skipped: 0



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



Re: svn commit: r1916061 - in /tomcat/site/trunk/docs/tck: ./ el-6.0.0-tomcat-11.0.0-M18-SNAPSHOT.txt

2024-02-29 Thread Mark Thomas

On 29/02/2024 20:57, ma...@apache.org wrote:

Author: markt
Date: Thu Feb 29 20:57:11 2024
New Revision: 1916061

URL: http://svn.apache.org/viewvc?rev=1916061&view=rev
Log:
Add certification summary for EL 6.0.0 TCK with Tomcat 11.0.0-M18-SNAPSHOT


This is a bit of an experiment. This particular certification is likely 
to be replaced once we have a proper 11.0.0-M18 release but I need a 
certified implementation to complete the release process for EL 6.0.0.


As my first attempt at a certification it is likely that that it will 
need some tweaks.


I'm expecting to need to certify Servlet, JSP and WebSocket towards the 
end of next month.


Medium to long term, my plan is to add certification to the nightly 
build process.


Mark

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



[Bug 68495] Unable to find match between the canonical context and the URI presented by the user agent

2024-02-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68495

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #5 from Mark Thomas  ---
No reproducible test case provided as required in comment #3 - returning to
WORKSFORME

-- 
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 68692] Http11Nio2Protocol not using provided executor

2024-02-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68692

--- Comment #1 from Remy Maucherat  ---
I think it is possible to upgrade the implementations to ExecutorService and I
will do that. However, NIO2 needs its own exclusive pool so it is probably not
very useful to configure a custom one like this.

-- 
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 68495] Unable to find match between the canonical context and the URI presented by the user agent

2024-02-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68495

--- Comment #6 from Noah Adams  ---
Lol, I'll try to get you the test case tomorrow.  I assure you that this is a
bug.

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



Re: [PR] remove unnecessary code in InputBuffer.available() [tomcat]

2024-02-29 Thread via GitHub


rmaucher commented on PR #704:
URL: https://github.com/apache/tomcat/pull/704#issuecomment-1972669485

   Thanks, but it looks equivalent to me.


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

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

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


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



Re: [PR] remove unnecessary code in InputBuffer.available() [tomcat]

2024-02-29 Thread via GitHub


rmaucher closed pull request #704: remove unnecessary code in 
InputBuffer.available()
URL: https://github.com/apache/tomcat/pull/704


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

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

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


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