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 2011/09/08 15:53:03 UTC
svn commit: r1166690 - in /tomcat/trunk/java/org/apache/catalina:
Globals.java connector/Request.java valves/SSLValve.java
Author: markt
Date: Thu Sep 8 13:53:02 2011
New Revision: 1166690
URL: http://svn.apache.org/viewvc?rev=1166690&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1166690&r1=1166689&r2=1166690&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Thu Sep 8 13:53:02 2011
@@ -99,13 +99,7 @@ public final class Globals {
*/
public static final String SSL_SESSION_ID_ATTR =
"javax.servlet.request.ssl_session_id";
- /**
- * Tomcat specific attribute as used in Tomcat 6.
- * @deprecated
- */
- @Deprecated
- public static final String SSL_SESSION_ID_TOMCAT_ATTR =
- "javax.servlet.request.ssl_session";
+
/**
* The request attribute key for the session manager.
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1166690&r1=1166689&r2=1166690&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Sep 8 13:53:02 2011
@@ -965,7 +965,6 @@ public class Request
attr = coyoteRequest.getAttribute(Globals.SSL_SESSION_ID_ATTR);
if(attr != null) {
attributes.put(Globals.SSL_SESSION_ID_ATTR, attr);
- attributes.put(Globals.SSL_SESSION_ID_TOMCAT_ATTR, attr);
}
attr = coyoteRequest.getAttribute(Globals.SSL_SESSION_MGR_ATTR);
if(attr != null) {
@@ -986,7 +985,6 @@ public class Request
Globals.CIPHER_SUITE_ATTR.equals(name) ||
Globals.KEY_SIZE_ATTR.equals(name) ||
Globals.SSL_SESSION_ID_ATTR.equals(name) ||
- Globals.SSL_SESSION_ID_TOMCAT_ATTR.equals(name) ||
Globals.SSL_SESSION_MGR_ATTR.equals(name);
}
@@ -1005,8 +1003,6 @@ public class Request
* <li>{@link Globals#CIPHER_SUITE_ATTR} (SSL connections only)</li>
* <li>{@link Globals#KEY_SIZE_ATTR} (SSL connections only)</li>
* <li>{@link Globals#SSL_SESSION_ID_ATTR} (SSL connections only)</li>
- * <li>{@link Globals#SSL_SESSION_ID_TOMCAT_ATTR} (SSL connections only)
- * </li>
* <li>{@link Globals#SSL_SESSION_MGR_ATTR} (SSL connections only)</li>
* </ul>
* The underlying connector may also expose request attributes. These all
Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=1166690&r1=1166689&r2=1166690&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java Thu Sep 8 13:53:02 2011
@@ -125,7 +125,6 @@ public class SSLValve extends ValveBase
strcert0 = mygetHeader(request, "ssl_session_id");
if (strcert0 != null) {
request.setAttribute(Globals.SSL_SESSION_ID_ATTR, strcert0);
- request.setAttribute(Globals.SSL_SESSION_ID_TOMCAT_ATTR, strcert0);
}
strcert0 = mygetHeader(request, "ssl_cipher_usekeysize");
if (strcert0 != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org