Author: jboynes
Date: Wed Jan 8 03:22:13 2014
New Revision: 1556434
URL: http://svn.apache.org/r1556434
Log:
Move methods only used by SetCookieSupport into that class.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
tomcat/trunk/java/org/apache/tomcat/util/http/SetCookieSupport.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java?rev=1556434&r1=1556433&r2=1556434&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java Wed Jan 8
03:22:13 2014
@@ -173,29 +173,6 @@ public final class CookieSupport {
return V0_SEPARATOR_FLAGS[c];
}
- public static boolean isV0Token(String value) {
- if( value==null) {
- return false;
- }
-
- int i = 0;
- int len = value.length();
-
- if (alreadyQuoted(value)) {
- i++;
- len--;
- }
-
- for (; i < len; i++) {
- char c = value.charAt(i);
-
- if (isV0Separator(c)) {
- return true;
- }
- }
- return false;
- }
-
/**
* Returns true if the byte is a separator as defined by V1 of the cookie
* spec, RFC2109.
@@ -213,36 +190,6 @@ public final class CookieSupport {
return HTTP_SEPARATOR_FLAGS[c];
}
- public static boolean isHttpToken(String value) {
- if( value==null) {
- return false;
- }
-
- int i = 0;
- int len = value.length();
-
- if (alreadyQuoted(value)) {
- i++;
- len--;
- }
-
- for (; i < len; i++) {
- char c = value.charAt(i);
-
- if (isHttpSeparator(c)) {
- return true;
- }
- }
- return false;
- }
-
- public static boolean alreadyQuoted (String value) {
- if (value==null || value.length() < 2) {
- return false;
- }
- return (value.charAt(0)=='\"' && value.charAt(value.length()-1)=='\"');
- }
-
// -------------------------------------------------------------
Constructor
private CookieSupport() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/SetCookieSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/SetCookieSupport.java?rev=1556434&r1=1556433&r2=1556434&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/SetCookieSupport.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/SetCookieSupport.java Wed Jan
8 03:22:13 2014
@@ -77,9 +77,9 @@ public class SetCookieSupport {
// If it is v0, check if we need to switch
if (newVersion == 0 &&
(!CookieSupport.ALLOW_HTTP_SEPARATORS_IN_V0 &&
- CookieSupport.isHttpToken(value) ||
+ isHttpToken(value) ||
CookieSupport.ALLOW_HTTP_SEPARATORS_IN_V0 &&
- CookieSupport.isV0Token(value))) {
+ isV0Token(value))) {
// HTTP token in value - need to use v1
newVersion = 1;
}
@@ -91,18 +91,18 @@ public class SetCookieSupport {
if (newVersion == 0 &&
(!CookieSupport.ALLOW_HTTP_SEPARATORS_IN_V0 &&
- CookieSupport.isHttpToken(path) ||
+ isHttpToken(path) ||
CookieSupport.ALLOW_HTTP_SEPARATORS_IN_V0 &&
- CookieSupport.isV0Token(path))) {
+ isV0Token(path))) {
// HTTP token in path - need to use v1
newVersion = 1;
}
if (newVersion == 0 &&
(!CookieSupport.ALLOW_HTTP_SEPARATORS_IN_V0 &&
- CookieSupport.isHttpToken(domain) ||
+ isHttpToken(domain) ||
CookieSupport.ALLOW_HTTP_SEPARATORS_IN_V0 &&
- CookieSupport.isV0Token(domain))) {
+ isV0Token(domain))) {
// HTTP token in domain - need to use v1
newVersion = 1;
}
@@ -178,13 +178,13 @@ public class SetCookieSupport {
private static void maybeQuote (StringBuffer buf, String value) {
if (value==null || value.length()==0) {
buf.append("\"\"");
- } else if (CookieSupport.alreadyQuoted(value)) {
+ } else if (alreadyQuoted(value)) {
buf.append('"');
buf.append(escapeDoubleQuotes(value,1,value.length()-1));
buf.append('"');
- } else if (CookieSupport.isHttpToken(value) &&
+ } else if (isHttpToken(value) &&
!CookieSupport.ALLOW_HTTP_SEPARATORS_IN_V0 ||
- CookieSupport.isV0Token(value) &&
+ isV0Token(value) &&
CookieSupport.ALLOW_HTTP_SEPARATORS_IN_V0) {
buf.append('"');
buf.append(escapeDoubleQuotes(value,0,value.length()));
@@ -227,4 +227,57 @@ public class SetCookieSupport {
return b.toString();
}
+
+ private static boolean isV0Token(String value) {
+ if( value==null) {
+ return false;
+ }
+
+ int i = 0;
+ int len = value.length();
+
+ if (alreadyQuoted(value)) {
+ i++;
+ len--;
+ }
+
+ for (; i < len; i++) {
+ char c = value.charAt(i);
+
+ if (CookieSupport.isV0Separator(c)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean isHttpToken(String value) {
+ if( value==null) {
+ return false;
+ }
+
+ int i = 0;
+ int len = value.length();
+
+ if (alreadyQuoted(value)) {
+ i++;
+ len--;
+ }
+
+ for (; i < len; i++) {
+ char c = value.charAt(i);
+
+ if (CookieSupport.isHttpSeparator(c)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean alreadyQuoted (String value) {
+ if (value==null || value.length() < 2) {
+ return false;
+ }
+ return (value.charAt(0)=='\"' && value.charAt(value.length()-1)=='\"');
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
