Re: [PR] Improve the SSLValve so it is able to handle the ssl_client_escaped_cert header from Nginx [tomcat]

2024-05-16 Thread via GitHub


ehsaasprogram commented on PR #406:
URL: https://github.com/apache/tomcat/pull/406#issuecomment-2116423996

   There are many complaints against https://ehsaasprogramme8171.pk/";>Ehsaas Programpeople are not 
receiving money


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



[Bug 69016] HttpURLConnection getOutputStream createCapacityException

2024-05-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69016

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #2 from Mark Thomas  ---
And the sample code used to generate the response that triggers this behaviour?

Looks like the Servlet isn't writing a response body so we need to see that
code.

-- 
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 success in on tomcat-11.0.x

2024-05-16 Thread buildbot
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/1096
Blamelist: remm 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch main] 8ab881a9d4bb5ad9cd0099ec4c619d759d55532f


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  shell_6: 0

  compile: 1

  shell_7: 0

  shell_8: 0

  shell_9: 0

  shell_10: 0

  Rsync docs to nightlies.apache.org: 0

  shell_11: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_12: 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-native) branch 1.3.x updated: Fix a crash on Windows in SSLContext.setCACertificate()

2024-05-16 Thread michaelo
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/1.3.x by this push:
 new e77dcb05d Fix a crash on Windows in SSLContext.setCACertificate()
e77dcb05d is described below

commit e77dcb05d395e7dec6ed071a332af0e7287e0c35
Author: Michael Osipov 
AuthorDate: Thu May 16 17:48:26 2024 +0200

Fix a crash on Windows in SSLContext.setCACertificate()
---
 native/src/sslcontext.c   | 2 +-
 xdocs/miscellaneous/changelog.xml | 7 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index e3d67131d..76662cc09 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -709,7 +709,7 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext, 
setCACertificate)(TCN_STDARGS,
 SSL_CTX_set_client_CA_list(c->ctx, ca_certs);
 }
 else {
-if (!SSL_add_file_cert_subjects_to_stack(ca_certs, J2S(file)))
+if (file != NULL && !SSL_add_file_cert_subjects_to_stack(ca_certs, 
J2S(file)))
 ca_certs = NULL;
 }
 if (ca_certs == NULL && c->verify_mode == SSL_CVERIFY_REQUIRE) {
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 027f715f7..d88705ed6 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -33,6 +33,13 @@
 
 
   
+
+  Fix a crash on Windows when SSLContext.setCACertificate()
+  is invoked with a null value for 
caCertificateFile
+  and a non-null value for caCertificatePath
+  until properly addressed with
+  https://github.com/openssl/openssl/issues/24416. (michaelo)
+
   
 
 


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



(tomcat-native) branch main updated: Fix a crash on Windows in SSLContext.setCACertificate()

2024-05-16 Thread michaelo
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 745455f12 Fix a crash on Windows in SSLContext.setCACertificate()
745455f12 is described below

commit 745455f127e3181c75f694d5821eead9d5ab4c00
Author: Michael Osipov 
AuthorDate: Thu May 16 17:48:26 2024 +0200

Fix a crash on Windows in SSLContext.setCACertificate()
---
 native/src/sslcontext.c   | 2 +-
 xdocs/miscellaneous/changelog.xml | 7 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index 9fbe7a19b..72feb4324 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -708,7 +708,7 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext, 
setCACertificate)(TCN_STDARGS,
 SSL_CTX_set_client_CA_list(c->ctx, ca_certs);
 }
 else {
-if (!SSL_add_file_cert_subjects_to_stack(ca_certs, J2S(file)))
+if (file != NULL && !SSL_add_file_cert_subjects_to_stack(ca_certs, 
J2S(file)))
 ca_certs = NULL;
 }
 if (ca_certs == NULL && c->verify_mode == SSL_CVERIFY_REQUIRE) {
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 5d16781b6..5ee7eacf0 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -33,6 +33,13 @@
 
 
   
+
+  Fix a crash on Windows when SSLContext.setCACertificate()
+  is invoked with a null value for 
caCertificateFile
+  and a non-null value for caCertificatePath
+  until properly addressed with
+  https://github.com/openssl/openssl/issues/24416. (michaelo)
+
   
 
 


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



Buildbot failure in on tomcat-11.0.x

2024-05-16 Thread buildbot
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/1095
Blamelist: remm 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch main] 556a7c39b13db5f5f97b38ee4bcf7ec3f43e94f1


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  shell_6: 0

  compile: 1

  shell_7: 0

  shell_8: 0

  shell_9: 0

  shell_10: 0

  Rsync docs to nightlies.apache.org: 0

  shell_11: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

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



[Bug 69016] HttpURLConnection getOutputStream createCapacityException

2024-05-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69016

--- Comment #1 from Raffaele Tripodo  ---
Created attachment 39719
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=39719&action=edit
exception screenshot

this is the exception thrown running this line:

DataOutputStream out = new DataOutputStream(conn.getOutputStream())

-- 
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 69016] New: HttpURLConnection getOutputStream createCapacityException

2024-05-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69016

Bug ID: 69016
   Summary: HttpURLConnection getOutputStream
createCapacityException
   Product: Tomcat 9
   Version: 9.0.89
  Hardware: All
OS: All
Status: NEW
  Severity: blocker
  Priority: P2
 Component: Util
  Assignee: dev@tomcat.apache.org
  Reporter: raffaele.trip...@3ware.it
  Target Milestone: -

Hello,
a simple code to download pdf file (generated by a servlet) is working fine in
Apache Tomcat 9.0.87, but the same exact code throws an excpetion in Apache
Tomcat 9.0.89.

This is the code

URL url = URI.create(address).toURL();
HttpURLConnection conn = (HttpURLConnection)
url.openConnection();

if (!params.isEmpty())
{
byte[] postData = String.join("&",
params).getBytes(Charset.forName("UTF-8"));
int postDataLength = postData.length;

conn.setDoInput(true);
conn.setDoOutput(true);
conn.setRequestMethod("POST");
conn.setRequestProperty("Content-Type",
"application/x-www-form-urlencoded");
conn.setRequestProperty("Content-Length",
Integer.toString(postDataLength));
conn.setRequestProperty("Charset", "utf-8");
conn.setConnectTimeout(1000 * 15);
conn.setReadTimeout(1000 * 30);

// here is the error!
try (DataOutputStream dos = new
DataOutputStream(conn.getOutputStream()))
{
dos.write(postData);
dos.flush();
dos.close();
}
}

try (InputStream in = conn.getInputStream())
{
if (tempFile)
{
file =
File.createTempFile("getUrlFile", ".tmp");

try (FileOutputStream out = new
FileOutputStream(file))
{
copyBinaryStream(in, out);
}
}

content = getTextStream(in);
}

The same code works fine in previous version.

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



(tomcat) branch 10.1.x updated: Fix FFM impl name

2024-05-16 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 baa0ebcf6d Fix FFM impl name
baa0ebcf6d is described below

commit baa0ebcf6d8b1620cf376cf2c09d34abd0495643
Author: remm 
AuthorDate: Thu May 16 16:57:46 2024 +0200

Fix FFM impl name
---
 test/org/apache/catalina/valves/rewrite/TestResolverSSL.java | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java 
b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
index 978ab23c25..0fcecf1f4b 100644
--- a/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
+++ b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
@@ -51,11 +51,12 @@ public class TestResolverSSL extends TomcatBaseTest {
 @Parameterized.Parameters(name = "{0}")
 public static Collection parameters() {
 List parameterSets = new ArrayList<>();
-parameterSets.add(new Object[] { "JSSE", Boolean.FALSE, 
"org.apache.tomcat.util.net.jsse.JSSEImplementation" });
-parameterSets.add(
-new Object[] { "OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation" });
-parameterSets.add(
-new Object[] { "OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation" });
+parameterSets.add(new Object[] {
+"JSSE", Boolean.FALSE, 
"org.apache.tomcat.util.net.jsse.JSSEImplementation"});
+parameterSets.add(new Object[] {
+"OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
+parameterSets.add(new Object[] {
+"OpenSSL-FFM", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
 
 return parameterSets;
 }


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



(tomcat) branch main updated: Fix FFM impl name

2024-05-16 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 8ab881a9d4 Fix FFM impl name
8ab881a9d4 is described below

commit 8ab881a9d4bb5ad9cd0099ec4c619d759d55532f
Author: remm 
AuthorDate: Thu May 16 16:57:46 2024 +0200

Fix FFM impl name
---
 test/org/apache/catalina/valves/rewrite/TestResolverSSL.java | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java 
b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
index 978ab23c25..0fcecf1f4b 100644
--- a/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
+++ b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
@@ -51,11 +51,12 @@ public class TestResolverSSL extends TomcatBaseTest {
 @Parameterized.Parameters(name = "{0}")
 public static Collection parameters() {
 List parameterSets = new ArrayList<>();
-parameterSets.add(new Object[] { "JSSE", Boolean.FALSE, 
"org.apache.tomcat.util.net.jsse.JSSEImplementation" });
-parameterSets.add(
-new Object[] { "OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation" });
-parameterSets.add(
-new Object[] { "OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation" });
+parameterSets.add(new Object[] {
+"JSSE", Boolean.FALSE, 
"org.apache.tomcat.util.net.jsse.JSSEImplementation"});
+parameterSets.add(new Object[] {
+"OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
+parameterSets.add(new Object[] {
+"OpenSSL-FFM", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
 
 return parameterSets;
 }


-
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: Modernize and add FFM

2024-05-16 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 3a70074a97 Modernize and add FFM
3a70074a97 is described below

commit 3a70074a9714f410b844e18cea5d226896f39e92
Author: remm 
AuthorDate: Thu May 16 16:48:14 2024 +0200

Modernize and add FFM
---
 .../tomcat/util/net/openssl/TestOpenSSLConf.java   | 65 --
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java 
b/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
index 74e8f3b608..f614b0d18c 100644
--- a/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
+++ b/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
@@ -16,8 +16,12 @@
  */
 package org.apache.tomcat.util.net.openssl;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.hamcrest.CoreMatchers;
@@ -26,9 +30,13 @@ import org.hamcrest.MatcherAssert;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
 
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.core.AprLifecycleListener;
+import org.apache.catalina.core.OpenSSLLifecycleListener;
 import org.apache.catalina.core.StandardServer;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -36,8 +44,24 @@ import org.apache.tomcat.jni.SSLContext;
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.TesterSupport;
 
+@RunWith(Parameterized.class)
 public class TestOpenSSLConf extends TomcatBaseTest {
 
+@Parameterized.Parameters(name = "{0}")
+public static Collection parameters() {
+List parameterSets = new ArrayList<>();
+parameterSets.add(
+new Object[] { 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation" });
+parameterSets.add(
+new Object[] { 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation" });
+
+return parameterSets;
+}
+
+@Parameter(0)
+public String sslImplementationName;
+
+
 private static final String ENABLED_CIPHER = "AES256-SHA256";
 private static final String[] EXPECTED_CIPHERS = {ENABLED_CIPHER};
 private static final String[] ENABLED_PROTOCOLS = {"TLSv1.1"};
@@ -61,7 +85,19 @@ public class TestOpenSSLConf extends TomcatBaseTest {
 
 TesterSupport.initSsl(tomcat);
 
-Assert.assertTrue(connector.setProperty("sslImplementationName", 
OpenSSLImplementation.class.getName()));
+
Assert.assertTrue(tomcat.getConnector().setProperty("sslImplementationName", 
sslImplementationName));
+
+if 
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
+AprLifecycleListener listener = new AprLifecycleListener();
+Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
+StandardServer server = (StandardServer) tomcat.getServer();
+server.addLifecycleListener(listener);
+} else if 
("org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation".equals(sslImplementationName))
 {
+OpenSSLLifecycleListener listener = new OpenSSLLifecycleListener();
+Assume.assumeTrue(OpenSSLLifecycleListener.isAvailable());
+StandardServer server = (StandardServer) tomcat.getServer();
+server.addLifecycleListener(listener);
+}
 
 OpenSSLConf conf = new OpenSSLConf();
 for (int i = 0; i < commands.length;) {
@@ -95,7 +131,17 @@ public class TestOpenSSLConf extends TomcatBaseTest {
 String[] ciphers = sslHostConfig.getEnabledCiphers();
 MatcherAssert.assertThat("Wrong HostConfig ciphers", ciphers,
 CoreMatchers.is(EXPECTED_CIPHERS));
-ciphers = 
SSLContext.getCiphers(sslHostConfig.getOpenSslContext().longValue());
+if 
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
+ciphers = 
SSLContext.getCiphers(sslHostConfig.getOpenSslContext().longValue());
+} else {
+Class memorySegmentClass = 
Class.forName("java.lang.foreign.MemorySegment");
+Object ssxCtxSegment = memorySegmentClass.getMethod("ofAddress", 
Long.TYPE)
+.invoke(null, sslHostConfig.getOpenSslContext());
+Method getCiphersMethod = 
Class.forName("org.apache.tomcat.util.net.openssl.panama.OpenSSLContext")
+.getDeclaredMethod("getCiphers", memorySegmentClass);
+getCiphersMethod.setAccessible(true);
+ciphers = (String[]) get

(tomcat) branch main updated: Modernize and add FFM

2024-05-16 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 556a7c39b1 Modernize and add FFM
556a7c39b1 is described below

commit 556a7c39b13db5f5f97b38ee4bcf7ec3f43e94f1
Author: remm 
AuthorDate: Thu May 16 16:48:14 2024 +0200

Modernize and add FFM
---
 .../tomcat/util/net/openssl/TestOpenSSLConf.java   | 65 --
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java 
b/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
index 74e8f3b608..f614b0d18c 100644
--- a/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
+++ b/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
@@ -16,8 +16,12 @@
  */
 package org.apache.tomcat.util.net.openssl;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.hamcrest.CoreMatchers;
@@ -26,9 +30,13 @@ import org.hamcrest.MatcherAssert;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
 
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.core.AprLifecycleListener;
+import org.apache.catalina.core.OpenSSLLifecycleListener;
 import org.apache.catalina.core.StandardServer;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -36,8 +44,24 @@ import org.apache.tomcat.jni.SSLContext;
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.TesterSupport;
 
+@RunWith(Parameterized.class)
 public class TestOpenSSLConf extends TomcatBaseTest {
 
+@Parameterized.Parameters(name = "{0}")
+public static Collection parameters() {
+List parameterSets = new ArrayList<>();
+parameterSets.add(
+new Object[] { 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation" });
+parameterSets.add(
+new Object[] { 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation" });
+
+return parameterSets;
+}
+
+@Parameter(0)
+public String sslImplementationName;
+
+
 private static final String ENABLED_CIPHER = "AES256-SHA256";
 private static final String[] EXPECTED_CIPHERS = {ENABLED_CIPHER};
 private static final String[] ENABLED_PROTOCOLS = {"TLSv1.1"};
@@ -61,7 +85,19 @@ public class TestOpenSSLConf extends TomcatBaseTest {
 
 TesterSupport.initSsl(tomcat);
 
-Assert.assertTrue(connector.setProperty("sslImplementationName", 
OpenSSLImplementation.class.getName()));
+
Assert.assertTrue(tomcat.getConnector().setProperty("sslImplementationName", 
sslImplementationName));
+
+if 
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
+AprLifecycleListener listener = new AprLifecycleListener();
+Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
+StandardServer server = (StandardServer) tomcat.getServer();
+server.addLifecycleListener(listener);
+} else if 
("org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation".equals(sslImplementationName))
 {
+OpenSSLLifecycleListener listener = new OpenSSLLifecycleListener();
+Assume.assumeTrue(OpenSSLLifecycleListener.isAvailable());
+StandardServer server = (StandardServer) tomcat.getServer();
+server.addLifecycleListener(listener);
+}
 
 OpenSSLConf conf = new OpenSSLConf();
 for (int i = 0; i < commands.length;) {
@@ -95,7 +131,17 @@ public class TestOpenSSLConf extends TomcatBaseTest {
 String[] ciphers = sslHostConfig.getEnabledCiphers();
 MatcherAssert.assertThat("Wrong HostConfig ciphers", ciphers,
 CoreMatchers.is(EXPECTED_CIPHERS));
-ciphers = 
SSLContext.getCiphers(sslHostConfig.getOpenSslContext().longValue());
+if 
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
+ciphers = 
SSLContext.getCiphers(sslHostConfig.getOpenSslContext().longValue());
+} else {
+Class memorySegmentClass = 
Class.forName("java.lang.foreign.MemorySegment");
+Object ssxCtxSegment = memorySegmentClass.getMethod("ofAddress", 
Long.TYPE)
+.invoke(null, sslHostConfig.getOpenSslContext());
+Method getCiphersMethod = 
Class.forName("org.apache.tomcat.util.net.openssl.panama.OpenSSLContext")
+.getDeclaredMethod("getCiphers", memorySegmentClass);
+getCiphersMethod.setAccessible(true);
+ciphers = (String[]) getCiph

(tomcat-native) branch 1.3.x updated: Add missing newlines to printf statements

2024-05-16 Thread michaelo
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/1.3.x by this push:
 new 6ddbab7fe Add missing newlines to printf statements
6ddbab7fe is described below

commit 6ddbab7fe4ac9e5c82ec26c5a2ba66ead8b405bd
Author: Michael Osipov 
AuthorDate: Thu May 16 16:35:38 2024 +0200

Add missing newlines to printf statements
---
 native/src/sslcontext.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index 660aed768..e3d67131d 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -721,13 +721,13 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext, 
setCACertificate)(TCN_STDARGS,
 BIO_printf(c->bio_os,
 "[WARN] Oops, you want to request client "
 "authentication, but no CAs are known for "
-"verification!?");
+"verification!?\n");
 }
 else {
 fprintf(stderr,
 "[WARN] Oops, you want to request client "
 "authentication, but no CAs are known for "
-"verification!?");
+"verification!?\n");
 }
 
 }
@@ -1680,10 +1680,10 @@ TCN_IMPLEMENT_CALL(void, SSLContext, 
setSessionTicketKeys)(TCN_STDARGS, jlong ct
 
 if ((*e)->GetArrayLength(e, keys) != TICKET_KEYS_SIZE) {
 if (c->bio_os) {
-BIO_printf(c->bio_os, "[ERROR] Session ticket keys provided were 
wrong size.");
+BIO_printf(c->bio_os, "[ERROR] Session ticket keys provided were 
wrong size.\n");
 }
 else {
-fprintf(stderr, "[ERROR] Session ticket keys provided were wrong 
size.");
+fprintf(stderr, "[ERROR] Session ticket keys provided were wrong 
size.\n");
 }
 exit(1);
 }


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



Re: (tomcat-native) branch main updated: Use ERR_error_string_n instead of ERR_error_string.

2024-05-16 Thread Michael Osipov
Not for 1.3.x?

On 2024/05/15 13:14:56 schu...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> schultz pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
> 
> 
> The following commit(s) were added to refs/heads/main by this push:
>  new 4eaa5c93c Use ERR_error_string_n instead of ERR_error_string.
> 4eaa5c93c is described below
> 
> commit 4eaa5c93c632f1ea80e889b5458d5b95f57b59a2
> Author: Christopher Schultz 
> AuthorDate: Wed May 15 09:14:14 2024 -0400
> 
> Use ERR_error_string_n instead of ERR_error_string.
> 
> Use header-defined constant for error message buffer sizes.
> ---
>  native/include/ssl_private.h |  5 +++
>  native/src/ssl.c |  8 ++---
>  native/src/sslconf.c | 16 +-
>  native/src/sslcontext.c  | 76 
> ++--
>  4 files changed, 55 insertions(+), 50 deletions(-)
> 
> diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
> index 6c5c9d297..96e21275c 100644
> --- a/native/include/ssl_private.h
> +++ b/native/include/ssl_private.h
> @@ -67,6 +67,11 @@ extern ENGINE *tcn_ssl_engine;
>  #define SSL_AIDX_ECC (3)
>  #define SSL_AIDX_MAX (4)
>  
> +/*
> + * The length of error message strings. MUST BE AT LEAST 256.
> + */
> +#define TCN_OPENSSL_ERROR_STRING_LENGTH 256
> +
>  /*
>   * Define the SSL options
>   */
> diff --git a/native/src/ssl.c b/native/src/ssl.c
> index 7624a4e67..838300c53 100644
> --- a/native/src/ssl.c
> +++ b/native/src/ssl.c
> @@ -1114,9 +1114,9 @@ TCN_IMPLEMENT_CALL(jbyteArray, SSL, 
> getPeerCertificate)(TCN_STDARGS,
>  
>  TCN_IMPLEMENT_CALL(jstring, SSL, getErrorString)(TCN_STDARGS, jlong number)
>  {
> -char buf[256];
> +char buf[TCN_OPENSSL_ERROR_STRING_LENGTH];
>  UNREFERENCED(o);
> -ERR_error_string(number, buf);
> +ERR_error_string_n(number, buf, TCN_OPENSSL_ERROR_STRING_LENGTH);
>  return tcn_new_string(e, buf);
>  }
>  
> @@ -1278,8 +1278,8 @@ TCN_IMPLEMENT_CALL(jboolean, SSL, 
> setCipherSuites)(TCN_STDARGS, jlong ssl,
>  return JNI_FALSE;
>  }
>  if (!SSL_set_cipher_list(ssl_, J2S(ciphers))) {
> -char err[256];
> -ERR_error_string(SSL_ERR_get(), err);
> +char err[TCN_OPENSSL_ERROR_STRING_LENGTH];
> +ERR_error_string_n(SSL_ERR_get(), err, 
> TCN_OPENSSL_ERROR_STRING_LENGTH);
>  tcn_Throw(e, "Unable to configure permitted SSL ciphers (%s)", err);
>  rv = JNI_FALSE;
>  }
> diff --git a/native/src/sslconf.c b/native/src/sslconf.c
> index e5b18a7ce..02c3513b1 100644
> --- a/native/src/sslconf.c
> +++ b/native/src/sslconf.c
> @@ -94,8 +94,8 @@ TCN_IMPLEMENT_CALL(jlong, SSLConf, make)(TCN_STDARGS, jlong 
> pool,
>  ec = SSL_ERR_get();
>  if (!cctx || ec != 0) {
>  if (ec != 0) {
> -char err[256];
> -ERR_error_string(ec, err);
> +char err[TCN_OPENSSL_ERROR_STRING_LENGTH];
> +ERR_error_string_n(ec, err, TCN_OPENSSL_ERROR_STRING_LENGTH);
>  tcn_Throw(e, "Could not create SSL_CONF context (%s)", err);
>  } else {
>  tcn_Throw(e, "Could not create SSL_CONF context");
> @@ -167,8 +167,8 @@ TCN_IMPLEMENT_CALL(jint, SSLConf, check)(TCN_STDARGS, 
> jlong cctx,
>  value_type = SSL_CONF_cmd_value_type(c->cctx, J2S(cmd));
>  ec = SSL_ERR_get();
>  if (ec != 0) {
> -char err[256];
> -ERR_error_string(ec, err);
> +char err[TCN_OPENSSL_ERROR_STRING_LENGTH];
> +ERR_error_string_n(ec, err, TCN_OPENSSL_ERROR_STRING_LENGTH);
>  tcn_Throw(e, "Could not determine SSL_CONF command type for '%s' 
> (%s)", J2S(cmd), err);
>  return 0;
>  }
> @@ -270,8 +270,8 @@ TCN_IMPLEMENT_CALL(jint, SSLConf, apply)(TCN_STDARGS, 
> jlong cctx,
>  ec = SSL_ERR_get();
>  if (rc <= 0 || ec != 0) {
>  if (ec != 0) {
> -char err[256];
> -ERR_error_string(ec, err);
> +char err[TCN_OPENSSL_ERROR_STRING_LENGTH];
> +ERR_error_string_n(ec, err, TCN_OPENSSL_ERROR_STRING_LENGTH);
>  tcn_Throw(e, "Could not apply SSL_CONF command '%s' with value 
> '%s' (%s)", J2S(cmd), buf != NULL ? buf : J2S(value), err);
>  } else {
>  tcn_Throw(e, "Could not apply SSL_CONF command '%s' with value 
> '%s'", J2S(cmd), buf != NULL ? buf : J2S(value));
> @@ -302,8 +302,8 @@ TCN_IMPLEMENT_CALL(jint, SSLConf, finish)(TCN_STDARGS, 
> jlong cctx)
>  ec = SSL_ERR_get();
>  if (rc <= 0 || ec != 0) {
>  if (ec != 0) {
> -char err[256];
> -ERR_error_string(ec, err);
> +char err[TCN_OPENSSL_ERROR_STRING_LENGTH];
> +ERR_error_string_n(ec, err, TCN_OPENSSL_ERROR_STRING_LENGTH);
>  tcn_Throw(e, "Could not finish SSL_CONF commands (%s)", err);
>  } else {
>  tcn_Throw(e, "Could not finish SSL_CONF commands");
> 

Re: (tomcat-native) branch main updated: Ensure local reference capacity is available for array allocations.

2024-05-16 Thread Michael Osipov
Not for 1.3.x?

On 2024/05/16 13:52:45 schu...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> schultz pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
> 
> 
> The following commit(s) were added to refs/heads/main by this push:
>  new e49f0fe5c Ensure local reference capacity is available for array 
> allocations.
> e49f0fe5c is described below
> 
> commit e49f0fe5c26612df01c636e7019cd70d78948976
> Author: Christopher Schultz 
> AuthorDate: Thu May 16 09:51:45 2024 -0400
> 
> Ensure local reference capacity is available for array allocations.
> ---
>  native/src/jnilib.c | 14 --
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/native/src/jnilib.c b/native/src/jnilib.c
> index 342df3b9c..836502c52 100644
> --- a/native/src/jnilib.c
> +++ b/native/src/jnilib.c
> @@ -133,6 +133,9 @@ jstring tcn_new_stringn(JNIEnv *env, const char *str, 
> size_t l)
>  
>  jbyteArray tcn_new_arrayb(JNIEnv *env, const unsigned char *data, size_t len)
>  {
> +if ((*env)->EnsureLocalCapacity(env, 1) < 0) {
> +return NULL; /* out of memory error */
> +}
>  jbyteArray bytes = (*env)->NewByteArray(env, (jsize)len);
>  if (bytes != NULL) {
>  (*env)->SetByteArrayRegion(env, bytes, 0, (jint)len, (jbyte *)data);
> @@ -142,15 +145,22 @@ jbyteArray tcn_new_arrayb(JNIEnv *env, const unsigned 
> char *data, size_t len)
>  
>  jobjectArray tcn_new_arrays(JNIEnv *env, size_t len)
>  {
> +if ((*env)->EnsureLocalCapacity(env, 1) < 0) {
> +return NULL; /* out of memory error */
> +}
>  return (*env)->NewObjectArray(env, (jsize)len, jString_class, NULL);
>  }
>  
>  jstring tcn_new_string(JNIEnv *env, const char *str)
>  {
> -if (!str)
> +if (!str) {
>  return NULL;
> -else
> +} else {
> +if ((*env)->EnsureLocalCapacity(env, 1) < 0) {
> +return NULL; /* out of memory error */
> +}
>  return (*env)->NewStringUTF(env, str);
> +}
>  }
>  
>  char *tcn_get_string(JNIEnv *env, jstring jstr)
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 

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



(tomcat-native) branch main updated: Add missing newlines to printf statements

2024-05-16 Thread michaelo
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 6a6a6b239 Add missing newlines to printf statements
6a6a6b239 is described below

commit 6a6a6b2395036c6a6cabb2b8af22aa329e438436
Author: Michael Osipov 
AuthorDate: Thu May 16 16:35:38 2024 +0200

Add missing newlines to printf statements
---
 native/src/sslcontext.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index a7951f53f..9fbe7a19b 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -720,13 +720,13 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext, 
setCACertificate)(TCN_STDARGS,
 BIO_printf(c->bio_os,
 "[WARN] Oops, you want to request client "
 "authentication, but no CAs are known for "
-"verification!?");
+"verification!?\n");
 }
 else {
 fprintf(stderr,
 "[WARN] Oops, you want to request client "
 "authentication, but no CAs are known for "
-"verification!?");
+"verification!?\n");
 }
 
 }
@@ -1679,10 +1679,10 @@ TCN_IMPLEMENT_CALL(void, SSLContext, 
setSessionTicketKeys)(TCN_STDARGS, jlong ct
 
 if ((*e)->GetArrayLength(e, keys) != TICKET_KEYS_SIZE) {
 if (c->bio_os) {
-BIO_printf(c->bio_os, "[ERROR] Session ticket keys provided were 
wrong size.");
+BIO_printf(c->bio_os, "[ERROR] Session ticket keys provided were 
wrong size.\n");
 }
 else {
-fprintf(stderr, "[ERROR] Session ticket keys provided were wrong 
size.");
+fprintf(stderr, "[ERROR] Session ticket keys provided were wrong 
size.\n");
 }
 exit(1);
 }


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



Re: [I] activemq 5.16.x not working after converting javax to jakarta using tomcat transformer [tomcat-jakartaee-migration]

2024-05-16 Thread via GitHub


ilapavuluri closed issue #55: activemq 5.16.x not working after converting 
javax to jakarta using tomcat transformer
URL: https://github.com/apache/tomcat-jakartaee-migration/issues/55


-- 
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-native) branch main updated: Ensure local reference capacity is available for array allocations.

2024-05-16 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new e49f0fe5c Ensure local reference capacity is available for array 
allocations.
e49f0fe5c is described below

commit e49f0fe5c26612df01c636e7019cd70d78948976
Author: Christopher Schultz 
AuthorDate: Thu May 16 09:51:45 2024 -0400

Ensure local reference capacity is available for array allocations.
---
 native/src/jnilib.c | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/native/src/jnilib.c b/native/src/jnilib.c
index 342df3b9c..836502c52 100644
--- a/native/src/jnilib.c
+++ b/native/src/jnilib.c
@@ -133,6 +133,9 @@ jstring tcn_new_stringn(JNIEnv *env, const char *str, 
size_t l)
 
 jbyteArray tcn_new_arrayb(JNIEnv *env, const unsigned char *data, size_t len)
 {
+if ((*env)->EnsureLocalCapacity(env, 1) < 0) {
+return NULL; /* out of memory error */
+}
 jbyteArray bytes = (*env)->NewByteArray(env, (jsize)len);
 if (bytes != NULL) {
 (*env)->SetByteArrayRegion(env, bytes, 0, (jint)len, (jbyte *)data);
@@ -142,15 +145,22 @@ jbyteArray tcn_new_arrayb(JNIEnv *env, const unsigned 
char *data, size_t len)
 
 jobjectArray tcn_new_arrays(JNIEnv *env, size_t len)
 {
+if ((*env)->EnsureLocalCapacity(env, 1) < 0) {
+return NULL; /* out of memory error */
+}
 return (*env)->NewObjectArray(env, (jsize)len, jString_class, NULL);
 }
 
 jstring tcn_new_string(JNIEnv *env, const char *str)
 {
-if (!str)
+if (!str) {
 return NULL;
-else
+} else {
+if ((*env)->EnsureLocalCapacity(env, 1) < 0) {
+return NULL; /* out of memory error */
+}
 return (*env)->NewStringUTF(env, str);
+}
 }
 
 char *tcn_get_string(JNIEnv *env, jstring jstr)


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



Re: Buildbot failure in on tomcat-10.1.x

2024-05-16 Thread Rémy Maucherat
On Thu, May 16, 2024 at 12:20 PM Mark Thomas  wrote:
>
> On 16/05/2024 11:17, Mark Thomas wrote:
> > On 16/05/2024 10:34, Rémy Maucherat wrote:
> >> On Thu, May 16, 2024 at 10:57 AM  wrote:
> >>>
> >>> Build status: BUILD FAILED: failed compile (failure)
> >>> Worker used: bb_worker2_ubuntu
> >>> URL: https://ci2.apache.org/#builders/44/builds/1265
> >>> Blamelist: remm 
> >>> Build Text: failed compile (failure)
> >>> Status Detected: new failure
> >>> Build Source Stamp: [branch 10.1.x]
> >>> bbb4a7b3f7522189678447794b27f1033285df5a
> >>
> >> I cannot really figure out why this one is failing.
> >> https://nightlies.apache.org/tomcat/tomcat-10.1.x/logs/1265/TEST-org.apache.catalina.users.TestDataSourceUserDatabase.NIO.txt
> >>
> >> Derby on CI would be compiled with Java 19 (??) and running on 17 (no
> >> surprise). Testing locally shows the Derby JAR running fine on Java
> >> 17.
> >>
> >> Any ideas ?
> >
> > Hex editor confirms that class files in derby-10.17.1.0.jar target Java
> > 19 (and the MANIFEST says they were compiled with Java 21).
> >
> > The tests fail for me when running on Java 17.
> >
> > Targeting Java 19 is unexpected. I'll look into what the Derby docs say.
>
> Docs say:
> - Derby 10.16.1.1 targets Java 17
> - Derby 10.17.1.0 targets Java 21 (although it only requires Java 21)
>
> Looks like we need to downgrade the version of Derby we use.

Thanks ! I retried and it fails as expected with Java 17. I had an
earlier problem like that and my Fedora acts really weird when I don't
set JAVA_HOME. Setting it makes things more predictable, I need to be
more careful with that it seems.

Rémy

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

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



Re: [tcnative] jnilib.c: tcn_new_array* do not call EnsureLocalCapacity

2024-05-16 Thread Christopher Schultz

Mark,

On 5/15/24 15:49, Mark Thomas wrote:

On 15/05/2024 13:53, Christopher Schultz wrote:

All,

We have a few functions in jnilib.c that create new local references 
e.g. tcn_new_stringn and most of them call EnsureLocalCapacity to make 
sure the thread doesn't run out of local references.


I'm fairly sure that calling New*Array will fail if such references 
cannot be created, but the other methods make this protected call 
beforehand and I feel like we should be consistent.


Any objections to me adding calls to EnsureLocalCapacity in 
tcn_new_array* functions?


+1 to be being consistent.


Ack.

No strong view on whether that means adding them where they are missing 
or just removing the ones we currently have.


The Internets seem to say that running out of local references is 
entirely possible even with today's monstrous JVMs. I think it's worth 
adding the calls. They are probably very cheap, anyway, like checking to 
see if a stack pointer has collided with something else.


-chris

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



Re: [tcnative] Should we make DEBUG builds available for Windows?

2024-05-16 Thread Christopher Schultz

Mark,

On 5/15/24 15:58, Mark Thomas wrote:

On 15/05/2024 14:12, Christopher Schultz wrote:

IIRC, building a debug version just involves adding something obvious 
like /DEBUG to the compiler and/or linker and/or NOT stripping-out the 
debug symbols after the build is complete.


Would this represent a burden on the release manager to produce both 
kinds of builds for an official release?


The make file already includes a DEBUG target. We'd just need to confirm 
it meet our requirements. Running an additional build isn't too 
burdensome. If you want OpenSSL and APR compiled in debug mode too then 
that could me a little more work.


Yeah, I think we would want that, which means we need two complete 
builds from start to finish. I don't know how the Windows compiler and 
linker work very well. On Linux, it's common to strip debug symbols at 
the very end. Can we build everything with debug info and then produce 
two final libraries: one including those symbols and one with them 
stripped-out?


In my dissassembly and investigation into that error message, the 
function doesn't look like it's from tcnative but actually one of the 
statically-linked objects bundled with it. On other hand, the likelihood 
of the bug being in tcnative is very high compared to APR or OpenSSL, so 
having only the debug symbols from tcnative itself would be better than 
nothing.


-chris

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



svn commit: r69239 - in /release/tomcat: tomcat-11/v11.0.0-M19/ tomcat-9/v9.0.88/

2024-05-16 Thread markt
Author: markt
Date: Thu May 16 10:39:13 2024
New Revision: 69239

Log:
Drop old versions from CDN

Removed:
release/tomcat/tomcat-11/v11.0.0-M19/
release/tomcat/tomcat-9/v9.0.88/


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

2024-05-16 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 31d33fbfa7 Add release date for 10.1.24
31d33fbfa7 is described below

commit 31d33fbfa74c6cf6a14a14fd269e694e6da28fb0
Author: Mark Thomas 
AuthorDate: Thu May 16 11:33:49 2024 +0100

Add release date for 10.1.24
---
 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 1fc87de59e..959d0824f4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,7 +122,7 @@
 
   
 
-
+
   
 
   


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



(tomcat) branch main updated: Add release date for 11.0.0-M20

2024-05-16 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 822c76b713 Add release date for 11.0.0-M20
822c76b713 is described below

commit 822c76b7132e7bf06740779679f8721809c4fe7d
Author: Mark Thomas 
AuthorDate: Thu May 16 11:32:47 2024 +0100

Add release date for 11.0.0-M20
---
 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 277c6b0c4e..9385c86de5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,7 +122,7 @@
 
   
 
-
+
   
 
   


-
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: Revert Derby to 10.16.1.1

2024-05-16 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 df69cba029 Revert Derby to 10.16.1.1
df69cba029 is described below

commit df69cba02930234d2ce90a3ceb36a7a4fc2c38ca
Author: Mark Thomas 
AuthorDate: Thu May 16 11:28:23 2024 +0100

Revert Derby to 10.16.1.1
---
 build.properties.default   | 9 +
 webapps/docs/changelog.xml | 8 
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3e0c6e8421..24ead36e9b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -324,16 +324,17 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
 
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
 
 # - Derby, used by unit tests -
-derby.version=10.17.1.0
+# 10.16.1.1 is the latest version that runs on Java 17
+derby.version=10.16.1.1
 derby.checksum.enabled=true
 derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=0665c8f3365fca01eb639e41f7685991|e90e61e8ee731614a9bafd3d81155e09fff5e80c
+derby.checksum.value=d9c38ece80f4ec0756f54b06716a3dd6|f9ca2054b3e33ec3f3f19df4a7490352d82de54a
 derby-shared.checksum.enabled=true
 derby-shared.checksum.algorithm=MD5|SHA-1
-derby-shared.checksum.value=ce2d7164d5cda8ac3a1ede81023814d4|e6eac60d1b80b3781dff97ccef88fa131043f2a5
+derby-shared.checksum.value=e423cba3150f195debaf7ff0d307ecf6|77a3ec6b9791c7c29c76148c5d56fc1f3f12d638
 derby-tools.checksum.enabled=true
 derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=ea7b7cba09a4056219e888bcdc1a3bb7|6d1a4e5e0f5c26516abbba85ece081506b9ad2e1
+derby-tools.checksum.value=25b138905deb681ff167a5a04d29c3c6|32a5335f9087022cd8ca5c85f35f8c844b1360a9
 
 derby.home=${base.path}/derby-${derby.version}
 derby.jar=${derby.home}/derby-${derby.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8c1e5a4948..956a1af8fc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Revert Derby to 10.16.1.1 as that is the latest version of Derby that
+runs on Java 17. (markt)
+  
+
+  
 
 
   


-
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: Revert Derby to 10.16.1.1

2024-05-16 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 ed50aed980 Revert Derby to 10.16.1.1
ed50aed980 is described below

commit ed50aed9807ddd1cc33f69d34e65f346b9c23349
Author: Mark Thomas 
AuthorDate: Thu May 16 11:28:23 2024 +0100

Revert Derby to 10.16.1.1
---
 build.properties.default   | 9 +
 webapps/docs/changelog.xml | 8 
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 8bb2fa9084..0955cbea0e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -332,16 +332,17 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
 
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
 
 # - Derby, used by unit tests -
-derby.version=10.17.1.0
+# 10.16.1.1 is the latest version that runs on Java 17
+derby.version=10.16.1.1
 derby.checksum.enabled=true
 derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=0665c8f3365fca01eb639e41f7685991|e90e61e8ee731614a9bafd3d81155e09fff5e80c
+derby.checksum.value=d9c38ece80f4ec0756f54b06716a3dd6|f9ca2054b3e33ec3f3f19df4a7490352d82de54a
 derby-shared.checksum.enabled=true
 derby-shared.checksum.algorithm=MD5|SHA-1
-derby-shared.checksum.value=ce2d7164d5cda8ac3a1ede81023814d4|e6eac60d1b80b3781dff97ccef88fa131043f2a5
+derby-shared.checksum.value=e423cba3150f195debaf7ff0d307ecf6|77a3ec6b9791c7c29c76148c5d56fc1f3f12d638
 derby-tools.checksum.enabled=true
 derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=ea7b7cba09a4056219e888bcdc1a3bb7|6d1a4e5e0f5c26516abbba85ece081506b9ad2e1
+derby-tools.checksum.value=25b138905deb681ff167a5a04d29c3c6|32a5335f9087022cd8ca5c85f35f8c844b1360a9
 
 derby.home=${base.path}/derby-${derby.version}
 derby.jar=${derby.home}/derby-${derby.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 75f815fa42..1fc87de59e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,14 @@
   
 
   
+  
+
+  
+Revert Derby to 10.16.1.1 as that is the latest version of Derby that
+runs on Java 17. (markt)
+  
+
+  
 
 
   


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



(tomcat) branch main updated: Revert Derby to 10.16.1.1

2024-05-16 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 147b9390a4 Revert Derby to 10.16.1.1
147b9390a4 is described below

commit 147b9390a40d5068b073ac2b46e7aebb5b6585fb
Author: Mark Thomas 
AuthorDate: Thu May 16 11:28:23 2024 +0100

Revert Derby to 10.16.1.1
---
 build.properties.default   | 9 +
 webapps/docs/changelog.xml | 8 
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index cafef9bff9..45a0e6d5d4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -311,16 +311,17 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
 
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
 
 # - Derby, used by unit tests -
-derby.version=10.17.1.0
+# 10.16.1.1 is the latest version that runs on Java 17
+derby.version=10.16.1.1
 derby.checksum.enabled=true
 derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=0665c8f3365fca01eb639e41f7685991|e90e61e8ee731614a9bafd3d81155e09fff5e80c
+derby.checksum.value=d9c38ece80f4ec0756f54b06716a3dd6|f9ca2054b3e33ec3f3f19df4a7490352d82de54a
 derby-shared.checksum.enabled=true
 derby-shared.checksum.algorithm=MD5|SHA-1
-derby-shared.checksum.value=ce2d7164d5cda8ac3a1ede81023814d4|e6eac60d1b80b3781dff97ccef88fa131043f2a5
+derby-shared.checksum.value=e423cba3150f195debaf7ff0d307ecf6|77a3ec6b9791c7c29c76148c5d56fc1f3f12d638
 derby-tools.checksum.enabled=true
 derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=ea7b7cba09a4056219e888bcdc1a3bb7|6d1a4e5e0f5c26516abbba85ece081506b9ad2e1
+derby-tools.checksum.value=25b138905deb681ff167a5a04d29c3c6|32a5335f9087022cd8ca5c85f35f8c844b1360a9
 
 derby.home=${base.path}/derby-${derby.version}
 derby.jar=${derby.home}/derby-${derby.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 88926a59c7..277c6b0c4e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,14 @@
   
 
   
+  
+
+  
+Revert Derby to 10.16.1.1 as that is the latest version of Derby that
+runs on Java 17. (markt)
+  
+
+  
 
 
   


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



Re: Buildbot failure in on tomcat-10.1.x

2024-05-16 Thread Mark Thomas

On 16/05/2024 11:17, Mark Thomas wrote:

On 16/05/2024 10:34, Rémy Maucherat wrote:

On Thu, May 16, 2024 at 10:57 AM  wrote:


Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/1265
Blamelist: remm 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 10.1.x] 
bbb4a7b3f7522189678447794b27f1033285df5a


I cannot really figure out why this one is failing.
https://nightlies.apache.org/tomcat/tomcat-10.1.x/logs/1265/TEST-org.apache.catalina.users.TestDataSourceUserDatabase.NIO.txt

Derby on CI would be compiled with Java 19 (??) and running on 17 (no
surprise). Testing locally shows the Derby JAR running fine on Java
17.

Any ideas ?


Hex editor confirms that class files in derby-10.17.1.0.jar target Java 
19 (and the MANIFEST says they were compiled with Java 21).


The tests fail for me when running on Java 17.

Targeting Java 19 is unexpected. I'll look into what the Derby docs say.


Docs say:
- Derby 10.16.1.1 targets Java 17
- Derby 10.17.1.0 targets Java 21 (although it only requires Java 21)

Looks like we need to downgrade the version of Derby we use.

Mark

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



Re: Buildbot failure in on tomcat-10.1.x

2024-05-16 Thread Mark Thomas

On 16/05/2024 10:34, Rémy Maucherat wrote:

On Thu, May 16, 2024 at 10:57 AM  wrote:


Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/1265
Blamelist: remm 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 10.1.x] bbb4a7b3f7522189678447794b27f1033285df5a


I cannot really figure out why this one is failing.
https://nightlies.apache.org/tomcat/tomcat-10.1.x/logs/1265/TEST-org.apache.catalina.users.TestDataSourceUserDatabase.NIO.txt

Derby on CI would be compiled with Java 19 (??) and running on 17 (no
surprise). Testing locally shows the Derby JAR running fine on Java
17.

Any ideas ?


Hex editor confirms that class files in derby-10.17.1.0.jar target Java 
19 (and the MANIFEST says they were compiled with Java 21).


The tests fail for me when running on Java 17.

Targeting Java 19 is unexpected. I'll look into what the Derby docs say.

Mark

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



Re: Buildbot failure in on tomcat-10.1.x

2024-05-16 Thread Rémy Maucherat
On Thu, May 16, 2024 at 10:57 AM  wrote:
>
> Build status: BUILD FAILED: failed compile (failure)
> Worker used: bb_worker2_ubuntu
> URL: https://ci2.apache.org/#builders/44/builds/1265
> Blamelist: remm 
> Build Text: failed compile (failure)
> Status Detected: new failure
> Build Source Stamp: [branch 10.1.x] bbb4a7b3f7522189678447794b27f1033285df5a

I cannot really figure out why this one is failing.
https://nightlies.apache.org/tomcat/tomcat-10.1.x/logs/1265/TEST-org.apache.catalina.users.TestDataSourceUserDatabase.NIO.txt

Derby on CI would be compiled with Java 19 (??) and running on 17 (no
surprise). Testing locally shows the Derby JAR running fine on Java
17.

Any ideas ?

Rémy

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

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



Buildbot failure in on tomcat-10.1.x

2024-05-16 Thread buildbot
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/1265
Blamelist: remm 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 10.1.x] bbb4a7b3f7522189678447794b27f1033285df5a


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



Buildbot failure in on tomcat-11.0.x

2024-05-16 Thread buildbot
Build status: BUILD FAILED: failed Snapshot deployed to ASF Maven snapshot 
repository (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/1093
Blamelist: remm 
Build Text: failed Snapshot deployed to ASF Maven snapshot repository (failure)
Status Detected: new failure
Build Source Stamp: [branch main] 56eb393971578cb1a853cb4dea6ff7bd73417d10


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  shell_6: 0

  compile: 1

  shell_7: 0

  shell_8: 0

  shell_9: 2


-- 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: Rename test classes so that they are actually run

2024-05-16 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 a506dc07c0 Rename test classes so that they are actually run
a506dc07c0 is described below

commit a506dc07c0d800230d4096fe31c88a2f32e27d27
Author: remm 
AuthorDate: Thu May 16 10:11:21 2024 +0200

Rename test classes so that they are actually run
---
 ...DataSourceUserDatabaseTests.java => TestDataSourceUserDatabase.java} | 2 +-
 .../users/{MemoryUserDatabaseTests.java => TestMemoryUserDatabase.java} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java 
b/test/org/apache/catalina/users/TestDataSourceUserDatabase.java
similarity index 99%
rename from test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
rename to test/org/apache/catalina/users/TestDataSourceUserDatabase.java
index 0defa39d6e..56e5458472 100644
--- a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/TestDataSourceUserDatabase.java
@@ -31,7 +31,7 @@ import org.apache.catalina.Role;
 import org.apache.catalina.User;
 import org.apache.catalina.startup.LoggingBaseTest;
 
-public class DataSourceUserDatabaseTests extends LoggingBaseTest {
+public class TestDataSourceUserDatabase extends LoggingBaseTest {
 
 public static final String SIMPLE_SCHEMA =
 "create table users (\n"
diff --git a/test/org/apache/catalina/users/MemoryUserDatabaseTests.java 
b/test/org/apache/catalina/users/TestMemoryUserDatabase.java
similarity index 99%
rename from test/org/apache/catalina/users/MemoryUserDatabaseTests.java
rename to test/org/apache/catalina/users/TestMemoryUserDatabase.java
index fa97f93e6b..900161e5f3 100644
--- a/test/org/apache/catalina/users/MemoryUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/TestMemoryUserDatabase.java
@@ -39,7 +39,7 @@ import org.apache.catalina.User;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.realm.UserDatabaseRealm;
 
-public class MemoryUserDatabaseTests {
+public class TestMemoryUserDatabase {
 private static File TEST_FILE = new 
File(System.getProperty("java.io.tmpdir"), "tomcat-users.xml");
 
 private static MemoryUserDatabase db;


-
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: Rename test classes so that they are actually run

2024-05-16 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 bbb4a7b3f7 Rename test classes so that they are actually run
bbb4a7b3f7 is described below

commit bbb4a7b3f7522189678447794b27f1033285df5a
Author: remm 
AuthorDate: Thu May 16 10:11:21 2024 +0200

Rename test classes so that they are actually run
---
 ...DataSourceUserDatabaseTests.java => TestDataSourceUserDatabase.java} | 2 +-
 .../users/{MemoryUserDatabaseTests.java => TestMemoryUserDatabase.java} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java 
b/test/org/apache/catalina/users/TestDataSourceUserDatabase.java
similarity index 99%
rename from test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
rename to test/org/apache/catalina/users/TestDataSourceUserDatabase.java
index 0defa39d6e..56e5458472 100644
--- a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/TestDataSourceUserDatabase.java
@@ -31,7 +31,7 @@ import org.apache.catalina.Role;
 import org.apache.catalina.User;
 import org.apache.catalina.startup.LoggingBaseTest;
 
-public class DataSourceUserDatabaseTests extends LoggingBaseTest {
+public class TestDataSourceUserDatabase extends LoggingBaseTest {
 
 public static final String SIMPLE_SCHEMA =
 "create table users (\n"
diff --git a/test/org/apache/catalina/users/MemoryUserDatabaseTests.java 
b/test/org/apache/catalina/users/TestMemoryUserDatabase.java
similarity index 99%
rename from test/org/apache/catalina/users/MemoryUserDatabaseTests.java
rename to test/org/apache/catalina/users/TestMemoryUserDatabase.java
index fa97f93e6b..900161e5f3 100644
--- a/test/org/apache/catalina/users/MemoryUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/TestMemoryUserDatabase.java
@@ -39,7 +39,7 @@ import org.apache.catalina.User;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.realm.UserDatabaseRealm;
 
-public class MemoryUserDatabaseTests {
+public class TestMemoryUserDatabase {
 private static File TEST_FILE = new 
File(System.getProperty("java.io.tmpdir"), "tomcat-users.xml");
 
 private static MemoryUserDatabase db;


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



(tomcat) branch main updated: Rename test classes so that they are actually run

2024-05-16 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 56eb393971 Rename test classes so that they are actually run
56eb393971 is described below

commit 56eb393971578cb1a853cb4dea6ff7bd73417d10
Author: remm 
AuthorDate: Thu May 16 10:11:21 2024 +0200

Rename test classes so that they are actually run
---
 ...DataSourceUserDatabaseTests.java => TestDataSourceUserDatabase.java} | 2 +-
 .../users/{MemoryUserDatabaseTests.java => TestMemoryUserDatabase.java} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java 
b/test/org/apache/catalina/users/TestDataSourceUserDatabase.java
similarity index 99%
rename from test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
rename to test/org/apache/catalina/users/TestDataSourceUserDatabase.java
index 0defa39d6e..56e5458472 100644
--- a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/TestDataSourceUserDatabase.java
@@ -31,7 +31,7 @@ import org.apache.catalina.Role;
 import org.apache.catalina.User;
 import org.apache.catalina.startup.LoggingBaseTest;
 
-public class DataSourceUserDatabaseTests extends LoggingBaseTest {
+public class TestDataSourceUserDatabase extends LoggingBaseTest {
 
 public static final String SIMPLE_SCHEMA =
 "create table users (\n"
diff --git a/test/org/apache/catalina/users/MemoryUserDatabaseTests.java 
b/test/org/apache/catalina/users/TestMemoryUserDatabase.java
similarity index 99%
rename from test/org/apache/catalina/users/MemoryUserDatabaseTests.java
rename to test/org/apache/catalina/users/TestMemoryUserDatabase.java
index fa97f93e6b..900161e5f3 100644
--- a/test/org/apache/catalina/users/MemoryUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/TestMemoryUserDatabase.java
@@ -39,7 +39,7 @@ import org.apache.catalina.User;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.realm.UserDatabaseRealm;
 
-public class MemoryUserDatabaseTests {
+public class TestMemoryUserDatabase {
 private static File TEST_FILE = new 
File(System.getProperty("java.io.tmpdir"), "tomcat-users.xml");
 
 private static MemoryUserDatabase db;


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



Re: [tcnative] Should we make DEBUG builds available for Windows?

2024-05-16 Thread Michael Osipov
On 2024/05/15 13:12:44 Christopher Schultz wrote:
> All,
> 
> A recent thread was posted with a tcnative crash with not much in the 
> way of useful information in the error:
> 
> https://lists.apache.org/thread/m1dbj3w1x1oqftqsbj7jbnvkm2073x1o
> 
> The error details were:
> 
> "
> #  EXCEPTION_ACCESS_VIOLATION (0xc005) at pc=0x0001800ccd10, 
> pid=1244, tid=0x0ab0
> #
> # JRE version: OpenJDK Runtime Environment (Zulu 8.60.0.21-CA-win64) 
> (8.0_322-b06) (build 1.8.0_322-b06)
> # Java VM: OpenJDK 64-Bit Server VM (25.322-b06 mixed mode windows-amd64 
> compressed oops)
> # Problematic frame:
> # C  [tcnative-1.dll+0xccd10]
> #
> # Core dump written. Default location: D:\Program 
> Files\apache-tomcat\bin\hs_err_pid1244.mdmp
> "
> 
> So, not super helpful unless you happen to have a debugger handy.
> 
> If we had a debug build available for users, we should be able to get 
> better information coming back from that failure, possibly a complete 
> native back-trace.
> 
> IIRC, building a debug version just involves adding something obvious 
> like /DEBUG to the compiler and/or linker and/or NOT stripping-out the 
> debug symbols after the build is complete.
> 
> Would this represent a burden on the release manager to produce both 
> kinds of builds for an official release?

I would be in favor of this. For that I have tried it yesterday. Produced a 
debug build of OpenSSL and libtcnative. MSVC has added to new DLLs to the 
runtime path and I have no idea where to get them, it does not load. One of it 
is msvcrtd.dll. Are we actuall able to supply that to users otherwise it does 
not make sense to provide a debug build.

M

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