Author: jfrederic.clere(a)jboss.com Date: 2011-06-22 05:59:29 -0400 (Wed, 22 Jun 2011) New Revision: 1742 Modified: branches/2.1.x/java/org/apache/tomcat/util/http/Cookies.java branches/2.1.x/java/org/apache/tomcat/util/http/ServerCookie.java Log: Clean the VERSION_SWITCH logic. Modified: branches/2.1.x/java/org/apache/tomcat/util/http/Cookies.java =================================================================== --- branches/2.1.x/java/org/apache/tomcat/util/http/Cookies.java 2011-06-21 09:24:10 UTC (rev 1741) +++ branches/2.1.x/java/org/apache/tomcat/util/http/Cookies.java 2011-06-22 09:59:29 UTC (rev 1742) @@ -51,7 +51,9 @@ * being quoted. */ public static final boolean ALLOW_EQUALS_IN_VALUE; - + + public static final boolean VERSION_SWITCH = + Boolean.valueOf(System.getProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "false")).booleanValue() ? false : Boolean.valueOf(System.getProperty("org.apache.tomcat.util.http.ServerCookie.VERSION_SWITCH", "false")).booleanValue(); /* List of Separator Characters (see isSeparator()) Excluding the '/' char violates the RFC, but @@ -67,7 +69,7 @@ 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()) { + if (VERSION_SWITCH) { /* Version 1 separators */ SEPARATORS = new char[] { '\t', ' ', '\"', '\'', '(', ')', ',', ':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', '{', '}' }; Modified: branches/2.1.x/java/org/apache/tomcat/util/http/ServerCookie.java =================================================================== --- branches/2.1.x/java/org/apache/tomcat/util/http/ServerCookie.java 2011-06-21 09:24:10 UTC (rev 1741) +++ branches/2.1.x/java/org/apache/tomcat/util/http/ServerCookie.java 2011-06-22 09:59:29 UTC (rev 1742) @@ -76,8 +76,8 @@ /** * If set to true, we parse cookies according to the servlet spec, */ - public static final boolean STRICT_SERVLET_COMPLIANCE = - Boolean.valueOf(System.getProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "false")).booleanValue(); + public static final boolean VERSION_SWITCH = + Boolean.valueOf(System.getProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "false")).booleanValue() ? false : Boolean.valueOf(System.getProperty("org.apache.tomcat.util.http.ServerCookie.VERSION_SWITCH", "false")).booleanValue(); // Note: Servlet Spec =< 2.5 only refers to Netscape and RFC2109, @@ -391,7 +391,7 @@ buf.append('"'); buf.append(escapeDoubleQuotes(value,1,value.length()-1)); buf.append('"'); - } else if (allowVersionSwitch && (!STRICT_SERVLET_COMPLIANCE) && version==0 && !isToken2(value, literals)) { + } else if (allowVersionSwitch && VERSION_SWITCH && version==0 && !isToken2(value, literals)) { buf.append('"'); buf.append(escapeDoubleQuotes(value,0,value.length())); buf.append('"');