nacho 00/10/27 13:50:51
Modified: src/facade22/org/apache/tomcat/facade CookieFacade.java
HttpServletResponseFacade.java
src/share/org/apache/tomcat/helper CookieTools.java
src/share/org/apache/tomcat/util ServerCookie.java
Log:
[PATCH]unable to shutdown Tomcat 3.3dev
[PATCH]Cookies in 3.3dev
[PATCH]Cookieless Session for 3.3Dev
All Submited by Arion Yu [[EMAIL PROTECTED]]
Revision Changes Path
1.3 +1 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/CookieFacade.java
Index: CookieFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/CookieFacade.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CookieFacade.java 2000/09/26 04:58:19 1.2
+++ CookieFacade.java 2000/10/27 20:50:49 1.3
@@ -83,7 +83,7 @@
CookieFacade( ServerCookie sC ) {
// we can't reuse super anyway
- super(null, null);
+ super("", "");
this.sC=sC;
}
public void setComment(String purpose) {
1.7 +1 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java
Index: HttpServletResponseFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HttpServletResponseFacade.java 2000/09/26 01:05:59 1.6
+++ HttpServletResponseFacade.java 2000/10/27 20:50:50 1.7
@@ -152,7 +152,7 @@
public String encodeURL(String url) {
if (isEncodeable(toAbsolute(url)))
return (toEncoded(url,
- response.getRequest().getRequestedSessionId()));
+ response.getRequest().getSessionId()));
else
return (url);
}
1.5 +2 -2
jakarta-tomcat/src/share/org/apache/tomcat/helper/CookieTools.java
Index: CookieTools.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/helper/CookieTools.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CookieTools.java 2000/10/08 21:28:57 1.4
+++ CookieTools.java 2000/10/27 20:50:51 1.5
@@ -203,7 +203,7 @@
// add domain information, if present
- if (cookie.getDomain() != null) {
+ if (cookie.getDomain().isNull()) {
buf.append(";Domain=");
maybeQuote (version, buf, cookie.getDomain().toString());
}
@@ -223,7 +223,7 @@
buf.append (";Discard");
// Path=path
- if (cookie.getPath() != null) {
+ if (cookie.getPath().isNull()) {
buf.append (";Path=");
maybeQuote (version, buf, cookie.getPath().toString());
}
1.3 +13 -12
jakarta-tomcat/src/share/org/apache/tomcat/util/ServerCookie.java
Index: ServerCookie.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ServerCookie.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerCookie.java 2000/10/12 16:24:27 1.2
+++ ServerCookie.java 2000/10/27 20:50:51 1.3
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*
* ====================================================================
- */
+ */
package org.apache.tomcat.util;
import java.io.*;
@@ -63,7 +63,7 @@
* Allows recycling and uses MessageBytes as low-level
* representation ( and thus the byte-> char conversion can be delayed
* until we know the charset ).
- *
+ *
* Tomcat.core uses this recyclable object to represent cookies,
* and the facade will convert it to the external representation.
*/
@@ -72,12 +72,11 @@
private MessageBytes value=new MessageBytes();
private MessageBytes comment=new MessageBytes(); // ;Comment=VALUE
-
- private MessageBytes domain; // ;Domain=VALUE ...
+ private MessageBytes domain=new MessageBytes(); // ;Domain=VALUE ...
private int maxAge = -1; // ;Max-Age=VALUE
// ;Discard ... implied by maxAge < 0
- private MessageBytes path; // ;Path=VALUE .
+ private MessageBytes path=new MessageBytes(); // ;Path=VALUE .
private boolean secure; // ;Secure
private int version = 0; // ;Version=1
@@ -87,13 +86,15 @@
}
public void recycle() {
- name.recycle();
- value.recycle();
- comment.recycle();
- maxAge=-1;
-// path.recycle();
- version=0;
- secure=false;
+ path.recycle();
+ name.recycle();
+ value.recycle();
+ comment.recycle();
+ maxAge=-1;
+ path.recycle();
+ domain.recycle();
+ version=0;
+ secure=false;
}
public void parse( MessageBytes input ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
