diff options
| author | Simone Bordet | 2012-03-29 10:50:26 +0000 |
|---|---|---|
| committer | Simone Bordet | 2012-03-29 10:50:26 +0000 |
| commit | 85ade6ae8601fb068f6b7418baed454d18eef716 (patch) | |
| tree | e103172594f0aef3dd19cdd9272d2aeed9caa83f | |
| parent | 50bc8fa400571eb165d6e5a8b635a5f5c17f9b13 (diff) | |
| parent | fe8b5a6cb329a9318b99d2e483c69ebf8fb84808 (diff) | |
| download | org.eclipse.jetty.project-85ade6ae8601fb068f6b7418baed454d18eef716.tar.gz org.eclipse.jetty.project-85ade6ae8601fb068f6b7418baed454d18eef716.tar.xz org.eclipse.jetty.project-85ade6ae8601fb068f6b7418baed454d18eef716.zip | |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
| -rw-r--r-- | jetty-server/src/main/java/org/eclipse/jetty/server/CookieCutter.java | 4 | ||||
| -rw-r--r-- | jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/CookieCutter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/CookieCutter.java index 262e7522cb..67ca6db289 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/CookieCutter.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/CookieCutter.java @@ -193,7 +193,7 @@ public class CookieCutter continue; case ';': - case ',': + // case ',': if (tokenstart>=0) value = hdr.substring(tokenstart, tokenend+1); else @@ -239,7 +239,7 @@ public class CookieCutter continue; case ';': - case ',': + // case ',': if (tokenstart>=0) { name = hdr.substring(tokenstart, tokenend+1); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java index a81ad64a20..c099711b41 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java @@ -669,7 +669,7 @@ public class RequestTest "POST / HTTP/1.1\r\n"+ "Host: whatever\r\n"+ "Cookie: name0=value0; name1 = value1 ; \"\\\"name2\\\"\" = \"\\\"value2\\\"\" \n" + - "Cookie: $Version=2; name3=value3=value3;$path=/path;$domain=acme.com;$port=8080, name4=; name5 = ; name6\n" + + "Cookie: $Version=2; name3=value3=value3;$path=/path;$domain=acme.com;$port=8080; name4=; name5 = ; name6\n" + "Cookie: name7=value7;\n" + "Connection: close\r\n"+ "\r\n"); @@ -694,6 +694,20 @@ public class RequestTest assertEquals("", cookies.get(6).getValue()); assertEquals("name7", cookies.get(7).getName()); assertEquals("value7", cookies.get(7).getValue()); + + cookies.clear(); + response=_connector.getResponses( + "GET /other HTTP/1.1\n"+ + "Host: whatever\n"+ + "Other: header\n"+ + "Cookie: __utmz=14316.133020.1.1.utr=gna.de|ucn=(real)|utd=reral|utct=/games/hen-one,gnt-50-ba-keys:key,2072262.html\n"+ + "\n" + ); + assertTrue(response.startsWith("HTTP/1.1 200 OK")); + assertEquals(1,cookies.size()); + assertEquals("__utmz", cookies.get(0).getName()); + assertEquals("14316.133020.1.1.utr=gna.de|ucn=(real)|utd=reral|utct=/games/hen-one,gnt-50-ba-keys:key,2072262.html", cookies.get(0).getValue()); + } @Test |