tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/net SSLSocketFactory.java
Date Wed, 04 Oct 2000 19:59:21 GMT
costin      00/10/04 12:59:20

  Modified:    src/share/org/apache/tomcat/net Tag: tomcat_32
                        SSLSocketFactory.java
  Log:
  Ops, I commited something that doesn't build.
  Fixed it - now it should be ok.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.3   +6 -5      jakarta-tomcat/src/share/org/apache/tomcat/net/Attic/SSLSocketFactory.java
  
  Index: SSLSocketFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/net/Attic/SSLSocketFactory.java,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- SSLSocketFactory.java	2000/10/04 19:55:26	1.2.2.2
  +++ SSLSocketFactory.java	2000/10/04 19:59:19	1.2.2.3
  @@ -236,11 +236,11 @@
   	request. This will be replaced with a clean, interceptor
   	based mechanism in 3.3
       */
  -    public void preProcessRequest( Socket sslSocket,
  +    public void preProcessRequest( Socket socket,
   				   org.apache.tomcat.core.Request reqA )
       {
  -	//Set the client certificate attribute if appropriate
  -	if( socket instanceof javax.net.ssl.SSLSocket ) {
  +	try {
  +	    //Set the client certificate attribute if appropriate
   	    javax.net.ssl.SSLSocket sslSocket = (javax.net.ssl.SSLSocket)socket;
   	    javax.security.cert.X509Certificate[] certChain = sslSocket.
   		getSession().getPeerCertificateChain();
  @@ -251,8 +251,9 @@
   		reqA.setAttribute("javax.servlet.request.X509Certificate",
   				  certChain[0]);
   	    }
  -	    // this is a  ssl socket
  -	    reqA.setScheme( "https" );
  +	} catch( Exception ex ) {
   	}
  +	// this is a  ssl socket
  +	reqA.setScheme( "https" );
       }
   }
  
  
  

Mime
View raw message