[tomcat] branch 9.0.x updated: Correct regression in back-port for clean-up

[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 5eadf19  Correct regression in back-port for clean-up
5eadf19 is described below

commit 5eadf19cc3ecf1bf6007e20a7aee55829f01405a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 31 17:14:07 2020 +0100

    Correct regression in back-port for clean-up
---
 java/org/apache/catalina/Globals.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/Globals.java 
b/java/org/apache/catalina/Globals.java
index 312d78b..137d808 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -152,7 +152,7 @@ public final class Globals {
      * objects representing the certificate chain presented by our client,
      * if any.
      */
-    public static final String CERTIFICATES_ATTR = 
"jakarta.servlet.request.X509Certificate";
+    public static final String CERTIFICATES_ATTR = 
"java.servlet.request.X509Certificate";
 
 
     /**
@@ -160,28 +160,28 @@ public final class Globals {
      * being used on an SSL connection (as an object of type
      * java.lang.String).
      */
-    public static final String CIPHER_SUITE_ATTR = 
"jakarta.servlet.request.cipher_suite";
+    public static final String CIPHER_SUITE_ATTR = 
"java.servlet.request.cipher_suite";
 
 
     /**
      * The request attribute under which we store the key size being used for
      * this SSL connection (as an object of type java.lang.Integer).
      */
-    public static final String KEY_SIZE_ATTR = 
"jakarta.servlet.request.key_size";
+    public static final String KEY_SIZE_ATTR = "java.servlet.request.key_size";
 
 
     /**
      * The request attribute under which we store the session id being used
      * for this SSL connection (as an object of type java.lang.String).
      */
-    public static final String SSL_SESSION_ID_ATTR = 
"jakarta.servlet.request.ssl_session_id";
+    public static final String SSL_SESSION_ID_ATTR = 
"java.servlet.request.ssl_session_id";
 
 
     /**
      * The request attribute key for the session manager.
      * This one is a Tomcat extension to the Servlet spec.
      */
-    public static final String SSL_SESSION_MGR_ATTR = 
"jakarta.servlet.request.ssl_session_mgr";
+    public static final String SSL_SESSION_MGR_ATTR = 
"java.servlet.request.ssl_session_mgr";
 
 
     // ------------------------------------------------- Session attribute 
names


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