billbarker 2003/03/15 17:43:47
Modified: coyote/src/java/org/apache/coyote/tomcat4 Tag: coyote_10
CoyoteAdapter.java
Log:
Was just reminded that I forgot to port the bad-cookie patch to this branch.
Revision Changes Path
No revision
No revision
1.13.2.2 +12 -7
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- CoyoteAdapter.java 15 Mar 2003 11:37:38 -0000 1.13.2.1
+++ CoyoteAdapter.java 16 Mar 2003 01:43:47 -0000 1.13.2.2
@@ -382,7 +382,7 @@
return;
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)) {
@@ -399,9 +399,14 @@
.getRequestedSessionId());
}
}
- Cookie cookie = new Cookie(scookie.getName().toString(),
+ try {
+ Cookie cookie = new Cookie(scookie.getName().toString(),
scookie.getValue().toString());
- cookies[i] = cookie;
+ cookies[idx++] = cookie;
+ } catch (Exception ex) {
+ log("Bad Cookie Name: " + scookie.getName() +
+ " /Value: " + scookie.getValue(),ex);
+ }
}
request.setCookies(cookies);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
