You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2008/09/03 18:59:20 UTC
svn commit: r691686 - in /tomcat/tc6.0.x/trunk: STATUS.txt
java/org/apache/catalina/connector/CoyoteAdapter.java
webapps/docs/changelog.xml
Author: rjung
Date: Wed Sep 3 09:59:19 2008
New Revision: 691686
URL: http://svn.apache.org/viewvc?rev=691686&view=rev
Log:
Port of http://svn.apache.org/viewvc?rev=688857&view=rev
See also: http://marc.info/?t=121967803300004&r=1&w=2
No changelog entry, because the change is only for consistency
of the code, at least until we port
IntermediateInputStream.available() from tc5.5.x
B2CConverter forward.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.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=691686&r1=691685&r2=691686&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 3 09:59:19 2008
@@ -98,16 +98,6 @@
-1:
-* Fix redirect loop when using URIEncoding="UTF-8"
- http://svn.apache.org/viewvc?rev=688857&view=rev
- See also: http://marc.info/?t=121967803300004&r=1&w=2
- This is not yet a problem for TC6.0.x, but will be
- once we port IntermediateInputStream.available()
- from TC5.5.x B2CConverter forward.
- I propose to keep the CoyoteAdapter code consistent.
- +1: rjung, fhanik, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43327
http://svn.apache.org/viewvc?rev=687755&view=rev
Note use trunk >=r690600 of TC-native to test it as it also needs patches
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=691686&r1=691685&r2=691686&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Wed Sep 3 09:59:19 2008
@@ -613,8 +613,6 @@
if (conv == null) {
conv = new B2CConverter(enc);
request.setURIConverter(conv);
- } else {
- conv.recycle();
}
} catch (IOException e) {
// Ignore
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=691686&r1=691685&r2=691686&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Sep 3 09:59:19 2008
@@ -33,7 +33,7 @@
<body>
<section name="Tomcat 6.0.19 (remm)">
- <subsection name="Cataina">
+ <subsection name="Catalina">
<changelog>
<fix>
<bug>45453</bug>: Remove potential race condition in JDBC Realm.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org