cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpConnector.java

[glenn]

glenn       01/03/31 07:22:11

  Modified:    catalina/src/share/org/apache/catalina/connector/http
                        HttpConnector.java
  Log:
  Ensure socket ignores and logs SocketPermission AccessControlException's
  
  Revision  Changes    Path
  1.10      +8 -4      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java
  
  Index: HttpConnector.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- HttpConnector.java        2001/03/17 05:28:38     1.9
  +++ HttpConnector.java        2001/03/31 15:22:11     1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
 1.9 2001/03/17 05:28:38 remm Exp $
  - * $Revision: 1.9 $
  - * $Date: 2001/03/17 05:28:38 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
 1.10 2001/03/31 15:22:11 glenn Exp $
  + * $Revision: 1.10 $
  + * $Date: 2001/03/31 15:22:11 $
    *
    * ====================================================================
    *
  @@ -69,6 +69,7 @@
   import java.net.InetAddress;
   import java.net.ServerSocket;
   import java.net.Socket;
  +import java.security.AccessControlException;
   import java.util.Stack;
   import java.util.Vector;
   import java.util.Enumeration;
  @@ -94,7 +95,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.9 $ $Date: 2001/03/17 05:28:38 $
  + * @version $Revision: 1.10 $ $Date: 2001/03/31 15:22:11 $
    */
   
   
  @@ -764,6 +765,9 @@
                socket = serverSocket.accept();
                   if (connectionTimeout > 0)
                       socket.setSoTimeout(connectionTimeout);
  +            } catch (AccessControlException ace) {
  +                log("socket accept security exception: " + ace.getMessage());
  +                continue;
            } catch (IOException e) {
                if (started && !stopped)
                    log("accept: ", e);