Author: markt
Date: Tue May 10 09:07:14 2016
New Revision: 1743135
URL: http://svn.apache.org/viewvc?rev=1743135&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59450
Correctly handle the case where the LegacyCookieProcessor is configured with
allowHttpSepsInV0 set to false and forwardSlashIsSeparator set to true.
Patch provided by Kyohei Nakamura.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 10 09:07:14 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java?rev=1743135&r1=1743134&r2=1743135&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
Tue May 10 09:07:14 2016
@@ -179,9 +179,9 @@ public final class LegacyCookieProcessor
}
}
if (getForwardSlashIsSeparator() && !allowHttpSepsInV0) {
- allowedWithoutQuotes.set('/');
- } else {
allowedWithoutQuotes.clear('/');
+ } else {
+ allowedWithoutQuotes.set('/');
}
}
@@ -198,9 +198,9 @@ public final class LegacyCookieProcessor
httpSeparatorFlags.clear('/');
}
if (forwardSlashIsSeparator && !getAllowHttpSepsInV0()) {
- allowedWithoutQuotes.set('/');
- } else {
allowedWithoutQuotes.clear('/');
+ } else {
+ allowedWithoutQuotes.set('/');
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java?rev=1743135&r1=1743134&r2=1743135&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
Tue May 10 09:07:14 2016
@@ -69,8 +69,9 @@ public class TestCookieProcessorGenerati
@Test
public void v0ValueContainsNonV0Separator() {
- doTest(new Cookie("foo", "a()<>@:\\\"/[]?={}b"),
- "foo=\"a()<>@:\\\\\\\"/[]?={}b\"; Version=1", null);
+ Cookie cookie = new Cookie("foo", "a()<>@:\\\"/[]?={}b");
+ doTestDefaults(cookie,"foo=\"a()<>@:\\\\\\\"/[]?={}b\"; Version=1",
null);
+ doTestAllowSeparators(cookie,"foo=a()<>@:\\\"/[]?={}b", null);
}
@Test
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1743135&r1=1743134&r2=1743135&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue May 10 09:07:14 2016
@@ -268,6 +268,13 @@
<bug>59451</bug>: Correct Javadoc for <code>MessageBytes</code>. Patch
provided by Kyohei Nakamura. (markt)
</fix>
+ <fix>
+ <bug>59450</bug>: Correctly handle the case where the
+ <code>LegacyCookieProcessor</code> is configured with
+ <code>allowHttpSepsInV0</code> set to <code>false</code> and
+ <code>forwardSlashIsSeparator</code> set to <code>true</code>. Patch
+ provided by Kyohei Nakamura. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
