Author: markt
Date: Sat Nov 15 17:26:59 2008
New Revision: 717959
URL: http://svn.apache.org/viewvc?rev=717959&view=rev
Log:
Fix regression in TC4 connector code caused by fix for 44494
Modified:
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/current/tc4.1.x/STATUS.txt
Modified:
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java?rev=717959&r1=717958&r2=717959&view=diff
==============================================================================
---
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
(original)
+++
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Sat Nov 15 17:26:59 2008
@@ -539,8 +539,6 @@
if (conv == null) {
conv = new B2CConverter(enc);
request.setURIConverter(conv);
- } else {
- conv.recycle();
}
} catch (IOException e) {
// Ignore
Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=717959&r1=717958&r2=717959&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Sat Nov 15 17:26:59
2008
@@ -2018,6 +2018,9 @@
Don't used custom status messages in HTTP headers.
This is CVE-2008-1232
+[4.1.39] CoyoteConnector
+ Fix a regression caused by the fix for #44494.
+
----------------
Jasper Bug Fixes:
----------------
Modified: tomcat/current/tc4.1.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=717959&r1=717958&r2=717959&view=diff
==============================================================================
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Sat Nov 15 17:26:59 2008
@@ -26,12 +26,6 @@
[ New proposals should be added at the end of the list ]
-* Fix regression in previous fix for bug 44494
- This aligns the CoyoteAdaptor code in 4.1.x with that in 5.5.x and 6.0.x
- http://people.apache.org/~markt/patches/2008-10-30-bug44494-regression.patch
- +1: markt, rjung, jfclere
- -1:
-
* Fix installer packaging - only include the files we meant to
http://people.apache.org/~markt/patches/2008-10-31-tc4-wininstaller.patch
+1: markt, jfclere
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
