svn commit: r639920 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/ROOT/admin/
Author: markt Date: Fri Mar 21 16:50:39 2008 New Revision: 639920 URL: http://svn.apache.org/viewvc?rev=639920&view=rev Log: Remove reference to admin application. Removed: tomcat/tc6.0.x/trunk/webapps/ROOT/admin/ Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=639920&r1=639919&r2=639920&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 21 16:50:39 2008 @@ -55,11 +55,6 @@ +0: remm: do we really want to fix these sort of "bugs" ? -1: -* Remove reference to admin application - http://svn.apache.org/viewvc?rev=639198&view=rev - +1: markt, remm, fhanik - -1: - * Update comments re JAR renaming in web.xml http://svn.apache.org/viewvc?rev=639771&view=rev +1: markt, fhanik - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r639919 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Mar 21 16:49:17 2008 New Revision: 639919 URL: http://svn.apache.org/viewvc?rev=639919&view=rev Log: Must remember to vote for my own proposals. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=639919&r1=639918&r2=639919&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 21 16:49:17 2008 @@ -62,10 +62,10 @@ * Update comments re JAR renaming in web.xml http://svn.apache.org/viewvc?rev=639771&view=rev - +1: fhanik + +1: markt, fhanik -1: * Fix docs re use of maxActive http://svn.apache.org/viewvc?rev=639842&view=rev - +1: fhanik + +1: markt, fhanik -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r639910 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Fri Mar 21 16:30:48 2008 New Revision: 639910 URL: http://svn.apache.org/viewvc?rev=639910&view=rev Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=639910&r1=639909&r2=639910&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 21 16:30:48 2008 @@ -57,15 +57,15 @@ * Remove reference to admin application http://svn.apache.org/viewvc?rev=639198&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Update comments re JAR renaming in web.xml http://svn.apache.org/viewvc?rev=639771&view=rev - +1: + +1: fhanik -1: * Fix docs re use of maxActive http://svn.apache.org/viewvc?rev=639842&view=rev - +1: + +1: fhanik -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r639909 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/http/ServerCookie.java
Author: fhanik
Date: Fri Mar 21 16:29:17 2008
New Revision: 639909
URL: http://svn.apache.org/viewvc?rev=639909&view=rev
Log:
only make version switch on cookie value
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=639909&r1=639908&r2=639909&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 21 16:29:17 2008
@@ -55,24 +55,6 @@
+0: remm: do we really want to fix these sort of "bugs" ?
-1:
-* Cookie completion. Only do the autoswitch on the value of the cookie, quote
domain/path same way as we did before
-258c258
-< version = maybeQuote2(version, buf, value);
-> version = maybeQuote2(version, buf, value,true);
-339a340,343
-> return maybeQuote2(version,buf,value,false);
-> }
->
-> public static int maybeQuote2 (int version, StringBuffer buf, String
value, boolean allowVersionSwitch) {
-348c352
-< } else if ((!STRICT_SERVLET_COMPLIANCE) && version==0 &&
!isToken2(value)) {
-> } else if (allowVersionSwitch && (!STRICT_SERVLET_COMPLIANCE) &&
version==0 && !isToken2(value)) {
-
- +1: fhanik, markt, remm
- -1:
-
* Remove reference to admin application
http://svn.apache.org/viewvc?rev=639198&view=rev
+1: markt, remm
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java?rev=639909&r1=639908&r2=639909&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java Fri
Mar 21 16:29:17 2008
@@ -255,7 +255,7 @@
buf.append("=");
// Servlet implementation does not check anything else
-version = maybeQuote2(version, buf, value);
+version = maybeQuote2(version, buf, value,true);
// Add version 1 specific information
if (version == 1) {
@@ -337,6 +337,10 @@
* @param value
*/
public static int maybeQuote2 (int version, StringBuffer buf, String
value) {
+return maybeQuote2(version,buf,value,false);
+}
+
+public static int maybeQuote2 (int version, StringBuffer buf, String
value, boolean allowVersionSwitch) {
if (value==null || value.length()==0) {
buf.append("\"\"");
}else if (containsCTL(value,version))
@@ -345,7 +349,7 @@
buf.append('"');
buf.append(escapeDoubleQuotes(value,1,value.length()-1));
buf.append('"');
-} else if ((!STRICT_SERVLET_COMPLIANCE) && version==0 &&
!isToken2(value)) {
+} else if (allowVersionSwitch && (!STRICT_SERVLET_COMPLIANCE) &&
version==0 && !isToken2(value)) {
buf.append('"');
buf.append(escapeDoubleQuotes(value,0,value.length()));
buf.append('"');
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r639046 - /tomcat/tc6.0.x/trunk/STATUS.txt
On Fri, 2008-03-21 at 21:44 +, Mark Thomas wrote: > The cookies patch is short and you haven't voted yet so if you > could find the time to review the cookies patch we could get to agreed > fixes for both issues quite quickly. I did get lost somewhere between the new new patch and the new new new patch ;) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r639891 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/connector/InputBuffer.java webapps/docs/changelog.xml
Author: remm
Date: Fri Mar 21 15:22:56 2008
New Revision: 639891
URL: http://svn.apache.org/viewvc?rev=639891&view=rev
Log:
- 44494: patch for 8KB character input.
- Votes.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.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=639891&r1=639890&r2=639891&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 21 15:22:56 2008
@@ -55,50 +55,6 @@
+0: remm: do we really want to fix these sort of "bugs" ?
-1:
-* Revert back to original patch proposed for UTF8 parsing.
- This also fixes the regression for 6.0.16 and 5.5.26 (and possibly 4.1.37)
mentioned in
- http://issues.apache.org/bugzilla/show_bug.cgi?id=44494
-
- The original patch can be viewed
- http://people.apache.org/~fhanik/tomcat/b2c/patch.txt
-
- http://svn.apache.org/viewvc?rev=568307&view=rev
- http://svn.apache.org/viewvc?rev=568605&view=rev
-
- +1: fhanik
- -0: billbarker The original patch s*cks bigtime. I agree with remy (on
list) that this issue should have
- involved a discussion on list on how to fix, rather than just
proposing a 5 sec fix.
- -1: markt This patch removes a method from a public API. With that issue
fixed
-I would vote -0 until I can look at this further as explained in
-http://marc.info/?l=tomcat-dev&m=120457882215329&w=2
- -0: remm The newer code looks cleaner to me
-
-* As an alternate fix to 44494, I propose this patch (bb.getLength() is equal
to the
- value used as the result of available in the other proposed patch, and both
- patches are thus using the same limit for reading data):
- Index: java/org/apache/catalina/connector/InputBuffer.java
-===
java/org/apache/catalina/connector/InputBuffer.java(revision
633279)
-+++ java/org/apache/catalina/connector/InputBuffer.java(working copy)
-@@ -355,7 +355,7 @@
- }
-
- state = CHAR_STATE;
--conv.convert(bb, cb, len);
-+conv.convert(bb, cb, bb.getLength());
- bb.setOffset(bb.getEnd());
-
- return cb.getLength();
-
- +1 : markt
- +1 : fhanik - I don't think we should support mark/reset, we can supply a
filter that does it at the app level by wrapping getReader with a reader that
bufferes
- +1 : remm: Along with the cookie fix, I would like to get a better review of
all issues
- before the next release (this fix as far as my testing goes improves
things, though, so I think
- it should go in for now), in particular marks (used by
CoyoteReader.readLine, and which should
- continue to be supported since the BufferedReader type returned by the
Servlet API supports
- marking)
- -1 :
-
* Cookie completion. Only do the autoswitch on the value of the cookie, quote
domain/path same way as we did before
258c258
< version = maybeQuote2(version, buf, value);
@@ -114,12 +70,12 @@
---
> } else if (allowVersionSwitch && (!STRICT_SERVLET_COMPLIANCE) &&
> version==0 && !isToken2(value)) {
- +1: fhanik, markt
+ +1: fhanik, markt, remm
-1:
* Remove reference to admin application
http://svn.apache.org/viewvc?rev=639198&view=rev
- +1: markt
+ +1: markt, remm
-1:
* Update comments re JAR renaming in web.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=639891&r1=639890&r2=639891&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
Fri Mar 21 15:22:56 2008
@@ -355,7 +355,7 @@
}
state = CHAR_STATE;
-conv.convert(bb, cb, len);
+conv.convert(bb, cb, bb.getLength());
bb.setOffset(bb.getEnd());
return cb.getLength();
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=639891&r1=639890&r2=639891&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Mar 21 15:22:56 2008
@@ -74,6 +74,9 @@
44558: Improve error message so address is included if
binding fails.
+
+44494: Character input limited to 8KB. (remm)
+
---
Re: svn commit: r639046 - /tomcat/tc6.0.x/trunk/STATUS.txt
Remy Maucherat wrote: On Fri, 2008-03-21 at 15:19 -0600, Filip Hanik - Dev Lists wrote: Remy Maucherat wrote: regression, the fact that you can't read more than 8k when using ServletRequest.getReader I proposed a patch for that. If it doesn't fix it with the patch I proposed applied, I would need some test cases on bug 44494 to look at the problems. yes, and your proposed patch has 3 +1 votes. The second part of the bug, should be in a separate bug report if you ask me, and not relevant to this one. Personally, I am in no hurry to proceed with a release. the regression mentioned above, and providing backwards compatibility with invalid v0 cookies IMO is enough to push another release There are no agreed upon fixes for either problems, so I have no idea what could be released unfortunately. There is a cookie patch proposed, it follows the following behavior 1. If a cookie is added with version0 2. and that cookie contains illegal characters 3. then we switch the cookie to v1 most of this is already in SVN, the latest patch simply changes so that we only do a version switch based on characters in the "value" of the cookie. after that, path/domain etc is parsed using whatever version the cookie has at that point filip - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r639046 - /tomcat/tc6.0.x/trunk/STATUS.txt
Remy Maucherat wrote: On Fri, 2008-03-21 at 15:19 -0600, Filip Hanik - Dev Lists wrote: Remy Maucherat wrote: regression, the fact that you can't read more than 8k when using ServletRequest.getReader I proposed a patch for that. If it doesn't fix it with the patch I proposed applied, I would need some test cases on bug 44494 to look at the problems. Personally, I am in no hurry to proceed with a release. the regression mentioned above, and providing backwards compatibility with invalid v0 cookies IMO is enough to push another release There are no agreed upon fixes for either problems, so I have no idea what could be released unfortunately. There are 3 +1's for the 8k issue (your proposed patch) and the cookies issue has 2. The cookies patch is short and you haven't voted yet so if you could find the time to review the cookies patch we could get to agreed fixes for both issues quite quickly. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r639046 - /tomcat/tc6.0.x/trunk/STATUS.txt
On Fri, 2008-03-21 at 15:19 -0600, Filip Hanik - Dev Lists wrote: > Remy Maucherat wrote: > regression, the fact that you can't read more than 8k when using > ServletRequest.getReader I proposed a patch for that. If it doesn't fix it with the patch I proposed applied, I would need some test cases on bug 44494 to look at the problems. > > Personally, I am in no hurry to proceed with a release. > > > the regression mentioned above, and providing backwards compatibility > with invalid v0 cookies IMO is enough to push another release There are no agreed upon fixes for either problems, so I have no idea what could be released unfortunately. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r639046 - /tomcat/tc6.0.x/trunk/STATUS.txt
Remy Maucherat wrote: On Fri, 2008-03-21 at 14:29 -0600, Filip Hanik - Dev Lists wrote: I'd prefer to move forward with just the truncation fix so that we can move towards a release. Any other efforts can be postponed at this time. If the mark/reset bug in fact exists, there is an easy work around, and that is to use java.io.BufferedReader. whether the code is hopelessly broken or not, I don't have enough info to comment on. But I do think the code is too fragile to be mucked with in our 6.0.x branch, that can be done in trunk or sandbox. It's better for us to get a release out that takes care of the regressions that are in the releases we have now. This code has been used for a very long time. Where is the regression ? (actually, where is the bug ? feel free to post test cases to bug 44494) regression, the fact that you can't read more than 8k when using ServletRequest.getReader Personally, I am in no hurry to proceed with a release. the regression mentioned above, and providing backwards compatibility with invalid v0 cookies IMO is enough to push another release Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r639846 - /tomcat/current/tc4.1.x/STATUS.txt
Author: markt Date: Fri Mar 21 14:11:46 2008 New Revision: 639846 URL: http://svn.apache.org/viewvc?rev=639846&view=rev Log: Propose doc fix Modified: tomcat/current/tc4.1.x/STATUS.txt Modified: tomcat/current/tc4.1.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=639846&r1=639845&r2=639846&view=diff == --- tomcat/current/tc4.1.x/STATUS.txt (original) +++ tomcat/current/tc4.1.x/STATUS.txt Fri Mar 21 14:11:46 2008 @@ -36,3 +36,8 @@ http://people.apache.org/~markt/patches/2008-03-10-bug41217-tc4.patch +1: markt -1: + +* Fix docs re use of maxActive + http://svn.apache.org/viewvc?rev=639842&view=rev + +1: + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r639845 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Fri Mar 21 14:11:35 2008 New Revision: 639845 URL: http://svn.apache.org/viewvc?rev=639845&view=rev Log: Propose doc fix Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=639845&r1=639844&r2=639845&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Mar 21 14:11:35 2008 @@ -74,3 +74,8 @@ http://people.apache.org/~markt/patches/2008-03-10-bug44556.patch +1: markt, fhanik -1: + +* Fix docs re use of maxActive + http://svn.apache.org/viewvc?rev=639842&view=rev + +1: + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r639844 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Mar 21 14:11:19 2008 New Revision: 639844 URL: http://svn.apache.org/viewvc?rev=639844&view=rev Log: Propose doc fix Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=639844&r1=639843&r2=639844&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 21 14:11:19 2008 @@ -125,4 +125,9 @@ * Update comments re JAR renaming in web.xml http://svn.apache.org/viewvc?rev=639771&view=rev +1: - -1: \ No newline at end of file + -1: + +* Fix docs re use of maxActive + http://svn.apache.org/viewvc?rev=639842&view=rev + +1: + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r639842 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
Author: markt Date: Fri Mar 21 14:08:36 2008 New Revision: 639842 URL: http://svn.apache.org/viewvc?rev=639842&view=rev Log: maxActive setting for unlimited changed in commons-pool > 1.2 Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=639842&r1=639841&r2=639842&view=diff == --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Fri Mar 21 14:08:36 2008 @@ -219,7 +219,7 @@