Author: jfclere
Date: Sun Apr 28 09:05:51 2013
New Revision: 1476738
URL: http://svn.apache.org/r1476738
Log:
commit accepted patch for BZ 52055.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476738&r1=1476737&r2=1476738&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 28 09:05:51 2013
@@ -31,16 +31,6 @@ PATCHES ACCEPTED TO BACKPORT:
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* For https://issues.apache.org/bugzilla/show_bug.cgi?id=52055
- Ensure that filters are recycled.
- Inspired by r1334790 (TC7), r565964 (TC6 Nio)
- I do not have evidence that this change matters, but it should not hurt.
- The nextRequest() method already recycles the filters. If it has been called,
- then lastActiveFilter is -1 and the new code will be NOOP.
- http://people.apache.org/~kkolinko/patches/2012-06-02_tc6_recycle.patch
- +1: kkolinko, schultz, jfclere
- -1:
-
* Improve method cache handling in SecurityUtil class.
Add caching for Comet methods and simplify cache lookup code.
It is backport of r728776 (BZ 46304) and r1429360
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1476738&r1=1476737&r2=1476738&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Sun Apr 28 09:05:51 2013
@@ -275,6 +275,11 @@ public class InternalAprInputBuffer impl
// Recycle Request object
request.recycle();
+ // Recycle filters
+ for (int i = 0; i <= lastActiveFilter; i++) {
+ activeFilters[i].recycle();
+ }
+
socket = 0;
lastValid = 0;
pos = 0;
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1476738&r1=1476737&r2=1476738&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
Sun Apr 28 09:05:51 2013
@@ -332,6 +332,11 @@ public class InternalAprOutputBuffer
response.recycle();
bbuf.clear();
+ // Recycle filters
+ for (int i = 0; i <= lastActiveFilter; i++) {
+ activeFilters[i].recycle();
+ }
+
socket = 0;
pos = 0;
lastActiveFilter = -1;
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=1476738&r1=1476737&r2=1476738&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
Sun Apr 28 09:05:51 2013
@@ -276,6 +276,11 @@ public class InternalInputBuffer impleme
// Recycle Request object
request.recycle();
+ // Recycle filters
+ for (int i = 0; i <= lastActiveFilter; i++) {
+ activeFilters[i].recycle();
+ }
+
inputStream = null;
lastValid = 0;
pos = 0;
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=1476738&r1=1476737&r2=1476738&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
Sun Apr 28 09:05:51 2013
@@ -347,6 +347,11 @@ public class InternalOutputBuffer
response.recycle();
socketBuffer.recycle();
+ // Recycle filters
+ for (int i = 0; i <= lastActiveFilter; i++) {
+ activeFilters[i].recycle();
+ }
+
outputStream = null;
pos = 0;
lastActiveFilter = -1;
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=1476738&r1=1476737&r2=1476738&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 28 09:05:51 2013
@@ -47,6 +47,9 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>52055</bug>: Ensure that filters are recycled. (markt/kkolinko)
+ </fix>
+ <fix>
<bug>52184</bug>: Reduce log level for invalid cookies. (markt)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
