tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r557461 - /tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
Date Thu, 19 Jul 2007 02:27:36 GMT
Author: markt
Date: Wed Jul 18 19:27:36 2007
New Revision: 557461

URL: http://svn.apache.org/viewvc?view=rev&rev=557461
Log:
Tabs -> 8 spaces
No functional change

Modified:
    tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java

Modified: tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java?view=diff&rev=557461&r1=557460&r2=557461
==============================================================================
--- tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java (original)
+++ tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java Wed Jul
18 19:27:36 2007
@@ -43,15 +43,15 @@
     private MessageBytes name=MessageBytes.newInstance();
     private MessageBytes value=MessageBytes.newInstance();
 
-    private MessageBytes comment=MessageBytes.newInstance();    // ;Comment=VALUE
-    private MessageBytes domain=MessageBytes.newInstance();    // ;Domain=VALUE ...
+    private MessageBytes comment=MessageBytes.newInstance(); //;Comment=VALUE
+    private MessageBytes domain=MessageBytes.newInstance();  //;Domain=VALUE ...
 
-    private int maxAge = -1;	// ;Max-Age=VALUE
-				// ;Discard ... implied by maxAge < 0
+    private int maxAge = -1;        // ;Max-Age=VALUE
+                                // ;Discard ... implied by maxAge < 0
     // RFC2109: maxAge=0 will end a session
-    private MessageBytes path=MessageBytes.newInstance();	// ;Path=VALUE .
-    private boolean secure;	// ;Secure
-    private int version = 0;	// ;Version=1
+    private MessageBytes path=MessageBytes.newInstance();        // ;Path=VALUE
+    private boolean secure;        // ;Secure
+    private int version = 0;        // ;Version=1
 
     //XXX CommentURL, Port -> use notes ?
     
@@ -61,68 +61,68 @@
 
     public void recycle() {
         path.recycle();
-    	name.recycle();
-    	value.recycle();
-    	comment.recycle();
-    	maxAge=-1;
-    	path.recycle();
+            name.recycle();
+            value.recycle();
+            comment.recycle();
+            maxAge=-1;
+            path.recycle();
         domain.recycle();
-    	version=0;
-    	secure=false;
+            version=0;
+            secure=false;
     }
 
     public MessageBytes getComment() {
-	return comment;
+        return comment;
     }
 
     public MessageBytes getDomain() {
-	return domain;
+        return domain;
     }
 
     public void setMaxAge(int expiry) {
-	maxAge = expiry;
+        maxAge = expiry;
     }
 
     public int getMaxAge() {
-	return maxAge;
+        return maxAge;
     }
 
 
     public MessageBytes getPath() {
-	return path;
+        return path;
     }
 
     public void setSecure(boolean flag) {
-	secure = flag;
+        secure = flag;
     }
 
     public boolean getSecure() {
-	return secure;
+        return secure;
     }
 
     public MessageBytes getName() {
-	return name;
+        return name;
     }
 
     public MessageBytes getValue() {
-	return value;
+        return value;
     }
 
     public int getVersion() {
-	return version;
+        return version;
     }
 
 
     public void setVersion(int v) {
-	version = v;
+        version = v;
     }
 
 
     // -------------------- utils --------------------
 
     public String toString() {
-	return "Cookie " + getName() + "=" + getValue() + " ; "
-	    + getVersion() + " " + getPath() + " " + getDomain();
+        return "Cookie " + getName() + "=" + getValue() + " ; "
+            + getVersion() + " " + getPath() + " " + getDomain();
     }
     
     // Note -- disabled for now to allow full Netscape compatibility
@@ -135,39 +135,39 @@
      * Tests a string and returns true if the string counts as a
      * reserved token in the Java language.
      *
-     * @param value		the <code>String</code> to be tested
+     * @param value     the <code>String</code> to be tested
      *
-     * @return			<code>true</code> if the <code>String</code> is
-     *				a reserved token; <code>false</code>
-     *				if it is not
+     * @return          <code>true</code> if the <code>String</code>
is
+     *                  a reserved token; <code>false</code>
+     *                  if it is not
      */
     public static boolean isToken(String value) {
-	if( value==null) return true;
-	int len = value.length();
+        if( value==null) return true;
+        int len = value.length();
 
-	for (int i = 0; i < len; i++) {
-	    char c = value.charAt(i);
+        for (int i = 0; i < len; i++) {
+            char c = value.charAt(i);
 
-	    if (c < 0x20 || c >= 0x7f || tspecials.indexOf(c) != -1)
-		return false;
-	}
-	return true;
+            if (c < 0x20 || c >= 0x7f || tspecials.indexOf(c) != -1)
+                return false;
+        }
+        return true;
     }
 
     public static boolean checkName( String name ) {
-	if (!isToken(name)
-		|| name.equalsIgnoreCase("Comment")	// rfc2019
-		|| name.equalsIgnoreCase("Discard")	// 2019++
-		|| name.equalsIgnoreCase("Domain")
-		|| name.equalsIgnoreCase("Expires")	// (old cookies)
-		|| name.equalsIgnoreCase("Max-Age")	// rfc2019
-		|| name.equalsIgnoreCase("Path")
-		|| name.equalsIgnoreCase("Secure")
-		|| name.equalsIgnoreCase("Version")
-	    ) {
-	    return false;
-	}
-	return true;
+        if (!isToken(name)
+                || name.equalsIgnoreCase("Comment")        // rfc2019
+                || name.equalsIgnoreCase("Discard")        // 2019++
+                || name.equalsIgnoreCase("Domain")
+                || name.equalsIgnoreCase("Expires")        // (old cookies)
+                || name.equalsIgnoreCase("Max-Age")        // rfc2019
+                || name.equalsIgnoreCase("Path")
+                || name.equalsIgnoreCase("Secure")
+                || name.equalsIgnoreCase("Version")
+            ) {
+            return false;
+        }
+        return true;
     }
 
     // -------------------- Cookie parsing tools
@@ -177,99 +177,100 @@
      *  version
      */
     public String getCookieHeaderName() {
-	return getCookieHeaderName(version);
+        return getCookieHeaderName(version);
     }
 
     /** Return the header name to set the cookie, based on cookie
      *  version
      */
     public static String getCookieHeaderName(int version) {
-	if( dbg>0 ) log( (version==1) ? "Set-Cookie2" : "Set-Cookie");
+        if( dbg>0 ) log( (version==1) ? "Set-Cookie2" : "Set-Cookie");
         if (version == 1) {
-	    // RFC2109
-	    return "Set-Cookie";
-	    // XXX RFC2965 is not standard yet, and Set-Cookie2
-	    // is not supported by Netscape 4, 6, IE 3, 5 .
-	    // It is supported by Lynx, and there is hope 
-	    //	    return "Set-Cookie2";
+            // RFC2109
+            return "Set-Cookie";
+            // XXX RFC2965 is not standard yet, and Set-Cookie2
+            // is not supported by Netscape 4, 6, IE 3, 5 .
+            // It is supported by Lynx, and there is hope 
+            //            return "Set-Cookie2";
         } else {
-	    // Old Netscape
-	    return "Set-Cookie";
+            // Old Netscape
+            return "Set-Cookie";
         }
     }
 
-    private static final String ancientDate=DateTool.formatOldCookie(new Date(10000));
+    private static final String ancientDate =
+        DateTool.formatOldCookie(new Date(10000));
 
     public static void appendCookieValue( StringBuffer buf,
-					  int version,
-					  String name,
-					  String value,
-					  String path,
-					  String domain,
-					  String comment,
-					  int maxAge,
-					  boolean isSecure )
+                                          int version,
+                                          String name,
+                                          String value,
+                                          String path,
+                                          String domain,
+                                          String comment,
+                                          int maxAge,
+                                          boolean isSecure )
     {
         // this part is the same for all cookies
-	buf.append( name );
+        buf.append( name );
         buf.append("=");
         maybeQuote(version, buf, value);
 
-	// XXX Netscape cookie: "; "
- 	// add version 1 specific information
-	if (version == 1) {
-	    // Version=1 ... required
-	    buf.append ("; Version=1");
-
-	    // Comment=comment
-	    if ( comment!=null ) {
-		buf.append ("; Comment=");
-		maybeQuote (version, buf, comment);
-	    }
-	}
-	
-	// add domain information, if present
-
-	if (domain!=null) {
-	    buf.append("; Domain=");
-	    maybeQuote (version, buf, domain);
-	}
-
-	// Max-Age=secs/Discard ... or use old "Expires" format
-	if (maxAge >= 0) {
-	    if (version == 0) {
-		// XXX XXX XXX We need to send both, for
-		// interoperatibility (long word )
-		buf.append ("; Expires=");
-		// Wdy, DD-Mon-YY HH:MM:SS GMT ( Expires netscape format )
-		// To expire we need to set the time back in future
-		// ( pfrieden@dChain.com )
+        // XXX Netscape cookie: "; "
+         // add version 1 specific information
+        if (version == 1) {
+            // Version=1 ... required
+            buf.append ("; Version=1");
+
+            // Comment=comment
+            if ( comment!=null ) {
+                buf.append ("; Comment=");
+                maybeQuote (version, buf, comment);
+            }
+        }
+        
+        // add domain information, if present
+
+        if (domain!=null) {
+            buf.append("; Domain=");
+            maybeQuote (version, buf, domain);
+        }
+
+        // Max-Age=secs/Discard ... or use old "Expires" format
+        if (maxAge >= 0) {
+            if (version == 0) {
+                // XXX XXX XXX We need to send both, for
+                // interoperatibility (long word )
+                buf.append ("; Expires=");
+                // Wdy, DD-Mon-YY HH:MM:SS GMT ( Expires netscape format )
+                // To expire we need to set the time back in future
+                // ( pfrieden@dChain.com )
                 if (maxAge == 0)
-		    buf.append( ancientDate );
-		else
+                    buf.append( ancientDate );
+                else
                     DateTool.formatOldCookie
                         (new Date( System.currentTimeMillis() +
                                    maxAge *1000L), buf,
                          new FieldPosition(0));
 
-	    } else {
-		buf.append ("; Max-Age=");
-		buf.append (maxAge);
-	    }
-	}
-
-	// Path=path
-	if (path!=null) {
-	    buf.append ("; Path=");
-	    maybeQuote (version, buf, path);
-	}
-
-	// Secure
-	if (isSecure) {
-	  buf.append ("; Secure");
-	}
-	
-	
+            } else {
+                buf.append ("; Max-Age=");
+                buf.append (maxAge);
+            }
+        }
+
+        // Path=path
+        if (path!=null) {
+            buf.append ("; Path=");
+            maybeQuote (version, buf, path);
+        }
+
+        // Secure
+        if (isSecure) {
+          buf.append ("; Secure");
+        }
+        
+        
     }
 
     public static void maybeQuote (int version, StringBuffer buf,



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message