You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/06/14 07:55:57 UTC
[tomcat] branch 10.1.x updated (46645ef4af -> 775e8c83cb)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 46645ef4af Fix BZ 66635 Correctly log PEM based keys/certificates
new 9f53094734 Remove transport.bio from catalina-tribes.jar.tmp.bnd
new 775e8c83cb Use correct separator
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java | 4 +++-
res/bnd/catalina-tribes.jar.tmp.bnd | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Use correct separator
Posted by ma...@apache.org.
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
commit 775e8c83cb390e8597b1d5f28ba3e3837f22855d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 14 08:55:23 2023 +0100
Use correct separator
---
java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index 0ef6ca0a7d..fd92d147e6 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.util.net;
+import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.security.KeyStore;
@@ -42,7 +43,8 @@ public class SSLHostConfigCertificate implements Serializable {
static final String DEFAULT_KEYSTORE_PROVIDER = System.getProperty("javax.net.ssl.keyStoreProvider");
static final String DEFAULT_KEYSTORE_TYPE = System.getProperty("javax.net.ssl.keyStoreType", "JKS");
- private static final String DEFAULT_KEYSTORE_FILE = System.getProperty("user.home")+"/.keystore";
+ private static final String DEFAULT_KEYSTORE_FILE =
+ System.getProperty("user.home") + File.pathSeparator + ".keystore";
private static final String DEFAULT_KEYSTORE_PASSWORD = "changeit";
// Internal
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Remove transport.bio from catalina-tribes.jar.tmp.bnd
Posted by ma...@apache.org.
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
commit 9f5309473476c78f9b4a2fc257a131fe585e484a
Author: Sokratis Zappis <sz...@redhat.com>
AuthorDate: Mon Jun 12 19:21:22 2023 +0300
Remove transport.bio from catalina-tribes.jar.tmp.bnd
---
res/bnd/catalina-tribes.jar.tmp.bnd | 1 -
1 file changed, 1 deletion(-)
diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd b/res/bnd/catalina-tribes.jar.tmp.bnd
index 09c7f54394..5b45cd88d6 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.jar.tmp.bnd
@@ -26,7 +26,6 @@ Export-Package: \
org.apache.catalina.tribes.membership,\
org.apache.catalina.tribes.tipis,\
org.apache.catalina.tribes.transport,\
- org.apache.catalina.tribes.transport.bio,\
org.apache.catalina.tribes.transport.nio,\
org.apache.catalina.tribes.util
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org