Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 4213 invoked from network); 12 May 2005 13:01:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 May 2005 13:01:26 -0000 Received: (qmail 66999 invoked by uid 500); 12 May 2005 13:05:06 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 66954 invoked by uid 500); 12 May 2005 13:05:06 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: 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 66937 invoked by uid 500); 12 May 2005 13:05:06 -0000 Received: (qmail 66931 invoked by uid 99); 12 May 2005 13:05:06 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 12 May 2005 06:05:06 -0700 Received: (qmail 4152 invoked by uid 1135); 12 May 2005 13:01:05 -0000 Date: 12 May 2005 13:01:05 -0000 Message-ID: <20050512130105.4151.qmail@minotaur.apache.org> From: remm@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N remm 2005/05/12 06:01:05 Modified: jasper2/src/share/org/apache/jasper/servlet JspCServletContext.java webapps/docs changelog.xml Log: - 34465: jspc without web.xml. - Submitted by Yoichi Hirose. Revision Changes Path 1.4 +7 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java Index: JspCServletContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JspCServletContext.java 17 Mar 2004 19:23:05 -0000 1.3 +++ JspCServletContext.java 12 May 2005 13:01:04 -0000 1.4 @@ -235,7 +235,13 @@ if (!path.startsWith("/")) throw new MalformedURLException("Path '" + path + "' does not start with '/'"); - return (new URL(myResourceBaseURL, path.substring(1))); + URL url = new URL(myResourceBaseURL, path.substring(1)); + if ("file".equals(url.getProtocol())) { + if (!(new File(url.getFile())).exists()) { + return null; + } + } + return url; } 1.308 +7 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- changelog.xml 11 May 2005 21:39:41 -0000 1.307 +++ changelog.xml 12 May 2005 13:01:04 -0000 1.308 @@ -153,6 +153,10 @@ default encoding. A side effect of this fix is that the bodies of POST requests that require FORM authentication are now buffered and made available after a sucessful login. (markt) + + 34840: Better handling of external WARs redeployment, and ignore docBase specified + in context file if within the Host appBase (remm) + @@ -199,6 +203,9 @@ 34652: Add the ability to get SMAPs when precompiling, submitted by Daryl Robbins (remm) + + 34465: Jspc failure if there is no web.xml, submitted by Yoichi Hirose (remm) + --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org