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/01/12 17:20:32 UTC

[tomcat] branch 10.1.x updated: Follow-up - restore call changed in error. Fix correct (issuer) call.

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 c68a614d70 Follow-up - restore call changed in error. Fix correct (issuer) call.
c68a614d70 is described below

commit c68a614d7003316cc972684e24c98074fba5dee5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jan 12 17:14:53 2023 +0000

    Follow-up - restore call changed in error. Fix correct (issuer) call.
---
 java/org/apache/catalina/valves/rewrite/ResolverImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 508a2ac28f..f6adc5a128 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -236,7 +236,7 @@ public class ResolverImpl extends Resolver {
             return certificates[0].getSubjectX500Principal().toString();
         } else if (key.startsWith("S_DN_")) {
             key = key.substring("S_DN_".length());
-            return resolveComponent(certificates[0].getSubjectX500Principal().toString(), key);
+            return resolveComponent(certificates[0].getSubjectX500Principal().getName(), key);
         } else if (key.startsWith("SAN_Email_")) {
             // Type rfc822Name, which is 1
             key = key.substring("SAN_Email_".length());
@@ -249,7 +249,7 @@ public class ResolverImpl extends Resolver {
             return certificates[0].getIssuerX500Principal().getName();
         } else if (key.startsWith("I_DN_")) {
             key = key.substring("I_DN_".length());
-            return resolveComponent(certificates[0].getIssuerX500Principal().getName(), key);
+            return resolveComponent(certificates[0].getIssuerX500Principal().toString(), key);
         } else if (key.equals("V_START")) {
             return String.valueOf(certificates[0].getNotBefore().getTime());
         } else if (key.equals("V_END")) {


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