svn commit: r1780609 - in /tomcat/trunk: java/org/apache/tomcat/util/http/parser/Cookie.java test/org/apache/tomcat/util/http/TestCookies.java

[markt]

Author: markt
Date: Fri Jan 27 21:02:08 2017
New Revision: 1780609

URL: http://svn.apache.org/viewvc?rev=1780609&view=rev
Log:
Follow-up to r1780606
Ensure RFC2109 cookie is created with correct version

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java
    tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java?rev=1780609&r1=1780608&r2=1780609&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java Fri Jan 27 
21:02:08 2017
@@ -145,7 +145,7 @@ public class Cookie {
                 skipLWS(bb);
                 byte b = bb.get();
                 if (b == SEMICOLON_BYTE || b == COMMA_BYTE) {
-                    parseCookieRfc2109(bb, serverCookies);
+                    parseCookieRfc2109(bb, serverCookies, version - 48);
                 }
                 return;
             } else {
@@ -244,7 +244,8 @@ public class Cookie {
     }
 
 
-    private static void parseCookieRfc2109(ByteBuffer bb, ServerCookies 
serverCookies) {
+    private static void parseCookieRfc2109(ByteBuffer bb, ServerCookies 
serverCookies,
+            int version) {
 
         boolean moreToProcess = true;
 
@@ -347,7 +348,7 @@ public class Cookie {
 
             if (name.hasRemaining() && value != null && value.hasRemaining()) {
                 ServerCookie sc = serverCookies.addCookie();
-                sc.setVersion(1);
+                sc.setVersion(version);
                 sc.getName().setBytes(name.array(), name.position(), 
name.remaining());
                 sc.getValue().setBytes(value.array(), value.position(), 
value.remaining());
                 if (domain != null) {

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java?rev=1780609&r1=1780608&r2=1780609&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java Fri Jan 27 
21:02:08 2017
@@ -384,8 +384,8 @@ public class TestCookies {
 
     @Test
     public void rfc2109Version0Rfc6265() {
-        // Neither RFC2109 nor RFc6265 allow version 0
-        test(true, "$Version=0;foo=bar");
+        // Neither RFC2109 nor RFC6265 allow version 0
+        test(true, "$Version=0;foo=bar", FOO);
     }
 
     @Test



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org