billbarker    2002/11/23 01:04:17

  Modified:    coyote/src/java/org/apache/coyote/tomcat3
                        CoyoteInterceptor2.java
  Log:
  Last one wasn't quite right.  At the momement, all SSL attributes are grabbed for a 
request for any.  Thus checking the 'key' isn't good enough.
  
  Revision  Changes    Path
  1.14      +5 -7      
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java
  
  Index: CoyoteInterceptor2.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CoyoteInterceptor2.java   23 Nov 2002 08:38:23 -0000      1.13
  +++ CoyoteInterceptor2.java   23 Nov 2002 09:04:16 -0000      1.14
  @@ -241,14 +241,12 @@
               if(isSSLAttribute(key)) {
                   cReq.action(ActionCode.ACTION_REQ_SSL_ATTRIBUTE,
                               httpReq.getCoyoteRequest() );
  -             if( SSLSupport.CERTIFICATE_KEY.equals(key) ) {
  -                 // Only allowed a single cert under the 2.2 Spec.
  -                 Object [] value = (Object []) cReq.getAttribute(key);
  -                 if( value != null ) {
  -                     cReq.setAttribute(key, value[0]);
  -                 }
  +             // Only allowed a single cert under the 2.2 Spec.
  +             Object [] value = (Object []) 
cReq.getAttribute(SSLSupport.CERTIFICATE_KEY);
  +             if( value != null ) {
  +                 cReq.setAttribute(key, value[0]);
                }
  -
  +             
                   return cReq.getAttribute(key);
               }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to