cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProtocol.java

[remm]

remm        2005/07/07 07:08:40

  Modified:    util/java/org/apache/tomcat/util/net AprEndpoint.java
               http11/src/java/org/apache/coyote/http11
                        Http11AprProtocol.java
  Log:
  - Client cert config should be an int.
  
  Revision  Changes    Path
  1.59      +4 -4      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- AprEndpoint.java  7 Jul 2005 13:38:38 -0000       1.58
  +++ AprEndpoint.java  7 Jul 2005 14:08:40 -0000       1.59
  @@ -418,9 +418,9 @@
       /**
        * SSL verify client.
        */
  -    protected boolean SSLVerifyClient = false;
  -    public boolean getSSLVerifyClient() { return SSLVerifyClient; }
  -    public void setSSLVerifyClient(boolean SSLVerifyClient) { 
this.SSLVerifyClient = SSLVerifyClient; }
  +    protected int SSLVerifyClient = 0;
  +    public int getSSLVerifyClient() { return SSLVerifyClient; }
  +    public void setSSLVerifyClient(int SSLVerifyClient) { 
this.SSLVerifyClient = SSLVerifyClient; }
        
       
       /**
  @@ -534,7 +534,7 @@
               // Load Server key and certificate
               SSLContext.setCertificate(sslContext, SSLCertificateFile, 
SSLCertificateKeyFile, SSLPassword, SSL.SSL_AIDX_RSA);
               // Support Client Certificates
  -            SSLContext.setVerify(sslContext, SSLVerifyClient ? 1 : 0, 
SSLVerifyDepth);
  +            SSLContext.setVerify(sslContext, SSLVerifyClient, 
SSLVerifyDepth);
               if (SSLCACertificateFile != null) {
                   SSLContext.setCACertificate(sslContext, 
SSLCACertificateFile, null);
               }
  
  
  
  1.13      +2 -2      
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
  
  Index: Http11AprProtocol.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Http11AprProtocol.java    7 Jul 2005 13:38:38 -0000       1.12
  +++ Http11AprProtocol.java    7 Jul 2005 14:08:40 -0000       1.13
  @@ -568,8 +568,8 @@
       /**
        * SSL verify client.
        */
  -    public boolean getSSLVerifyClient() { return ep.getSSLVerifyClient(); }
  -    public void setSSLVerifyClient(boolean SSLVerifyClient) { 
ep.setSSLVerifyClient(SSLVerifyClient); }
  +    public int getSSLVerifyClient() { return ep.getSSLVerifyClient(); }
  +    public void setSSLVerifyClient(int SSLVerifyClient) { 
ep.setSSLVerifyClient(SSLVerifyClient); }
   
   
       /**
  
  
  

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