larryi 02/01/05 14:21:45
Modified: catalina/src/share/org/apache/catalina/connector Tag:
tomcat_40_branch HttpResponseBase.java
Log:
Port Bill Barker's fix to place ";jsessionid" in the correct location in
the presence of an anchor in the URL.
Revision Changes Path
No revision
No revision
1.37.2.4 +11 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java
Index: HttpResponseBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
retrieving revision 1.37.2.3
retrieving revision 1.37.2.4
diff -u -r1.37.2.3 -r1.37.2.4
--- HttpResponseBase.java 3 Dec 2001 19:55:29 -0000 1.37.2.3
+++ HttpResponseBase.java 5 Jan 2002 22:21:45 -0000 1.37.2.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
1.37.2.3 2001/12/03 19:55:29 remm Exp $
- * $Revision: 1.37.2.3 $
- * $Date: 2001/12/03 19:55:29 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
1.37.2.4 2002/01/05 22:21:45 larryi Exp $
+ * $Revision: 1.37.2.4 $
+ * $Date: 2002/01/05 22:21:45 $
*
* ====================================================================
*
@@ -101,7 +101,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.37.2.3 $ $Date: 2001/12/03 19:55:29 $
+ * @version $Revision: 1.37.2.4 $ $Date: 2002/01/05 22:21:45 $
*/
public class HttpResponseBase
@@ -710,14 +710,21 @@
String path = url;
String query = "";
+ String anchor = "";
int question = url.indexOf('?');
if (question >= 0) {
path = url.substring(0, question);
query = url.substring(question);
}
+ int pound = path.indexOf('#');
+ if (pound >= 0) {
+ anchor = path.substring(pound);
+ path = path.substring(0, pound);
+ }
StringBuffer sb = new StringBuffer(path);
sb.append(";jsessionid=");
sb.append(sessionId);
+ sb.append(anchor);
sb.append(query);
return (sb.toString());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
