Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 92989 invoked from network); 27 Jul 2006 00:35:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Jul 2006 00:35:06 -0000 Received: (qmail 71433 invoked by uid 500); 27 Jul 2006 00:34:57 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 71309 invoked by uid 500); 27 Jul 2006 00:34:57 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 71284 invoked by uid 500); 27 Jul 2006 00:34:56 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 71279 invoked by uid 99); 27 Jul 2006 00:34:56 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jul 2006 17:34:56 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jul 2006 17:34:56 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 07C481A981D; Wed, 26 Jul 2006 17:34:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r425918 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java Date: Thu, 27 Jul 2006 00:34:35 -0000 To: tomcat-dev@jakarta.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060727003436.07C481A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: markt Date: Wed Jul 26 17:34:35 2006 New Revision: 425918 URL: http://svn.apache.org/viewvc?rev=425918&view=rev Log: Port of fix for bug 39592. Stop stack traces for HEAD requests. Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java?rev=425918&r1=425917&r2=425918&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java Wed Jul 26 17:34:35 2006 @@ -533,7 +533,8 @@ // a problem // if a truly empty file //were included, but not sure how else to tell. - if (retVal.equals("")) { + if (retVal.equals("") && !req.getMethod().equalsIgnoreCase( + org.apache.coyote.http11.Constants.HEAD)) { throw new IOException("Couldn't find file: " + path); } return retVal; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org