Author: jfrederic.clere(a)jboss.com Date: 2009-04-17 06:58:35 -0400 (Fri, 17 Apr 2009) New Revision: 1014 Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/startup/catalina.properties branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/ServerCookie.java Log: Add org.apache.tomcat.util.http.ServerCookie.VERSION_SWITCH Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/startup/catalina.properties =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/startup/catalina.properties 2009-04-16 21:00:07 UTC (rev 1013) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/startup/catalina.properties 2009-04-17 10:58:35 UTC (rev 1014) @@ -64,3 +64,6 @@ #tomcat.util.buf.StringCache.char.enabled=true #tomcat.util.buf.StringCache.trainThreshold=500000 #tomcat.util.buf.StringCache.cacheSize=5000 + +# Allow to use Version 1 cookie (quoted cookie) when the cookie value contains a control character. +org.apache.tomcat.util.http.ServerCookie.VERSION_SWITCH=true Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/ServerCookie.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/ServerCookie.java 2009-04-16 21:00:07 UTC (rev 1013) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/http/ServerCookie.java 2009-04-17 10:58:35 UTC (rev 1014) @@ -57,8 +57,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.tomcat.util.http.ServerCookie.VERSION_SWITCH", "false")).booleanValue(); // Note: Servlet Spec =< 2.5 only refers to Netscape and RFC2109, @@ -370,7 +370,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('"');