Author: jfclere
Date: Wed Jul 11 08:28:52 2007
New Revision: 555304
URL: http://svn.apache.org/viewvc?view=rev&rev=555304
Log:
Use Globals.SESSION_PARAMETER_NAME instead "jsessionid".
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?view=diff&rev=555304&r1=555303&r2=555304
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Wed Jul 11 08:28:52 2007
@@ -457,7 +457,7 @@
if (request.isRequestedSessionIdFromURL()) {
// This is not optimal, but as this is not very common, it
// shouldn't matter
- redirectPath = redirectPath + ";jsessionid="
+ redirectPath = redirectPath + ";" +
Globals.SESSION_PARAMETER_NAME + "="
+ request.getRequestedSessionId();
}
if (query != null) {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java?view=diff&rev=555304&r1=555303&r2=555304
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java Wed
Jul 11 08:28:52 2007
@@ -1435,7 +1435,8 @@
String file = url.getFile();
if ((file == null) || !file.startsWith(contextPath))
return (false);
- if( file.indexOf(";jsessionid=" + session.getIdInternal()) >= 0 )
+ String tok = ";" + Globals.SESSION_PARAMETER_NAME + "=" +
session.getIdInternal();
+ if( file.indexOf(tok, contextPath.length()) >= 0 )
return (false);
}
@@ -1569,7 +1570,9 @@
}
StringBuffer sb = new StringBuffer(path);
if( sb.length() > 0 ) { // jsessionid can't be first.
- sb.append(";jsessionid=");
+ sb.append(";");
+ sb.append(Globals.SESSION_PARAMETER_NAME);
+ sb.append("=");
sb.append(sessionId);
}
sb.append(anchor);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?view=diff&rev=555304&r1=555303&r2=555304
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Wed Jul
11 08:28:52 2007
@@ -37,6 +37,7 @@
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
@@ -945,7 +946,9 @@
String requestedSessionId = request.getRequestedSessionId();
if ((requestedSessionId != null) &&
request.isRequestedSessionIdFromURL()) {
- file.append(";jsessionid=");
+ file.append(";");
+ file.append(Globals.SESSION_PARAMETER_NAME);
+ file.append("=");
file.append(requestedSessionId);
}
String queryString = request.getQueryString();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
