tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteServerSocketFactory.java
Date Sun, 25 Jan 2004 22:54:13 GMT
billbarker    2004/01/25 14:54:13

  Modified:    coyote/src/java/org/apache/coyote/tomcat4
                        CoyoteConnector.java CoyoteServerSocketFactory.java
  Log:
  Update to allow the SSL connector to only "want" clientAuth.
  
  Submitted By:  Michael Becker Michael.Becker@archongroup.com
  
  Revision  Changes    Path
  1.33      +6 -8      jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- CoyoteConnector.java	23 Jan 2004 20:47:13 -0000	1.32
  +++ CoyoteConnector.java	25 Jan 2004 22:54:13 -0000	1.33
  @@ -1259,10 +1259,8 @@
                   (CoyoteServerSocketFactory) factory;
               IntrospectionUtils.setProperty(protocolHandler, "algorithm",
                                              ssf.getAlgorithm());
  -            if (ssf.getClientAuth()) {
  -                IntrospectionUtils.setProperty(protocolHandler, "clientauth",
  -                                               "" + ssf.getClientAuth());
  -            }
  +	    IntrospectionUtils.setProperty(protocolHandler, "clientauth",
  +                                           ssf.getClientAuth());
               IntrospectionUtils.setProperty(protocolHandler, "keystore",
                                              ssf.getKeystoreFile());
               IntrospectionUtils.setProperty(protocolHandler, "randomfile",
  
  
  
  1.6       +7 -4      jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java
  
  Index: CoyoteServerSocketFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CoyoteServerSocketFactory.java	18 Sep 2003 16:13:51 -0000	1.5
  +++ CoyoteServerSocketFactory.java	25 Jan 2004 22:54:13 -0000	1.6
  @@ -73,7 +73,10 @@
    * <li><strong>algorithm</strong> - Certificate encoding algorithm
    *     to use. [SunX509]</li>
    * <li><strong>clientAuth</strong> - Require client authentication if
  - *     set to <code>true</code>. [false]</li>
  + *     set to <code>true</code>. Want client authentication if set to
  + *     <code>want</code>. (Note: Only supported in the JSSE included with 
  + *     J2SDK 1.4 and above.  Prior versions of JSSE and PureTLS will treat 
  + *     'want' as 'false'.) [false]</li>
    * <li><strong>keystoreFile</strong> - Pathname to the Key Store file
to be
    *     loaded.  This must be an absolute path, or a relative path that
    *     is resolved against the "catalina.base" system property.
  @@ -114,13 +117,13 @@
       /**
        * Should we require client authentication?
        */
  -    private boolean clientAuth = false;
  +    private String clientAuth = "false";
   
  -    public boolean getClientAuth() {
  +    public String getClientAuth() {
           return (this.clientAuth);
       }
   
  -    public void setClientAuth(boolean clientAuth) {
  +    public void setClientAuth(String clientAuth) {
           this.clientAuth = clientAuth;
       }
   
  
  
  

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


Mime
View raw message