tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r757219 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt jasper/tc5.5.x/src/share/org/apache/jasper/runtime/JspContextWrapper.java
Date Sun, 22 Mar 2009 17:08:42 GMT
Author: markt
Date: Sun Mar 22 17:08:41 2009
New Revision: 757219

URL: http://svn.apache.org/viewvc?rev=757219&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45666
Patch provided by Tom Wadzinski

Modified:
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/current/tc5.5.x/STATUS.txt
    tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/runtime/JspContextWrapper.java

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=757219&r1=757218&r2=757219&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Mar 22 17:08:41 2009
@@ -44,7 +44,15 @@
       </fix>
     </changelog>
   </subsection>
-  <subsection name="webapps">
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        <bug>45666</bug>: Fix infinite loop on include. Patch provided by Tom
+        Wadzinski. (markt)
+      </fix>
+    </changelog>
+  </subsection>
+  <subsection name="Webapps">
     <changelog>
       <fix>
         Fix CVE-2009-0781. XSS in calendar example. (markt)

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=757219&r1=757218&r2=757219&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Mar 22 17:08:41 2009
@@ -38,12 +38,6 @@
   +1: markt, rjung
   -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, rjung, mturk
-  -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/jasper/tc5.5.x/src/share/org/apache/jasper/runtime/JspContextWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/runtime/JspContextWrapper.java?rev=757219&r1=757218&r2=757219&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/runtime/JspContextWrapper.java (original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/runtime/JspContextWrapper.java Sun Mar
22 17:08:41 2009
@@ -284,9 +284,9 @@
 	invokingJspCtxt.include(relativeUrlPath);
     }
 
-    public void include(String relativeUrlPath, boolean flush) 
-	    throws ServletException, IOException {
-	include(relativeUrlPath, false); // XXX
+    public void include(String relativeUrlPath, boolean flush)
+    throws ServletException, IOException {
+        invokingJspCtxt.include(relativeUrlPath, false);
     }
 
     public VariableResolver getVariableResolver() {



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


Mime
View raw message