Author: markt
Date: Tue Sep 2 13:41:20 2014
New Revision: 1621989
URL: http://svn.apache.org/r1621989
Log:
Add parsing for RFC2109 values
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
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=1621989&r1=1621988&r2=1621989&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java Tue Sep 2
13:41:20 2014
@@ -195,19 +195,16 @@ public class TestCookies {
@Test
public void v1DQuoteInValueOld() {
- doV1DQuoteInValue(false);
+ FOO.setValue("b");
+ FOO.setVersion(1);
+ A.setVersion(1);
+ test(false, "$Version=1;foo=\"b\"ar\";a=b", FOO, A); // Incorrectly
escaped.
}
@Test
public void v1DQuoteInValueRfc6265() {
- doV1DQuoteInValue(true);
- }
-
- private void doV1DQuoteInValue(boolean useRfc6265) {
- FOO.setValue("b");
- FOO.setVersion(1);
A.setVersion(1);
- test(useRfc6265, "$Version=1;foo=\"b\"ar\";a=b", FOO, A); //
Incorrectly escaped.
+ test(true, "$Version=1;foo=\"b\"ar\";a=b", A); // Incorrectly escaped.
}
@Test
@@ -403,7 +400,9 @@ public class TestCookies {
ServerCookie actual = cookies.getCookie(i);
Assert.assertEquals(cookie.getVersion(), actual.getVersion());
Assert.assertEquals(cookie.getName(), actual.getName().toString());
- Assert.assertEquals(cookie.getValue(),
actual.getValue().toString());
+ Assert.assertEquals(cookie.getValue(),
+
org.apache.tomcat.util.http.parser.Cookie.unescapeCookieValueRfc2109(
+ actual.getValue().toString()));
if (cookie.getVersion() == 1) {
Assert.assertEquals(cookie.getDomain(),
actual.getDomain().toString());
Assert.assertEquals(cookie.getPath(),
actual.getPath().toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
