Author: markt
Date: Sat Aug 11 09:52:40 2012
New Revision: 1371900
URL: http://svn.apache.org/viewvc?rev=1371900&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53545
Ensure buffered data is cleared when using a jsp:forward action to a static
resource inside classic a custom tag
Added:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/
- copied from r1371896, tomcat/trunk/test/org/apache/jasper/runtime/
tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
- copied unchanged from r1371896,
tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/tags/
- copied from r1371896, tomcat/trunk/test/org/apache/tomcat/unittest/tags/
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java
- copied unchanged from r1371896,
tomcat/trunk/test/org/apache/tomcat/unittest/tags/Bug53545.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/bug53545.tld
- copied unchanged from r1371896,
tomcat/trunk/test/webapp-3.0/WEB-INF/bug53545.tld
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53545.html
- copied unchanged from r1371896,
tomcat/trunk/test/webapp-3.0/bug53545.html
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53545.jsp
- copied unchanged from r1371896,
tomcat/trunk/test/webapp-3.0/bug53545.jsp
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
(props changed)
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
(props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1371896
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1371900&r1=1371899&r2=1371900&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
Sat Aug 11 09:52:40 2012
@@ -723,6 +723,7 @@ public class PageContextImpl extends Pag
// JSP.4.5 If the buffer was flushed, throw IllegalStateException
try {
out.clear();
+ baseOut.clear();
} catch (IOException ex) {
IllegalStateException ise = new IllegalStateException(Localizer
.getMessage("jsp.error.attempt_to_clear_flushed_buffer"));
Propchange:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
------------------------------------------------------------------------------
Merged
/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool:r1371896
Propchange:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
------------------------------------------------------------------------------
Merged
/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test:r1371896
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1371900&r1=1371899&r2=1371900&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 11 09:52:40 2012
@@ -135,6 +135,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>53545</bug>: Ensure buffered data is cleared when using a
+ jsp:forward action inside a classic custom tag. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Cluster">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
