2nd Patch includes the first, so combine them

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@593238 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index ec094da..a8be72b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -47,24 +47,7 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt
   -1:
 
-* Fix cookie $Version parsing 
-  Index: java/org/apache/tomcat/util/http/Cookies.java
-  ===================================================================
-  --- java/org/apache/tomcat/util/http/Cookies.java    (revision 589807)
-  +++ java/org/apache/tomcat/util/http/Cookies.java    (working copy)
-  @@ -487,7 +487,7 @@
-                   if (equals( "Version", bytes, nameStart, nameEnd) && 
-                       sc == null) {
-                       // Set version
-  -                    if( bytes[valueStart] =='1' && valueEnd == valueStart) {
-  +                    if( bytes[valueStart] =='1' && valueEnd == (valueStart+1)) {
-                           version=1;
-                       } else {
-                           // unknown version (Versioning is not very strict)
-  
- +1: fhanik, jfclere
- -1:
-
 * Fix double quoting of quoted-string. http://people.apache.org/~jfclere/patches/cookies.tck.patch
-  +1: jfclere
+  and $Version parsing
+  +1: jfclere, fhanik
   -1: