billbarker 2003/03/11 23:50:38
Modified: coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
Port cookie-validitity check from 4.1 branch.
Revision Changes Path
1.12 +18 -12
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CoyoteAdapter.java 28 Feb 2003 10:49:06 -0000 1.11
+++ CoyoteAdapter.java 12 Mar 2003 07:50:38 -0000 1.12
@@ -341,6 +341,7 @@
Cookie[] cookies = new Cookie[count];
+ int idx=0;
for (int i = 0; i < count; i++) {
ServerCookie scookie = serverCookies.getCookie(i);
if (scookie.getName().equals(Globals.SESSION_COOKIE_NAME)) {
@@ -357,15 +358,20 @@
.getRequestedSessionId());
}
}
- Cookie cookie = new Cookie(scookie.getName().toString(),
- scookie.getValue().toString());
- cookie.setPath(scookie.getPath().toString());
- cookie.setVersion(scookie.getVersion());
- String domain = scookie.getDomain().toString();
- if (domain != null) {
- cookie.setDomain(scookie.getDomain().toString());
+ try {
+ Cookie cookie = new Cookie(scookie.getName().toString(),
+ scookie.getValue().toString());
+ cookie.setPath(scookie.getPath().toString());
+ cookie.setVersion(scookie.getVersion());
+ String domain = scookie.getDomain().toString();
+ if (domain != null) {
+ cookie.setDomain(scookie.getDomain().toString());
+ }
+ cookies[idx++] = cookie;
+ } catch(Exception ex) {
+ log("Bad Cookie Name: " + scookie.getName() +
+ " /Value: " + scookie.getValue(),ex);
}
- cookies[i] = cookie;
}
request.setCookies(cookies);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
