From tomcat-dev-return-5123-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org Thu Feb 07 17:07:48 2002 Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 10024 invoked from network); 7 Feb 2002 17:07:48 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 7 Feb 2002 17:07:48 -0000 Received: (qmail 24160 invoked by uid 97); 7 Feb 2002 17:07:41 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 24105 invoked by uid 97); 7 Feb 2002 17:07:40 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 24067 invoked by uid 97); 7 Feb 2002 17:07:40 -0000 Date: 7 Feb 2002 17:07:35 -0000 Message-ID: <20020207170735.59458.qmail@icarus.apache.org> From: costin@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common HandlerRequest.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N costin 02/02/07 09:07:35 Modified: jk/java/org/apache/jk/common HandlerRequest.java Log: Don't generate ajp13.id if conf/ dir not found or if no secret. Revision Changes Path 1.5 +9 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java Index: HandlerRequest.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- HandlerRequest.java 6 Feb 2002 17:48:22 -0000 1.4 +++ HandlerRequest.java 7 Feb 2002 17:07:35 -0000 1.5 @@ -260,9 +260,17 @@ int portInt=8009; // tcpCon.getPort(); InetAddress address=null; // tcpCon.getAddress(); + if( requiredSecret == null ) + return; + File f1=new File( wEnv.getJkHome() ); + File f2=new File( f1, "conf" ); + if( ! f2.exists() ) { + log( "No conf dir for ajp13.id " + f2 ); + return; + } - File sf=new File( f1, "conf/ajp13.id"); + File sf=new File( f2, "ajp13.id"); if( dL > 0) d( "Using stop file: "+sf); -- To unsubscribe, e-mail: For additional commands, e-mail: