tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r692722 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/runtime/JspContextWrapper.java webapps/docs/changelog.xml
Date Sat, 06 Sep 2008 20:12:36 GMT
Author: markt
Date: Sat Sep  6 13:12:35 2008
New Revision: 692722

URL: http://svn.apache.org/viewvc?rev=692722&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45666
Prevent infinite loop on include

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep  6 13:12:35 2008
@@ -1 +1 @@
-/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645
+/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=692722&r1=692721&r2=692722&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Sep  6 13:12:35 2008
@@ -114,12 +114,6 @@
   +1: markt, remm
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45666
-  Prevent infinite loop on include
-  http://svn.apache.org/viewvc?rev=690781&view=rev
-  +1: markt, remm, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45628
   http://svn.apache.org/viewvc?rev=691282&view=rev
   JARs without deps should always be fulfilled

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java?rev=692722&r1=692721&r2=692722&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Sat Sep  6
13:12:35 2008
@@ -276,7 +276,7 @@
 
 	public void include(String relativeUrlPath, boolean flush)
 			throws ServletException, IOException {
-		include(relativeUrlPath, false); // XXX
+		invokingJspCtxt.include(relativeUrlPath, false);
 	}
 
 	public VariableResolver getVariableResolver() {

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=692722&r1=692721&r2=692722&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Sep  6 13:12:35 2008
@@ -42,10 +42,6 @@
         <bug>45453</bug>: Remove potential race condition in JDBC Realm.
         Based on a patch by Santtu Hyrkk. (markt)
       </fix>
-      <fix>
-        <bug>45528</bug>: Add detection for invalid SSL configuration to prevent
-        infinite logging loop on start-up. (markt)
-      </fix>
       <add>
         <bug>45576</bug>: Add DIGEST support to the JAAS Realm. (markt)
       </add>
@@ -62,6 +58,10 @@
   <subsection name="Coyote">
     <changelog>
       <fix>
+        <bug>45528</bug>: Add detection for invalid SSL configuration to prevent
+        infinite logging loop on start-up. (markt)
+      </fix>
+      <fix>
         <bug>45591</bug>: NPE on start-up failure in some cases. Based on a
         patch by Matt Passell. (markt)
       </fix>
@@ -75,6 +75,9 @@
         fix for <bug>42565</bug> has been reverted and a new fix applied.
         (markt)
       </fix> 
+      <fix>
+        <bug>45666</bug>: Prevent infinite loop on include. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message