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/jk/java/org/apache/jk/server JkMain.java
Date Wed, 02 Jul 2003 03:42:30 GMT
billbarker    2003/07/01 20:42:30

  Modified:    jk/java/org/apache/jk/server JkMain.java
  Log:
  Require that the user explicitly configure that they want Tomcat to register the (deprecated)
SSL handler.
  
  The previous behavior of register-always was just pure evil.  At best it did nothing (if
JSSE isn't installed, or you are using a non-Sun 1.4.x vendor), at worst it breaks apps. 
It also hasn't been necessary for Tomcat internals in any versions 3.3-5.0 for a very long
time (none of them use java.net.URL to construct the redirect-URL).  It also creates problems
if you are using Sun's 1.4.x JVM, since the handler it installs is deprecated.
  
  Reported By: Mayne, Peter <PeterMayne@ap.spherion.com>
  
  Revision  Changes    Path
  1.39      +5 -1      jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java
  
  Index: JkMain.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- JkMain.java	3 May 2003 01:13:35 -0000	1.38
  +++ JkMain.java	2 Jul 2003 03:42:30 -0000	1.39
  @@ -130,7 +130,6 @@
           modules.put("container","org.apache.jk.common.HandlerRequest");
           modules.put("modjk","org.apache.jk.common.ModJkMX");
   
  -        initHTTPSUrls();
       }
   
       public static JkMain getJkMain() {
  @@ -288,6 +287,11 @@
                       log.debug( "No properties file found " + propsF );
               }
           }
  +        String initHTTPS = props.get("class.initHTTPS");
  +        if("true".equalsIgnoreCase(initHTTPS)) {
  +            initHTTPSUrls();
  +        }
  +
           long t2=System.currentTimeMillis();
           initTime=t2-t1;
       }
  
  
  

---------------------------------------------------------------------
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