billbarker 2004/11/18 22:07:56
Modified: catalina/src/share/org/apache/catalina Globals.java
catalina/src/share/org/apache/catalina/connector
Request.java
Log:
Since we are documenting the SSL Session ID attribute, treat it like other
SSL attributes.
Revision Changes Path
1.13 +8 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java
Index: Globals.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Globals.java 15 Oct 2004 00:18:35 -0000 1.12
+++ Globals.java 19 Nov 2004 06:07:56 -0000 1.13
@@ -144,6 +144,13 @@
public static final String KEY_SIZE_ATTR =
"javax.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 =
+ "javax.servlet.request.ssl_session";
+
/**
* The servlet context attribute under which the managed bean Registry
1.17 +7 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java
Index: Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Request.java 26 Oct 2004 15:42:05 -0000 1.16
+++ Request.java 19 Nov 2004 06:07:56 -0000 1.17
@@ -863,6 +863,10 @@
if(attr != null) {
attributes.put(Globals.KEY_SIZE_ATTR, attr);
}
+ attr = coyoteRequest.getAttribute(Globals.SSL_SESSION_ID_ATTR);
+ if(attr != null) {
+ attributes.put(Globals.SSL_SESSION_ID_ATTR, attr);
+ }
attr = attributes.get(name);
}
return attr;
@@ -875,7 +879,8 @@
static boolean isSSLAttribute(String name) {
return Globals.CERTIFICATES_ATTR.equals(name) ||
Globals.CIPHER_SUITE_ATTR.equals(name) ||
- Globals.KEY_SIZE_ATTR.equals(name);
+ Globals.KEY_SIZE_ATTR.equals(name) ||
+ Globals.SSL_SESSION_ID_ATTR.equals(name);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
