Re: [PR] Update Http11Processor.java [tomcat]
markt-asf commented on PR #749: URL: https://github.com/apache/tomcat/pull/749#issuecomment-2337580759 Under what circumstances are you seeing duplicate headers? That should never happen. If the application is setting the `T-E` header that would be an application bug. If we did want to handle duplicate headers then `MimeHeaders.setValue()` is the right way to do it. -- 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) branch main updated: Use https to download JDT
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 3ad1ebabf7 Use https to download JDT
3ad1ebabf7 is described below
commit 3ad1ebabf7f3efdba21f562f4179d294bf6d87a3
Author: Mark Thomas
AuthorDate: Mon Sep 9 11:45:10 2024 +0100
Use https to download JDT
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 168af7abf7..fd3096d497 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -142,8 +142,8 @@
jdt.checksum.value=8937dede817b8c37f23e0b42162bdd0f722e34e40f75a35b9ca45a17bc78c
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
tomcat-native.version=2.0.8
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Use https to download JDT
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 944319dba8 Use https to download JDT
944319dba8 is described below
commit 944319dba89f33b1c4bdebf2169b2e762f189bb0
Author: Mark Thomas
AuthorDate: Mon Sep 9 11:45:10 2024 +0100
Use https to download JDT
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index b76acdcc36..13b5f989ce 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -142,8 +142,8 @@
jdt.checksum.value=8937dede817b8c37f23e0b42162bdd0f722e34e40f75a35b9ca45a17bc78c
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
tomcat-native.version=2.0.8
-
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: Use https to download JDT
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 766633bfc5 Use https to download JDT
766633bfc5 is described below
commit 766633bfc5d907aa580c44df2c08371b7bb1f6d2
Author: Mark Thomas
AuthorDate: Mon Sep 9 11:45:10 2024 +0100
Use https to download JDT
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 633600e534..2cdd9bdd16 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -163,8 +163,8 @@
jdt.checksum.value=69b57e12aa7f1339fe86fdb82f8fe9a104ff4d5e887448a779059e4f0626c
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
tomcat-native.version=2.0.8
-
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: Use https to download JDT
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 a857a5b12b Use https to download JDT
a857a5b12b is described below
commit a857a5b12b5c73c01de865bede7e6dd3480c9f80
Author: Mark Thomas
AuthorDate: Mon Sep 9 11:45:10 2024 +0100
Use https to download JDT
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 69323363ed..c43ab945d5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -165,8 +165,8 @@
jdt.checksum.value=ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b6
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
tomcat-native.version=1.3.1
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1920530 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml
Author: markt
Date: Mon Sep 9 12:48:59 2024
New Revision: 1920530
URL: http://svn.apache.org/viewvc?rev=1920530&view=rev
Log:
Fix link
Modified:
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/xdocs/presentations.xml
Modified: tomcat/site/trunk/docs/presentations.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1920530&r1=1920529&r2=1920530&view=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Mon Sep 9 12:48:59 2024
@@ -449,7 +449,7 @@ li.targeted {
State of the Cat - Mark Thomas,
-slides,
+slides,
https://www.youtube.com/watch?v=gPqus5T5x-w&t=2s";>slides +
audio
Modified: tomcat/site/trunk/xdocs/presentations.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1920530&r1=1920529&r2=1920530&view=diff
==
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Mon Sep 9 12:48:59 2024
@@ -457,7 +457,7 @@ li.targeted {
State of the Cat - Mark Thomas,
-slides,
+slides,
https://www.youtube.com/watch?v=gPqus5T5x-w&t=2s";>slides +
audio
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M25
Am 05.09.24 um 15:08 schrieb Mark Thomas: The proposed Apache Tomcat 11.0.0-M25 release is now available for voting. Apache Tomcat 11.0.0-M25 is a milestone release of the 11.0.x branch and has been made to provide users with early access to the new features in Apache Tomcat 11.0.x so that they may provide feedback. The notable changes compared to 11.0.0-M24 include: - Implement the recent clarification from the Jakarta Servlet project that if a content length is declared then once that many bytes have been written to the response, further writes should trigger an IOException - If an HTTP/2 client resets a stream before the request body is fully written, ensure that any ReadListener is notified via a call to ReadListener.onErrror() - An Exception being thrown during WebSocket message processing (e.g. in a method annotated with @onMessage) should not automatically cause the connection to close. The application should handle the exception and make the decision whether or not to close the connection. For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. Applications using deprecated APIs may require further changes. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M25/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1511 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M25 fafe3dc7a63c12fbb45aa076c90d6a9e7f77e5c8 The proposed 11.0.0-M25 release is: [ ] -1 Broken - do not release [X] +1 Beta - go ahead and release as 11.0.0-M25 +1 Tested on platforms - RHEL 6, 7, 8 and 9, SLES 11, 12 and 15 using - JDK 11, 17, 21, 22, 23 (Release Candidate) and 24 (current EA) from - Eclipse Adoptium, Azul Zulu, Amazon Coretto, Oracle, RedHat and OpenJDK (for the RC and EA) where applicable. Also tested with - tcnative 1.3.1, tcnative 2.0.8 and panama based on - OpenSSL 3.0.15, 3.1.7, 3.2.3 and 3.3.2. All fine, except for the usual sporadic crashes with tcnative during shutdown and also the known bunch of test failures with JDK 24. Of course JDK 24 EA problems are not a showstopper in any way. Thanks for RM! Best regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M25
Minor nit, irrelevant vor voting: it seems the previous (M24) changelog entry has no release date. Am 09.09.24 um 16:32 schrieb Rainer Jung: Am 05.09.24 um 15:08 schrieb Mark Thomas: The proposed Apache Tomcat 11.0.0-M25 release is now available for voting. Apache Tomcat 11.0.0-M25 is a milestone release of the 11.0.x branch and has been made to provide users with early access to the new features in Apache Tomcat 11.0.x so that they may provide feedback. The notable changes compared to 11.0.0-M24 include: - Implement the recent clarification from the Jakarta Servlet project that if a content length is declared then once that many bytes have been written to the response, further writes should trigger an IOException - If an HTTP/2 client resets a stream before the request body is fully written, ensure that any ReadListener is notified via a call to ReadListener.onErrror() - An Exception being thrown during WebSocket message processing (e.g. in a method annotated with @onMessage) should not automatically cause the connection to close. The application should handle the exception and make the decision whether or not to close the connection. For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. Applications using deprecated APIs may require further changes. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M25/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1511 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M25 fafe3dc7a63c12fbb45aa076c90d6a9e7f77e5c8 The proposed 11.0.0-M25 release is: [ ] -1 Broken - do not release [X] +1 Beta - go ahead and release as 11.0.0-M25 +1 Tested on platforms - RHEL 6, 7, 8 and 9, SLES 11, 12 and 15 using - JDK 11, 17, 21, 22, 23 (Release Candidate) and 24 (current EA) from - Eclipse Adoptium, Azul Zulu, Amazon Coretto, Oracle, RedHat and OpenJDK (for the RC and EA) where applicable. Also tested with - tcnative 1.3.1, tcnative 2.0.8 and panama based on - OpenSSL 3.0.15, 3.1.7, 3.2.3 and 3.3.2. All fine, except for the usual sporadic crashes with tcnative during shutdown and also the known bunch of test failures with JDK 24. Of course JDK 24 EA problems are not a showstopper in any way. Thanks for RM! Best regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Add release date for 11.0.0-M24
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new 20a30941bd Add release date for 11.0.0-M24 20a30941bd is described below commit 20a30941bdfe5982fe06d2bc759bcbbc3b7d42a7 Author: Mark Thomas AuthorDate: Mon Sep 9 15:44:45 2024 +0100 Add release date for 11.0.0-M24 --- 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 9135a1f8ce..aedb162a7f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -241,7 +241,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M25
On 09/09/2024 15:35, Rainer Jung wrote: Minor nit, irrelevant vor voting: it seems the previous (M24) changelog entry has no release date. Sorry. Should be fixed now. Mark Am 09.09.24 um 16:32 schrieb Rainer Jung: Am 05.09.24 um 15:08 schrieb Mark Thomas: The proposed Apache Tomcat 11.0.0-M25 release is now available for voting. Apache Tomcat 11.0.0-M25 is a milestone release of the 11.0.x branch and has been made to provide users with early access to the new features in Apache Tomcat 11.0.x so that they may provide feedback. The notable changes compared to 11.0.0-M24 include: - Implement the recent clarification from the Jakarta Servlet project that if a content length is declared then once that many bytes have been written to the response, further writes should trigger an IOException - If an HTTP/2 client resets a stream before the request body is fully written, ensure that any ReadListener is notified via a call to ReadListener.onErrror() - An Exception being thrown during WebSocket message processing (e.g. in a method annotated with @onMessage) should not automatically cause the connection to close. The application should handle the exception and make the decision whether or not to close the connection. For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. Applications using deprecated APIs may require further changes. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M25/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1511 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M25 fafe3dc7a63c12fbb45aa076c90d6a9e7f77e5c8 The proposed 11.0.0-M25 release is: [ ] -1 Broken - do not release [X] +1 Beta - go ahead and release as 11.0.0-M25 +1 Tested on platforms - RHEL 6, 7, 8 and 9, SLES 11, 12 and 15 using - JDK 11, 17, 21, 22, 23 (Release Candidate) and 24 (current EA) from - Eclipse Adoptium, Azul Zulu, Amazon Coretto, Oracle, RedHat and OpenJDK (for the RC and EA) where applicable. Also tested with - tcnative 1.3.1, tcnative 2.0.8 and panama based on - OpenSSL 3.0.15, 3.1.7, 3.2.3 and 3.3.2. All fine, except for the usual sporadic crashes with tcnative during shutdown and also the known bunch of test failures with JDK 24. Of course JDK 24 EA problems are not a showstopper in any way. Thanks for RM! Best regards, Rainer - 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) branch main updated: Add missing password for tests
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 f58a8ed0a4 Add missing password for tests
f58a8ed0a4 is described below
commit f58a8ed0a40b5e22d6d6e4b9997e9233ea57f19d
Author: remm
AuthorDate: Mon Sep 9 16:49:12 2024 +0200
Add missing password for tests
---
test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 4
test/org/apache/tomcat/util/net/TesterSupport.java | 2 ++
2 files changed, 6 insertions(+)
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index 47676bf118..3c185ea3fe 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -244,6 +244,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest
{
case KEYSTORE: {
SSLHostConfigCertificate sslHostConfigCertificateRsa = new
SSLHostConfigCertificate(sslHostConfig, Type.RSA);
sslHostConfigCertificateRsa.setCertificateKeystoreFile(getPath(TesterSupport.LOCALHOST_RSA_JKS));
+
sslHostConfigCertificateRsa.setCertificateKeystorePassword("changeit");
sslHostConfig.addCertificate(sslHostConfigCertificateRsa);
break;
}
@@ -251,6 +252,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest
{
SSLHostConfigCertificate sslHostConfigCertificateRsa = new
SSLHostConfigCertificate(sslHostConfig, Type.RSA);
sslHostConfigCertificateRsa.setCertificateFile(getPath(TesterSupport.LOCALHOST_RSA_CERT_PEM));
sslHostConfigCertificateRsa.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_RSA_KEY_PEM));
+sslHostConfigCertificateRsa.setCertificateKeyPassword("changeit");
sslHostConfig.addCertificate(sslHostConfigCertificateRsa);
break;
}
@@ -264,6 +266,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest
{
case KEYSTORE: {
SSLHostConfigCertificate sslHostConfigCertificateEc = new
SSLHostConfigCertificate(sslHostConfig, Type.EC);
sslHostConfigCertificateEc.setCertificateKeystoreFile(getPath(TesterSupport.LOCALHOST_EC_JKS));
+
sslHostConfigCertificateEc.setCertificateKeystorePassword("changeit");
sslHostConfig.addCertificate(sslHostConfigCertificateEc);
break;
}
@@ -271,6 +274,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest
{
SSLHostConfigCertificate sslHostConfigCertificateEc = new
SSLHostConfigCertificate(sslHostConfig, Type.EC);
sslHostConfigCertificateEc.setCertificateFile(getPath(TesterSupport.LOCALHOST_EC_CERT_PEM));
sslHostConfigCertificateEc.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_EC_KEY_PEM));
+sslHostConfigCertificateEc.setCertificateKeyPassword("changeit");
sslHostConfig.addCertificate(sslHostConfigCertificateEc);
break;
}
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index 3bbaff9c32..ca3a4cee6d 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -140,6 +140,8 @@ public final class TesterSupport {
}
if (keystorePass != null) {
certificate.setCertificateKeystorePassword(keystorePass);
+} else {
+certificate.setCertificateKeystorePassword("changeit");
}
if (keyPassFile != null) {
certificate.setCertificateKeyPasswordFile(new
File(keyPassFile).getAbsolutePath());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Add missing release date
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 cf07b3e710 Add missing release date cf07b3e710 is described below commit cf07b3e710c520cf86808d9e54583ddad0f32a48 Author: remm AuthorDate: Mon Sep 9 16:53:09 2024 +0200 Add missing release date --- 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 5c8b2e938d..8529b088d0 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -232,7 +232,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Use constant
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 1fb42bae8b Use constant
1fb42bae8b is described below
commit 1fb42bae8bb6e1eaf3ca494bcb98fef134ac59b0
Author: Mark Thomas
AuthorDate: Mon Sep 9 15:50:58 2024 +0100
Use constant
---
test/org/apache/tomcat/util/net/TestCustomSsl.java | 2 ++
test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 8
test/org/apache/tomcat/util/net/TesterSupport.java | 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java
b/test/org/apache/tomcat/util/net/TestCustomSsl.java
index fc458cf14e..f4311a9e03 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
@@ -62,6 +62,8 @@ public class TestCustomSsl extends TomcatBaseTest {
File keystoreFile = new File(TesterSupport.LOCALHOST_RSA_JKS);
certificate.setCertificateKeystoreFile(keystoreFile.getAbsolutePath());
+certificate.setCertificateKeyPassword(TesterSupport.JKS_PASS);
+
connector.setSecure(true);
Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index 3c185ea3fe..9d5c8ecbf8 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -244,7 +244,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest
{
case KEYSTORE: {
SSLHostConfigCertificate sslHostConfigCertificateRsa = new
SSLHostConfigCertificate(sslHostConfig, Type.RSA);
sslHostConfigCertificateRsa.setCertificateKeystoreFile(getPath(TesterSupport.LOCALHOST_RSA_JKS));
-
sslHostConfigCertificateRsa.setCertificateKeystorePassword("changeit");
+
sslHostConfigCertificateRsa.setCertificateKeystorePassword(TesterSupport.JKS_PASS);
sslHostConfig.addCertificate(sslHostConfigCertificateRsa);
break;
}
@@ -252,7 +252,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest
{
SSLHostConfigCertificate sslHostConfigCertificateRsa = new
SSLHostConfigCertificate(sslHostConfig, Type.RSA);
sslHostConfigCertificateRsa.setCertificateFile(getPath(TesterSupport.LOCALHOST_RSA_CERT_PEM));
sslHostConfigCertificateRsa.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_RSA_KEY_PEM));
-sslHostConfigCertificateRsa.setCertificateKeyPassword("changeit");
+
sslHostConfigCertificateRsa.setCertificateKeystorePassword(TesterSupport.JKS_PASS);
sslHostConfig.addCertificate(sslHostConfigCertificateRsa);
break;
}
@@ -266,7 +266,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest
{
case KEYSTORE: {
SSLHostConfigCertificate sslHostConfigCertificateEc = new
SSLHostConfigCertificate(sslHostConfig, Type.EC);
sslHostConfigCertificateEc.setCertificateKeystoreFile(getPath(TesterSupport.LOCALHOST_EC_JKS));
-
sslHostConfigCertificateEc.setCertificateKeystorePassword("changeit");
+
sslHostConfigCertificateEc.setCertificateKeystorePassword(TesterSupport.JKS_PASS);
sslHostConfig.addCertificate(sslHostConfigCertificateEc);
break;
}
@@ -274,7 +274,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest
{
SSLHostConfigCertificate sslHostConfigCertificateEc = new
SSLHostConfigCertificate(sslHostConfig, Type.EC);
sslHostConfigCertificateEc.setCertificateFile(getPath(TesterSupport.LOCALHOST_EC_CERT_PEM));
sslHostConfigCertificateEc.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_EC_KEY_PEM));
-sslHostConfigCertificateEc.setCertificateKeyPassword("changeit");
+
sslHostConfigCertificateEc.setCertificateKeyPassword(TesterSupport.JKS_PASS);
sslHostConfig.addCertificate(sslHostConfigCertificateEc);
break;
}
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index ca3a4cee6d..308f28acc2 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -109,6 +109,7 @@ public final class TesterSupport {
}
public static void initSsl(Tomcat tomcat) {
+// TLS material for tests uses default password
initSsl(tomcat, LOCALHOST_RSA_JKS, null, null, null, null);
}
@@ -141,7 +142,7 @@ public final class TesterSupport {
if (keystorePass != null) {
certificate.setCertificateKeystore
(tomcat) branch main updated: Add group boxes to show where more detail can be found
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 095b49 Add group boxes to show where more detail can be found 095b49 is described below commit 095b4962b3f1bf32a7a7199878ac5130 Author: Mark Thomas AuthorDate: Mon Sep 9 16:38:00 2024 +0100 Add group boxes to show where more detail can be found --- .../docs/architecture/startup/1_overview.plantuml | 4 webapps/docs/architecture/startup/1_overview.png| Bin 48278 -> 54000 bytes 2 files changed, 4 insertions(+) diff --git a/webapps/docs/architecture/startup/1_overview.plantuml b/webapps/docs/architecture/startup/1_overview.plantuml index 749d2d4a3c..967c44d231 100644 --- a/webapps/docs/architecture/startup/1_overview.plantuml +++ b/webapps/docs/architecture/startup/1_overview.plantuml @@ -55,16 +55,20 @@ return ||| Catalina -> Catalina: initStream() +group More detail in diagram 2 Catalina -> Server ++: init() ||| return +end return ||| +group More detail in diagram 3 Catalina -> Server ++: start() ||| return +end ||| Catalina -> Catalina ++: await() diff --git a/webapps/docs/architecture/startup/1_overview.png b/webapps/docs/architecture/startup/1_overview.png index f014d7d9b8..2bf8b64857 100644 Binary files a/webapps/docs/architecture/startup/1_overview.png and b/webapps/docs/architecture/startup/1_overview.png differ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Add group boxes to show where more detail can be found
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new 152325ab86 Add group boxes to show where more detail can be found 152325ab86 is described below commit 152325ab8642e8951aa00a50beed9ac927f96ca6 Author: Mark Thomas AuthorDate: Mon Sep 9 16:38:00 2024 +0100 Add group boxes to show where more detail can be found --- .../docs/architecture/startup/1_overview.plantuml | 4 webapps/docs/architecture/startup/1_overview.png| Bin 48278 -> 54000 bytes 2 files changed, 4 insertions(+) diff --git a/webapps/docs/architecture/startup/1_overview.plantuml b/webapps/docs/architecture/startup/1_overview.plantuml index 749d2d4a3c..967c44d231 100644 --- a/webapps/docs/architecture/startup/1_overview.plantuml +++ b/webapps/docs/architecture/startup/1_overview.plantuml @@ -55,16 +55,20 @@ return ||| Catalina -> Catalina: initStream() +group More detail in diagram 2 Catalina -> Server ++: init() ||| return +end return ||| +group More detail in diagram 3 Catalina -> Server ++: start() ||| return +end ||| Catalina -> Catalina ++: await() diff --git a/webapps/docs/architecture/startup/1_overview.png b/webapps/docs/architecture/startup/1_overview.png index f014d7d9b8..2bf8b64857 100644 Binary files a/webapps/docs/architecture/startup/1_overview.png and b/webapps/docs/architecture/startup/1_overview.png differ - 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 group boxes to show where more detail can be found
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 3b1ab99894 Add group boxes to show where more detail can be found 3b1ab99894 is described below commit 3b1ab99894e9a1a6db257a4b43e2f37e66a5afa7 Author: Mark Thomas AuthorDate: Mon Sep 9 16:38:00 2024 +0100 Add group boxes to show where more detail can be found --- .../docs/architecture/startup/1_overview.plantuml | 4 webapps/docs/architecture/startup/1_overview.png| Bin 48278 -> 54000 bytes 2 files changed, 4 insertions(+) diff --git a/webapps/docs/architecture/startup/1_overview.plantuml b/webapps/docs/architecture/startup/1_overview.plantuml index 749d2d4a3c..967c44d231 100644 --- a/webapps/docs/architecture/startup/1_overview.plantuml +++ b/webapps/docs/architecture/startup/1_overview.plantuml @@ -55,16 +55,20 @@ return ||| Catalina -> Catalina: initStream() +group More detail in diagram 2 Catalina -> Server ++: init() ||| return +end return ||| +group More detail in diagram 3 Catalina -> Server ++: start() ||| return +end ||| Catalina -> Catalina ++: await() diff --git a/webapps/docs/architecture/startup/1_overview.png b/webapps/docs/architecture/startup/1_overview.png index f014d7d9b8..2bf8b64857 100644 Binary files a/webapps/docs/architecture/startup/1_overview.png and b/webapps/docs/architecture/startup/1_overview.png differ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Add group boxes to show where more detail can be found
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 1f84d68d3b Add group boxes to show where more detail can be found 1f84d68d3b is described below commit 1f84d68d3b7c7aa5883425c9758ec6996c65113c Author: Mark Thomas AuthorDate: Mon Sep 9 16:38:00 2024 +0100 Add group boxes to show where more detail can be found --- .../docs/architecture/startup/1_overview.plantuml | 4 webapps/docs/architecture/startup/1_overview.png| Bin 48278 -> 54000 bytes 2 files changed, 4 insertions(+) diff --git a/webapps/docs/architecture/startup/1_overview.plantuml b/webapps/docs/architecture/startup/1_overview.plantuml index 749d2d4a3c..967c44d231 100644 --- a/webapps/docs/architecture/startup/1_overview.plantuml +++ b/webapps/docs/architecture/startup/1_overview.plantuml @@ -55,16 +55,20 @@ return ||| Catalina -> Catalina: initStream() +group More detail in diagram 2 Catalina -> Server ++: init() ||| return +end return ||| +group More detail in diagram 3 Catalina -> Server ++: start() ||| return +end ||| Catalina -> Catalina ++: await() diff --git a/webapps/docs/architecture/startup/1_overview.png b/webapps/docs/architecture/startup/1_overview.png index f014d7d9b8..2bf8b64857 100644 Binary files a/webapps/docs/architecture/startup/1_overview.png and b/webapps/docs/architecture/startup/1_overview.png differ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Add a note to show where Hosts etc are initialized
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new 31c3b0d731 Add a note to show where Hosts etc are initialized 31c3b0d731 is described below commit 31c3b0d731b172ee12c8ea40e5ae9d03eaf12317 Author: Mark Thomas AuthorDate: Mon Sep 9 16:54:59 2024 +0100 Add a note to show where Hosts etc are initialized --- .../architecture/startup/2_catalina_init.plantuml | 6 ++ .../docs/architecture/startup/2_catalina_init.png | Bin 118930 -> 129438 bytes 2 files changed, 6 insertions(+) diff --git a/webapps/docs/architecture/startup/2_catalina_init.plantuml b/webapps/docs/architecture/startup/2_catalina_init.plantuml index 738dac0f69..fd6cd42fa1 100644 --- a/webapps/docs/architecture/startup/2_catalina_init.plantuml +++ b/webapps/docs/architecture/startup/2_catalina_init.plantuml @@ -42,6 +42,12 @@ Services -> Services ++: initInternal() Services -> Engine ++: init() Engine -> Engine: fireLifecycleEvent(\nBEFORE_INIT_EVENT) Engine -> Engine: initInternal() +note right +The Engine initializes any nested Hosts, +Contexts and Wrappers as well as any +associated Valves, Loaders, Realms, +Clusters and Managers etc. +end note Engine -> Engine: fireLifecycleEvent(\nAFTER_INIT_EVENT) return diff --git a/webapps/docs/architecture/startup/2_catalina_init.png b/webapps/docs/architecture/startup/2_catalina_init.png index 260ba1b914..aa6d74d299 100644 Binary files a/webapps/docs/architecture/startup/2_catalina_init.png and b/webapps/docs/architecture/startup/2_catalina_init.png differ - 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 a note to show where Hosts etc are initialized
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 1b28679cbb Add a note to show where Hosts etc are initialized 1b28679cbb is described below commit 1b28679cbbc46fd6c84e2f3195f78a745227dd5c Author: Mark Thomas AuthorDate: Mon Sep 9 16:54:59 2024 +0100 Add a note to show where Hosts etc are initialized --- .../architecture/startup/2_catalina_init.plantuml | 6 ++ .../docs/architecture/startup/2_catalina_init.png | Bin 118930 -> 129438 bytes 2 files changed, 6 insertions(+) diff --git a/webapps/docs/architecture/startup/2_catalina_init.plantuml b/webapps/docs/architecture/startup/2_catalina_init.plantuml index 738dac0f69..fd6cd42fa1 100644 --- a/webapps/docs/architecture/startup/2_catalina_init.plantuml +++ b/webapps/docs/architecture/startup/2_catalina_init.plantuml @@ -42,6 +42,12 @@ Services -> Services ++: initInternal() Services -> Engine ++: init() Engine -> Engine: fireLifecycleEvent(\nBEFORE_INIT_EVENT) Engine -> Engine: initInternal() +note right +The Engine initializes any nested Hosts, +Contexts and Wrappers as well as any +associated Valves, Loaders, Realms, +Clusters and Managers etc. +end note Engine -> Engine: fireLifecycleEvent(\nAFTER_INIT_EVENT) return diff --git a/webapps/docs/architecture/startup/2_catalina_init.png b/webapps/docs/architecture/startup/2_catalina_init.png index 260ba1b914..aa6d74d299 100644 Binary files a/webapps/docs/architecture/startup/2_catalina_init.png and b/webapps/docs/architecture/startup/2_catalina_init.png differ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add note that more detail for Hosts etc will be in diagram 4
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 47c7a40305 Add note that more detail for Hosts etc will be in diagram 4 47c7a40305 is described below commit 47c7a4030543dbf922802815be5f977db475270c Author: Mark Thomas AuthorDate: Mon Sep 9 17:05:06 2024 +0100 Add note that more detail for Hosts etc will be in diagram 4 --- .../startup/3_catalina_start_1.plantuml| 2 ++ .../architecture/startup/3_catalina_start_1.png| Bin 166720 -> 171121 bytes 2 files changed, 2 insertions(+) diff --git a/webapps/docs/architecture/startup/3_catalina_start_1.plantuml b/webapps/docs/architecture/startup/3_catalina_start_1.plantuml index 9140895973..95eacc1b31 100644 --- a/webapps/docs/architecture/startup/3_catalina_start_1.plantuml +++ b/webapps/docs/architecture/startup/3_catalina_start_1.plantuml @@ -54,6 +54,7 @@ Services -> Services: fireLifecycleEvent(\nSTART_EVENT) Services -> Engine ++: start() +group More detail in diagram 4 Engine -> Engine: fireLifecycleEvent(\nBEFORE_START_EVENT) Engine -> Engine ++: startInternal() @@ -64,6 +65,7 @@ return ||| Engine -> Engine: fireLifecycleEvent(\nAFTER_START_EVENT) +end group return diff --git a/webapps/docs/architecture/startup/3_catalina_start_1.png b/webapps/docs/architecture/startup/3_catalina_start_1.png index 10e717112b..fe37213f98 100644 Binary files a/webapps/docs/architecture/startup/3_catalina_start_1.png and b/webapps/docs/architecture/startup/3_catalina_start_1.png differ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Add note that more detail for Hosts etc will be in diagram 4
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new 6eae97aa56 Add note that more detail for Hosts etc will be in diagram 4 6eae97aa56 is described below commit 6eae97aa565cfbd9ee2be6dd42d170a95205205f Author: Mark Thomas AuthorDate: Mon Sep 9 17:05:06 2024 +0100 Add note that more detail for Hosts etc will be in diagram 4 --- .../startup/3_catalina_start_1.plantuml| 2 ++ .../architecture/startup/3_catalina_start_1.png| Bin 166720 -> 171121 bytes 2 files changed, 2 insertions(+) diff --git a/webapps/docs/architecture/startup/3_catalina_start_1.plantuml b/webapps/docs/architecture/startup/3_catalina_start_1.plantuml index 9140895973..95eacc1b31 100644 --- a/webapps/docs/architecture/startup/3_catalina_start_1.plantuml +++ b/webapps/docs/architecture/startup/3_catalina_start_1.plantuml @@ -54,6 +54,7 @@ Services -> Services: fireLifecycleEvent(\nSTART_EVENT) Services -> Engine ++: start() +group More detail in diagram 4 Engine -> Engine: fireLifecycleEvent(\nBEFORE_START_EVENT) Engine -> Engine ++: startInternal() @@ -64,6 +65,7 @@ return ||| Engine -> Engine: fireLifecycleEvent(\nAFTER_START_EVENT) +end group return diff --git a/webapps/docs/architecture/startup/3_catalina_start_1.png b/webapps/docs/architecture/startup/3_catalina_start_1.png index 10e717112b..fe37213f98 100644 Binary files a/webapps/docs/architecture/startup/3_catalina_start_1.png and b/webapps/docs/architecture/startup/3_catalina_start_1.png differ - 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 note that more detail for Hosts etc will be in diagram 4
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 5040614bad Add note that more detail for Hosts etc will be in diagram 4 5040614bad is described below commit 5040614badc3d02000308bdea1706f0c5e39701a Author: Mark Thomas AuthorDate: Mon Sep 9 17:05:06 2024 +0100 Add note that more detail for Hosts etc will be in diagram 4 --- .../startup/3_catalina_start_1.plantuml| 2 ++ .../architecture/startup/3_catalina_start_1.png| Bin 166720 -> 171121 bytes 2 files changed, 2 insertions(+) diff --git a/webapps/docs/architecture/startup/3_catalina_start_1.plantuml b/webapps/docs/architecture/startup/3_catalina_start_1.plantuml index 9140895973..95eacc1b31 100644 --- a/webapps/docs/architecture/startup/3_catalina_start_1.plantuml +++ b/webapps/docs/architecture/startup/3_catalina_start_1.plantuml @@ -54,6 +54,7 @@ Services -> Services: fireLifecycleEvent(\nSTART_EVENT) Services -> Engine ++: start() +group More detail in diagram 4 Engine -> Engine: fireLifecycleEvent(\nBEFORE_START_EVENT) Engine -> Engine ++: startInternal() @@ -64,6 +65,7 @@ return ||| Engine -> Engine: fireLifecycleEvent(\nAFTER_START_EVENT) +end group return diff --git a/webapps/docs/architecture/startup/3_catalina_start_1.png b/webapps/docs/architecture/startup/3_catalina_start_1.png index 10e717112b..fe37213f98 100644 Binary files a/webapps/docs/architecture/startup/3_catalina_start_1.png and b/webapps/docs/architecture/startup/3_catalina_start_1.png differ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch main updated: Use constant
On Mon, Sep 9, 2024 at 4:55 PM wrote:
>
> 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 1fb42bae8b Use constant
> 1fb42bae8b is described below
>
> commit 1fb42bae8bb6e1eaf3ca494bcb98fef134ac59b0
> Author: Mark Thomas
> AuthorDate: Mon Sep 9 15:50:58 2024 +0100
>
> Use constant
Thanks !
Rémy
> ---
> test/org/apache/tomcat/util/net/TestCustomSsl.java | 2 ++
> test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 8
> test/org/apache/tomcat/util/net/TesterSupport.java | 3 ++-
> 3 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java
> b/test/org/apache/tomcat/util/net/TestCustomSsl.java
> index fc458cf14e..f4311a9e03 100644
> --- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
> +++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
> @@ -62,6 +62,8 @@ public class TestCustomSsl extends TomcatBaseTest {
> File keystoreFile = new File(TesterSupport.LOCALHOST_RSA_JKS);
>
> certificate.setCertificateKeystoreFile(keystoreFile.getAbsolutePath());
>
> +certificate.setCertificateKeyPassword(TesterSupport.JKS_PASS);
> +
> connector.setSecure(true);
> Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
>
> diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
> b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
> index 3c185ea3fe..9d5c8ecbf8 100644
> --- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
> +++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
> @@ -244,7 +244,7 @@ public class TestSSLHostConfigCompat extends
> TomcatBaseTest {
> case KEYSTORE: {
> SSLHostConfigCertificate sslHostConfigCertificateRsa = new
> SSLHostConfigCertificate(sslHostConfig, Type.RSA);
>
> sslHostConfigCertificateRsa.setCertificateKeystoreFile(getPath(TesterSupport.LOCALHOST_RSA_JKS));
> -
> sslHostConfigCertificateRsa.setCertificateKeystorePassword("changeit");
> +
> sslHostConfigCertificateRsa.setCertificateKeystorePassword(TesterSupport.JKS_PASS);
> sslHostConfig.addCertificate(sslHostConfigCertificateRsa);
> break;
> }
> @@ -252,7 +252,7 @@ public class TestSSLHostConfigCompat extends
> TomcatBaseTest {
> SSLHostConfigCertificate sslHostConfigCertificateRsa = new
> SSLHostConfigCertificate(sslHostConfig, Type.RSA);
>
> sslHostConfigCertificateRsa.setCertificateFile(getPath(TesterSupport.LOCALHOST_RSA_CERT_PEM));
>
> sslHostConfigCertificateRsa.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_RSA_KEY_PEM));
> -
> sslHostConfigCertificateRsa.setCertificateKeyPassword("changeit");
> +
> sslHostConfigCertificateRsa.setCertificateKeystorePassword(TesterSupport.JKS_PASS);
> sslHostConfig.addCertificate(sslHostConfigCertificateRsa);
> break;
> }
> @@ -266,7 +266,7 @@ public class TestSSLHostConfigCompat extends
> TomcatBaseTest {
> case KEYSTORE: {
> SSLHostConfigCertificate sslHostConfigCertificateEc = new
> SSLHostConfigCertificate(sslHostConfig, Type.EC);
>
> sslHostConfigCertificateEc.setCertificateKeystoreFile(getPath(TesterSupport.LOCALHOST_EC_JKS));
> -
> sslHostConfigCertificateEc.setCertificateKeystorePassword("changeit");
> +
> sslHostConfigCertificateEc.setCertificateKeystorePassword(TesterSupport.JKS_PASS);
> sslHostConfig.addCertificate(sslHostConfigCertificateEc);
> break;
> }
> @@ -274,7 +274,7 @@ public class TestSSLHostConfigCompat extends
> TomcatBaseTest {
> SSLHostConfigCertificate sslHostConfigCertificateEc = new
> SSLHostConfigCertificate(sslHostConfig, Type.EC);
>
> sslHostConfigCertificateEc.setCertificateFile(getPath(TesterSupport.LOCALHOST_EC_CERT_PEM));
>
> sslHostConfigCertificateEc.setCertificateKeyFile(getPath(TesterSupport.LOCALHOST_EC_KEY_PEM));
> -sslHostConfigCertificateEc.setCertificateKeyPassword("changeit");
> +
> sslHostConfigCertificateEc.setCertificateKeyPassword(TesterSupport.JKS_PASS);
> sslHostConfig.addCertificate(sslHostConfigCertificateEc);
> break;
> }
> diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
> b/test/org/apache/tomcat/util/net/TesterSupport.java
> index ca3a4cee6d..308f28acc2 100644
> --- a/test/org/apache/tomcat/util/net/TesterSupport.java
> +++ b/test/org/apache/tomcat/util/net/TesterSupport.java
> @@ -109,6 +109,7 @@ public final class TesterSupport {
> }
>
> public static void initSsl(Tomcat tomcat) {
> +/
