glenn 01/03/31 07:22:20 Modified: catalina/src/share/org/apache/catalina/connector/http10 HttpConnector.java Log: Ensure socket ignores and logs SocketPermission AccessControlException's Revision Changes Path 1.2 +8 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java Index: HttpConnector.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HttpConnector.java 2001/01/23 03:55:54 1.1 +++ HttpConnector.java 2001/03/31 15:22:20 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v 1.1 2001/01/23 03:55:54 remm Exp $ - * $Revision: 1.1 $ - * $Date: 2001/01/23 03:55:54 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v 1.2 2001/03/31 15:22:20 glenn Exp $ + * $Revision: 1.2 $ + * $Date: 2001/03/31 15:22:20 $ * * ==================================================================== * @@ -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 org.apache.catalina.Connector; @@ -93,7 +94,7 @@ * purposes. Not intended to be the final solution. * * @author Craig R. McClanahan - * @version $Revision: 1.1 $ $Date: 2001/01/23 03:55:54 $ + * @version $Revision: 1.2 $ $Date: 2001/03/31 15:22:20 $ */ @@ -741,6 +742,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);