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/startup EmbededTomcat.java
Date Sat, 12 Aug 2000 02:46:49 GMT
costin      00/08/11 19:46:49

  Modified:    src/share/org/apache/tomcat/service/http
                        HttpConnectionHandler.java
               src/share/org/apache/tomcat/startup EmbededTomcat.java
  Log:
  Merged fix from 3.2 ( isSecure() and getScheme() )
  
  Revision  Changes    Path
  1.29      +12 -4     jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpConnectionHandler.java
  
  Index: HttpConnectionHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpConnectionHandler.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- HttpConnectionHandler.java	2000/07/29 18:44:03	1.28
  +++ HttpConnectionHandler.java	2000/08/12 02:46:48	1.29
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpConnectionHandler.java,v
1.28 2000/07/29 18:44:03 costin Exp $
  - * $Revision: 1.28 $
  - * $Date: 2000/07/29 18:44:03 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpConnectionHandler.java,v
1.29 2000/08/12 02:46:48 costin Exp $
  + * $Revision: 1.29 $
  + * $Date: 2000/08/12 02:46:48 $
    *
    * ====================================================================
    *
  @@ -77,12 +77,17 @@
   
   public class HttpConnectionHandler  implements  TcpConnectionHandler {
       
  +    boolean secure=false;
       ContextManager contextM;
       
       public HttpConnectionHandler() {
   	super();
       }
   
  +    public void setSecure( boolean b ) {
  +	secure=b;
  +    }
  +    
       public void setAttribute(String name, Object value ) {
   	if("context.manager".equals(name) ) {
   	    setServer(value);
  @@ -181,7 +186,10 @@
   	    resA.setOutputStream( out );
   
   	    reqA.readNextRequest(resA);
  -
  +	    if( secure ) {
  +		reqA.setScheme( "https" );
  +	    }
  +	    
   	    contextM.service( reqA, resA );
   
   	    try {
  
  
  
  1.16      +3 -1      jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
  
  Index: EmbededTomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- EmbededTomcat.java	2000/07/27 18:47:52	1.15
  +++ EmbededTomcat.java	2000/08/12 02:46:49	1.16
  @@ -132,7 +132,9 @@
   	sc.setAttribute( "socketFactory",
   			 "org.apache.tomcat.net.SSLSocketFactory");
   	//	log("XXX " + keyFile + " " + keyPass);
  -	sc.setTcpConnectionHandler( new HttpConnectionHandler());
  +	HttpConnectionHandler ch=new HttpConnectionHandler();
  +	hc.setSecure(true);
  +	sc.setTcpConnectionHandler( hc );
   	// XXX add the secure socket
   	
   	contextM.addServerConnector(  sc );
  
  
  

Mime
View raw message