Author: mmillson Date: 2010-11-10 00:25:41 -0500 (Wed, 10 Nov 2010) New Revision: 1578 Modified: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5398/src/share/classes/org/apache/tomcat/util/http/Cookies.java Log: Fix for version 0 cookies support for [JBPAPP-5398]. Modified: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5398/src/share/classes/org/apache/tomcat/util/http/Cookies.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5398/src/share/classes/org/apache/tomcat/util/http/Cookies.java 2010-11-10 03:52:37 UTC (rev 1577) +++ branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5398/src/share/classes/org/apache/tomcat/util/http/Cookies.java 2010-11-10 05:25:41 UTC (rev 1578) @@ -60,14 +60,21 @@ '\t':9 ' ':32 '\"':34 '\'':39 '(':40 ')':41 ',':44 ':':58 ';':59 '<':60 '=':61 '>':62 '?':63 '@':64 '[':91 '\\':92 ']':93 '{':123 '}':125 */ - public static final char SEPARATORS[] = { '\t', ' ', '\"', '\'', '(', ')', ',', - ':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', '{', '}' }; + public static final char SEPARATORS[]; protected static final boolean separators[] = new boolean[128]; static { for (int i = 0; i < 128; i++) { separators[i] = false; } + if (Boolean.valueOf(System.getProperty("org.apache.tomcat.util.http.ServerCookie.VERSION_SWITCH", "false")).booleanValue()) { + /* Version 1 separators */ + SEPARATORS = new char[] { '\t', ' ', '\"', '\'', '(', ')', ',', + ':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', '{', '}' }; + } else { + /* Version 0 separators */ + SEPARATORS = new char[] { ',', ';', ' ', '\t', '='}; + } for (int i = 0; i < SEPARATORS.length; i++) { separators[SEPARATORS[i]] = true; }