billbarker 2002/10/20 15:48:49
Modified: coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
CoyoteRequest.java
Log:
Arrange to have the SSL attributes in the CoyoteRequest so that they show up for
getAttributeNames.
Fix for bug #13658
Reported By: [EMAIL PROTECTED]
Revision Changes Path
1.12 +11 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CoyoteAdapter.java 2 Oct 2002 05:29:53 -0000 1.11
+++ CoyoteAdapter.java 20 Oct 2002 22:48:49 -0000 1.12
@@ -306,7 +306,13 @@
parseCookies(req, request);
// Set the SSL properties
- res.action(ActionCode.ACTION_REQ_SSL_ATTRIBUTE,request.getRequest());
+ if( request.isSecure() ) {
+ res.action(ActionCode.ACTION_REQ_SSL_ATTRIBUTE,request.getRequest());
+ //Set up for getAttributeNames
+ request.getAttribute(Globals.CERTIFICATES_ATTR);
+ request.getAttribute(Globals.CIPHER_SUITE_ATTR);
+ request.getAttribute(Globals.KEY_SIZE_ATTR);
+ }
// Set the remote principal
String principal = req.getRemoteUser().toString();
1.27 +7 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
Index: CoyoteRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- CoyoteRequest.java 23 Sep 2002 00:12:26 -0000 1.26
+++ CoyoteRequest.java 20 Oct 2002 22:48:49 -0000 1.27
@@ -790,8 +790,10 @@
return(attr);
attr = coyoteRequest.getAttribute(name);
- if(attr != null)
+ if(attr != null) {
+ attributes.put(name, attr);
return attr;
+ }
// XXX Should move to Globals
if(Constants.SSL_CERTIFICATE_ATTR.equals(name)) {
coyoteRequest.action(ActionCode.ACTION_REQ_SSL_CERTIFICATE, null);
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
